← 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-23 19:08:05 UTC
  • mfrom: (6437.3.20 2.5)
  • mto: This revision was merged to the branch mainline in revision 6450.
  • Revision ID: jelmer@samba.org-20120123190805-hlcuihkt2dep44cw
merge bzr 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
__all__ = ['show_bzrdir_info']
18
20
 
19
21
from cStringIO import StringIO
350
352
    except (NoWorkingTree, NotLocalUrl, NotBranchError):
351
353
        tree = None
352
354
        try:
353
 
            branch = a_bzrdir.open_branch()
 
355
            branch = a_bzrdir.open_branch(name="")
354
356
        except NotBranchError:
355
357
            branch = None
356
358
            try:
440
442
            phrase = 'Shared repository'
441
443
        else:
442
444
            phrase = 'Unshared repository'
 
445
        extra = []
443
446
        if repository.make_working_trees():
444
 
            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)
445
452
        return phrase
446
453
    else:
447
454
        if repository.is_shared():