/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/bundle/commands.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:22:34 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7306.
  • Revision ID: jelmer@jelmer.uk-20190529032234-mt3fuws8gq03tapi
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/commands.py
63
63
        else:
64
64
            if verbose:
65
65
                raise errors.BzrCommandError(gettext(
66
 
                            '--verbose requires a merge directive'))
 
66
                    '--verbose requires a merge directive'))
67
67
        reader_method = getattr(bundle_info, 'get_bundle_reader', None)
68
68
        if reader_method is None:
69
 
            raise errors.BzrCommandError(gettext('Bundle format not supported'))
 
69
            raise errors.BzrCommandError(
 
70
                gettext('Bundle format not supported'))
70
71
 
71
72
        by_kind = {}
72
73
        file_ids = set()
73
74
        for bytes, parents, repo_kind, revision_id, file_id\
74
 
            in reader_method().iter_records():
 
75
                in reader_method().iter_records():
75
76
            by_kind.setdefault(repo_kind, []).append(
76
77
                (bytes, parents, repo_kind, revision_id, file_id))
77
78
            if file_id is not None:
93
94
 
94
95
        self.outf.write(gettext('Revisions\n'))
95
96
        self.outf.write((gettext('nicks: %s\n')
96
 
            % ', '.join(sorted(nicks))).encode(term_encoding, 'replace'))
 
97
                         % ', '.join(sorted(nicks))).encode(term_encoding, 'replace'))
97
98
        self.outf.write((gettext('committers: \n%s\n') %
98
 
        '\n'.join(sorted(committers)).encode(term_encoding, 'replace')))
 
99
                         '\n'.join(sorted(committers)).encode(term_encoding, 'replace')))
99
100
        if verbose:
100
101
            self.outf.write('\n')
101
102
            bundle_file.seek(0)