← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: Vincent Ladeuil
  • Date: 2012-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
200
200
            repository._format.get_format_description())
201
201
 
202
202
 
203
 
def _show_locking_info(repository=None, branch=None, working=None,
204
 
        outfile=None):
 
203
def _show_locking_info(repository, branch=None, working=None, outfile=None):
205
204
    """Show locking status of working, branch and repository."""
206
 
    if (repository and repository.get_physical_lock_status() or
 
205
    if (repository.get_physical_lock_status() or
207
206
        (branch and branch.get_physical_lock_status()) or
208
207
        (working and working.get_physical_lock_status())):
209
208
        outfile.write('\n')
414
413
    if branch is not None:
415
414
        show_committers = verbose >= 2
416
415
        stats = _show_branch_stats(branch, show_committers, outfile)
417
 
    elif repository is not None:
 
416
    else:
418
417
        stats = repository.gather_stats()
419
 
    if branch is None and working is None and repository is not None:
 
418
    if branch is None and working is None:
420
419
        _show_repository_info(repository, outfile)
421
 
    if repository is not None:
422
 
        _show_repository_stats(repository, stats, outfile)
 
420
    _show_repository_stats(repository, stats, outfile)
423
421
 
424
422
 
425
423
def describe_layout(repository=None, branch=None, tree=None, control=None):