/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2010-01-15 04:17:57 UTC
  • mto: This revision was merged to the branch mainline in revision 5019.
  • Revision ID: mbp@sourcefrog.net-20100115041757-cd8pu9o5a511jc8q
Rip out most remaining uses of DummyProgressBar

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
540
540
 
541
541
    def __init__(self, working_tree, this_tree, base_tree, other_tree,
542
542
                 interesting_ids=None, reprocess=False, show_base=False,
543
 
                 pb=progress.DummyProgress(), pp=None, change_reporter=None,
 
543
                 pb=None, pp=None, change_reporter=None,
544
544
                 interesting_files=None, do_merge=True,
545
545
                 cherrypick=False, lca_trees=None):
546
546
        """Initialize the merger object and perform the merge.
555
555
        :param: reprocess If True, perform conflict-reduction processing.
556
556
        :param show_base: If True, show the base revision in text conflicts.
557
557
            (incompatible with reprocess)
558
 
        :param pb: A Progress bar
 
558
        :param pb: ignored
559
559
        :param pp: A ProgressPhase object
560
560
        :param change_reporter: An object that should report changes made
561
561
        :param interesting_files: The tree-relative paths of files that should
587
587
        # making sure we haven't missed any corner cases.
588
588
        # if lca_trees is None:
589
589
        #     self._lca_trees = [self.base_tree]
590
 
        self.pb = pb
 
590
        self.pb = ui.ui_factory.nested_progress_bar()
591
591
        self.pp = pp
592
592
        self.change_reporter = change_reporter
593
593
        self.cherrypick = cherrypick
1515
1515
                other_rev_id=None,
1516
1516
                interesting_files=None,
1517
1517
                this_tree=None,
1518
 
                pb=progress.DummyProgress(),
 
1518
                pb=None,
1519
1519
                change_reporter=None):
1520
1520
    """Primary interface for merging.
1521
1521