← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge mainline.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
81
81
                            rename,
82
82
                            supports_executable,
83
83
                            )
 
84
from bzrlib.progress import DummyProgress
84
85
from bzrlib.revision import NULL_REVISION
85
86
from bzrlib.symbol_versioning import *
86
87
from bzrlib.textui import show_status
89
90
from bzrlib.transform import build_tree
90
91
from bzrlib.transport import get_transport
91
92
from bzrlib.transport.local import LocalTransport
 
93
import bzrlib.ui
92
94
import bzrlib.xml5
93
95
 
94
96
 
849
851
                merge_inner(self.branch,
850
852
                            self.basis_tree(), 
851
853
                            repository.revision_tree(other_revision),
852
 
                            this_tree=self)
 
854
                            this_tree=self, 
 
855
                            pb=bzrlib.ui.ui_factory.progress_bar())
853
856
                self.set_last_revision(self.branch.last_revision())
854
857
            return count
855
858
        finally:
1077
1080
        self._write_inventory(inv)
1078
1081
 
1079
1082
    @needs_write_lock
1080
 
    def revert(self, filenames, old_tree=None, backups=True):
 
1083
    def revert(self, filenames, old_tree=None, backups=True, 
 
1084
               pb=DummyProgress()):
1081
1085
        from transform import revert
1082
1086
        if old_tree is None:
1083
1087
            old_tree = self.basis_tree()
1084
 
        revert(self, old_tree, filenames, backups)
 
1088
        revert(self, old_tree, filenames, backups, pb)
1085
1089
        if not len(filenames):
1086
1090
            self.set_pending_merges([])
1087
1091