← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge bzr.ab.integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
88
88
                            rename,
89
89
                            supports_executable,
90
90
                            )
91
 
from bzrlib.progress import DummyProgress
 
91
from bzrlib.progress import DummyProgress, ProgressPhase
92
92
from bzrlib.revision import NULL_REVISION
93
93
from bzrlib.rio import RioReader, rio_file, Stanza
94
94
from bzrlib.symbol_versioning import *
885
885
 
886
886
    @needs_write_lock
887
887
    def pull(self, source, overwrite=False, stop_revision=None):
 
888
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
888
889
        source.lock_read()
889
890
        try:
 
891
            pp = ProgressPhase("Pull phase", 2, top_pb)
 
892
            pp.next_phase()
890
893
            old_revision_history = self.branch.revision_history()
891
894
            basis_tree = self.basis_tree()
892
895
            count = self.branch.pull(source, overwrite, stop_revision)
893
896
            new_revision_history = self.branch.revision_history()
894
897
            if new_revision_history != old_revision_history:
 
898
                pp.next_phase()
895
899
                if len(old_revision_history):
896
900
                    other_revision = old_revision_history[-1]
897
901
                else:
910
914
            return count
911
915
        finally:
912
916
            source.unlock()
 
917
            top_pb.finished()
913
918
 
914
919
    def extras(self):
915
920
        """Yield all unknown files in this WorkingTree.