← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2010-01-15 04:31:19 UTC
  • mto: This revision was merged to the branch mainline in revision 5019.
  • Revision ID: mbp@sourcefrog.net-20100115043119-zvlyd5l787ddp6uh
Pull out pbs and ProgressPhases stored in object state; just use them in single functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3750
3750
                    raise errors.BzrCommandError(
3751
3751
                        'Cannot use -r with merge directives or bundles')
3752
3752
                merger, verified = _mod_merge.Merger.from_mergeable(tree,
3753
 
                   mergeable, pb)
 
3753
                   mergeable, None)
3754
3754
 
3755
3755
        if merger is None and uncommitted:
3756
3756
            if revision is not None and len(revision) > 0:
3757
3757
                raise errors.BzrCommandError('Cannot use --uncommitted and'
3758
3758
                    ' --revision at the same time.')
3759
 
            merger = self.get_merger_from_uncommitted(tree, location, pb)
 
3759
            merger = self.get_merger_from_uncommitted(tree, location, None)
3760
3760
            allow_pending = False
3761
3761
 
3762
3762
        if merger is None:
3763
3763
            merger, allow_pending = self._get_merger_from_branch(tree,
3764
 
                location, revision, remember, possible_transports, pb)
 
3764
                location, revision, remember, possible_transports, None)
3765
3765
 
3766
3766
        merger.merge_type = merge_type
3767
3767
        merger.reprocess = reprocess
4124
4124
    @staticmethod
4125
4125
    def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4126
4126
        rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4127
 
        pb = ui.ui_factory.nested_progress_bar()
4128
 
        try:
4129
 
            tree.revert(file_list, rev_tree, not no_backup, pb,
4130
 
                report_changes=True)
4131
 
        finally:
4132
 
            pb.finished()
 
4127
        tree.revert(file_list, rev_tree, not no_backup, None,
 
4128
            report_changes=True)
4133
4129
 
4134
4130
 
4135
4131
class cmd_assert_fail(Command):