/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/info.py

  • Committer: Jelmer Vernooij
  • Date: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/info.py
455
455
        extra = []
456
456
        if repository.make_working_trees():
457
457
            extra.append('trees')
458
 
        if len(control.get_branches()) > 0:
 
458
        if len(control.branch_names()) > 0:
459
459
            extra.append('colocated branches')
460
460
        if extra:
461
461
            phrase += ' with ' + " and ".join(extra)