← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-20 15:56:56 UTC
  • mfrom: (6437.3.16 2.5)
  • mto: (6437.3.19 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120120155656-frygh6clinh5rr0q
Merge lp:bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
352
352
    except (NoWorkingTree, NotLocalUrl, NotBranchError):
353
353
        tree = None
354
354
        try:
355
 
            branch = a_bzrdir.open_branch()
 
355
            branch = a_bzrdir.open_branch(name="")
356
356
        except NotBranchError:
357
357
            branch = None
358
358
            try:
442
442
            phrase = 'Shared repository'
443
443
        else:
444
444
            phrase = 'Unshared repository'
 
445
        extra = []
445
446
        if repository.make_working_trees():
446
 
            phrase += ' with trees'
 
447
            extra.append('trees')
 
448
        if len(control.get_branches()) > 0:
 
449
            extra.append('colocated branches')
 
450
        if extra:
 
451
            phrase += ' with ' + " and ".join(extra)
447
452
        return phrase
448
453
    else:
449
454
        if repository.is_shared():