← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Vincent Ladeuil
  • Date: 2010-10-08 10:50:51 UTC
  • mfrom: (5050.17.31 2.2.2-dev)
  • mto: This revision was merged to the branch mainline in revision 5474.
  • Revision ID: v.ladeuil+lp@free.fr-20101008105051-xd4knkrohzclffic
Merge 2.2 into trunk including fixes for bug #651706 and bug #646133

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
444
444
 
445
445
    :param params: StatusHookParams.
446
446
    """
447
 
    get_shelf_manager = getattr(params.new_tree, 'get_shelf_manager', None)
448
 
    if get_shelf_manager is None:
449
 
        return
450
 
    manager = get_shelf_manager()
 
447
    manager = params.new_tree.get_shelf_manager()
451
448
    shelves = manager.active_shelves()
452
449
    if 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')
 
450
        params.to_file.write('%d shelves exist. '
 
451
            'See "bzr shelve --list" for details.\n' % len(shelves))
461
452
 
462
453
 
463
454
hooks = StatusHooks()