/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: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/info.py
113
113
            if working_path == master_path_base:
114
114
                locs['checkout of co-located branch'] = params['branch']
115
115
            elif 'branch' in params:
116
 
                locs['checkout of branch'] = "%s, branch %s" % (
 
116
                locs['checkout of branch'] = "%s, branch %s" (
117
117
                    master_path_base, params['branch'])
118
118
            else:
119
119
                locs['checkout of branch'] = master_path
284
284
    outfile.write('  %8d added\n' % len(delta.added))
285
285
    outfile.write('  %8d removed\n' % len(delta.removed))
286
286
    outfile.write('  %8d renamed\n' % len(delta.renamed))
287
 
    outfile.write('  %8d copied\n' % len(delta.copied))
288
287
 
289
288
    ignore_cnt = unknown_cnt = 0
290
289
    for path in working.extras():
457
456
        extra = []
458
457
        if repository.make_working_trees():
459
458
            extra.append('trees')
460
 
        if len(control.branch_names()) > 0:
 
459
        if len(control.get_branches()) > 0:
461
460
            extra.append('colocated branches')
462
461
        if extra:
463
462
            phrase += ' with ' + " and ".join(extra)