/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/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-10 03:06:24 UTC
  • mfrom: (4961.2.22 progress)
  • Revision ID: pqm@pqm.ubuntu.com-20100210030624-wnjdp7yy7zb8vu7u
(mbp) Remove passing-around of ProgressBars

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3777
3777
                    raise errors.BzrCommandError(
3778
3778
                        'Cannot use -r with merge directives or bundles')
3779
3779
                merger, verified = _mod_merge.Merger.from_mergeable(tree,
3780
 
                   mergeable, pb)
 
3780
                   mergeable, None)
3781
3781
 
3782
3782
        if merger is None and uncommitted:
3783
3783
            if revision is not None and len(revision) > 0:
3784
3784
                raise errors.BzrCommandError('Cannot use --uncommitted and'
3785
3785
                    ' --revision at the same time.')
3786
 
            merger = self.get_merger_from_uncommitted(tree, location, pb)
 
3786
            merger = self.get_merger_from_uncommitted(tree, location, None)
3787
3787
            allow_pending = False
3788
3788
 
3789
3789
        if merger is None:
3790
3790
            merger, allow_pending = self._get_merger_from_branch(tree,
3791
 
                location, revision, remember, possible_transports, pb)
 
3791
                location, revision, remember, possible_transports, None)
3792
3792
 
3793
3793
        merger.merge_type = merge_type
3794
3794
        merger.reprocess = reprocess
4065
4065
        # list, we imply that the working tree text has seen and rejected
4066
4066
        # all the changes from the other tree, when in fact those changes
4067
4067
        # have not yet been seen.
4068
 
        pb = ui.ui_factory.nested_progress_bar()
4069
4068
        tree.set_parent_ids(parents[:1])
4070
4069
        try:
4071
 
            merger = _mod_merge.Merger.from_revision_ids(pb,
4072
 
                                                         tree, parents[1])
 
4070
            merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4073
4071
            merger.interesting_ids = interesting_ids
4074
4072
            merger.merge_type = merge_type
4075
4073
            merger.show_base = show_base
4077
4075
            conflicts = merger.do_merge()
4078
4076
        finally:
4079
4077
            tree.set_parent_ids(parents)
4080
 
            pb.finished()
4081
4078
        if conflicts > 0:
4082
4079
            return 1
4083
4080
        else:
4152
4149
    @staticmethod
4153
4150
    def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4154
4151
        rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4155
 
        pb = ui.ui_factory.nested_progress_bar()
4156
 
        try:
4157
 
            tree.revert(file_list, rev_tree, not no_backup, pb,
4158
 
                report_changes=True)
4159
 
        finally:
4160
 
            pb.finished()
 
4152
        tree.revert(file_list, rev_tree, not no_backup, None,
 
4153
            report_changes=True)
4161
4154
 
4162
4155
 
4163
4156
class cmd_assert_fail(Command):