/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Ian Clatworthy
  • Date: 2010-04-08 06:05:44 UTC
  • mfrom: (5126.1.4 517800-update-dotted-rev)
  • mto: This revision was merged to the branch mainline in revision 5140.
  • Revision ID: ian.clatworthy@canonical.com-20100408060544-dshzbmikgyv7ccyj
https://launchpad.net/bugs/517800
Merge update -r dotted-revno support

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1448
1448
        else:
1449
1449
            revision_id = branch.last_revision()
1450
1450
        if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1451
 
            revno = branch.revision_id_to_revno(revision_id)
1452
 
            note("Tree is up to date at revision %d of branch %s" %
1453
 
                (revno, branch_location))
 
1451
            revno = branch.revision_id_to_dotted_revno(revision_id)
 
1452
            note("Tree is up to date at revision %s of branch %s" %
 
1453
                ('.'.join(map(str, revno)), branch_location))
1454
1454
            return 0
1455
1455
        view_info = _get_view_info_for_change_reporter(tree)
1456
1456
        change_reporter = delta._ChangeReporter(
1468
1468
                                  "bzr update --revision only works"
1469
1469
                                  " for a revision in the branch history"
1470
1470
                                  % (e.revision))
1471
 
        revno = tree.branch.revision_id_to_revno(
 
1471
        revno = tree.branch.revision_id_to_dotted_revno(
1472
1472
            _mod_revision.ensure_null(tree.last_revision()))
1473
 
        note('Updated to revision %d of branch %s' %
1474
 
             (revno, branch_location))
 
1473
        note('Updated to revision %s of branch %s' %
 
1474
             ('.'.join(map(str, revno)), branch_location))
1475
1475
        if tree.get_parent_ids()[1:] != existing_pending_merges:
1476
1476
            note('Your local commits will now show as pending merges with '
1477
1477
                 "'bzr status', and can be committed with 'bzr commit'.")