/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/status.py

  • Committer: Max Bowsher
  • Date: 2011-02-03 05:13:46 UTC
  • mfrom: (5609.2.7 2.3)
  • mto: This revision was merged to the branch mainline in revision 5642.
  • Revision ID: maxb@f2s.com-20110203051346-r2yxauojo6b2umqi
https://launchpad.net/bugs/707075
Merge 2.3 into trunk including fix for lp:707075.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
450
450
    manager = get_shelf_manager()
451
451
    shelves = manager.active_shelves()
452
452
    if shelves:
453
 
        params.to_file.write('%d shelves exist. '
454
 
            'See "bzr shelve --list" for details.\n' % len(shelves))
 
453
        singular = '%d shelf exists. '
 
454
        plural = '%d shelves exist. '
 
455
        if len(shelves) == 1:
 
456
            fmt = singular
 
457
        else:
 
458
            fmt = plural
 
459
        params.to_file.write(fmt % len(shelves))
 
460
        params.to_file.write('See "bzr shelve --list" for details.\n')
455
461
 
456
462
 
457
463
hooks = StatusHooks()