← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-02-02 10:16:52 UTC
  • mfrom: (2256.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070202101652-5367171684fe2eec
(robertc) Merge new Branch.last_revision_info method.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1321
1321
        try:
1322
1322
            pp = ProgressPhase("Pull phase", 2, top_pb)
1323
1323
            pp.next_phase()
1324
 
            old_revision_history = self.branch.revision_history()
 
1324
            old_revision_info = self.branch.last_revision_info()
1325
1325
            basis_tree = self.basis_tree()
1326
1326
            count = self.branch.pull(source, overwrite, stop_revision)
1327
 
            new_revision_history = self.branch.revision_history()
1328
 
            if new_revision_history != old_revision_history:
 
1327
            new_revision_info = self.branch.last_revision_info()
 
1328
            if new_revision_info != old_revision_info:
1329
1329
                pp.next_phase()
1330
 
                if len(old_revision_history):
1331
 
                    other_revision = old_revision_history[-1]
1332
 
                else:
1333
 
                    other_revision = None
1334
1330
                repository = self.branch.repository
1335
1331
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
1336
1332
                try: