← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-07-03 13:35:59 UTC
  • mfrom: (1830.1.1 update-fix)
  • Revision ID: pqm@pqm.ubuntu.com-20060703133559-5c53e21b2a358b84
(jam) Print up to date even if bound, also always print out current revno.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
802
802
        tree = WorkingTree.open_containing(dir)[0]
803
803
        tree.lock_write()
804
804
        try:
805
 
            if tree.last_revision() == tree.branch.last_revision():
 
805
            last_rev = tree.last_revision() 
 
806
            if last_rev == tree.branch.last_revision():
806
807
                # may be up to date, check master too.
807
808
                master = tree.branch.get_master_branch()
808
 
                if master is None or master.last_revision == tree.last_revision():
809
 
                    note("Tree is up to date.")
810
 
                    return
 
809
                if master is None or last_rev == master.last_revision():
 
810
                    revno = tree.branch.revision_id_to_revno(last_rev)
 
811
                    note("Tree is up to date at revision %d." % (revno,))
 
812
                    return 0
811
813
            conflicts = tree.update()
812
 
            note('Updated to revision %d.' %
813
 
                 (tree.branch.revision_id_to_revno(tree.last_revision()),))
 
814
            revno = tree.branch.revision_id_to_revno(tree.last_revision())
 
815
            note('Updated to revision %d.' % (revno,))
814
816
            if conflicts != 0:
815
817
                return 1
816
818
            else: