← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: John Arbash Meinel
  • Date: 2010-10-18 21:34:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5509.
  • Revision ID: john@arbash-meinel.com-20101018213405-qn3biq5yu4i0axut
https://launchpad.net/bugs/662053
Fix bug #662053, 'bzr status' shouldn't fail
if the tree doesn't implement get_shelf_manager. Either that or
RevisionTree should be implementing it, but returning None, or something similar.

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
 
    manager = params.new_tree.get_shelf_manager()
 
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()
448
451
    shelves = manager.active_shelves()
449
452
    if shelves:
450
453
        params.to_file.write('%d shelves exist. '