← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

(vila) Provide a config section matcher respecting the file order. (Vincent
 Ladeuil)

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(name="")
 
355
            branch = a_bzrdir.open_branch()
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 = []
446
445
        if repository.make_working_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)
 
446
            phrase += ' with trees'
452
447
        return phrase
453
448
    else:
454
449
        if repository.is_shared():