/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: 2018-05-06 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180506114854-h4qd9ojaqy8wxjsd
Move .mailmap to root.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/commands.py
23
23
 
24
24
from __future__ import absolute_import
25
25
 
26
 
from ... import (
27
 
    errors,
28
 
    )
29
 
 
30
 
from ...lazy_import import lazy_import
 
26
from ..lazy_import import lazy_import
31
27
lazy_import(globals(), """
32
28
from breezy import (
33
29
    branch,
 
30
    errors,
34
31
    merge_directive,
35
32
    revision as _mod_revision,
36
33
    urlutils,
39
36
from breezy.i18n import gettext
40
37
""")
41
38
 
42
 
from ...commands import Command
43
 
from ...sixish import (
 
39
from ..commands import Command
 
40
from ..sixish import (
44
41
    BytesIO,
45
42
    viewitems,
46
43
    )
55
52
    encoding_type = 'exact'
56
53
 
57
54
    def run(self, location, verbose=False):
58
 
        from breezy.bzr.bundle.serializer import read_bundle
59
 
        from breezy.mergeable import read_mergeable_from_url
 
55
        from breezy.bundle.serializer import read_bundle
 
56
        from breezy.bundle import read_mergeable_from_url
60
57
        from breezy import osutils
61
58
        term_encoding = osutils.get_terminal_encoding()
62
59
        bundle_info = read_mergeable_from_url(location)
66
63
        else:
67
64
            if verbose:
68
65
                raise errors.BzrCommandError(gettext(
69
 
                    '--verbose requires a merge directive'))
 
66
                            '--verbose requires a merge directive'))
70
67
        reader_method = getattr(bundle_info, 'get_bundle_reader', None)
71
68
        if reader_method is None:
72
 
            raise errors.BzrCommandError(
73
 
                gettext('Bundle format not supported'))
 
69
            raise errors.BzrCommandError(gettext('Bundle format not supported'))
74
70
 
75
71
        by_kind = {}
76
72
        file_ids = set()
77
73
        for bytes, parents, repo_kind, revision_id, file_id\
78
 
                in reader_method().iter_records():
 
74
            in reader_method().iter_records():
79
75
            by_kind.setdefault(repo_kind, []).append(
80
76
                (bytes, parents, repo_kind, revision_id, file_id))
81
77
            if file_id is not None:
97
93
 
98
94
        self.outf.write(gettext('Revisions\n'))
99
95
        self.outf.write((gettext('nicks: %s\n')
100
 
                         % ', '.join(sorted(nicks))).encode(term_encoding, 'replace'))
 
96
            % ', '.join(sorted(nicks))).encode(term_encoding, 'replace'))
101
97
        self.outf.write((gettext('committers: \n%s\n') %
102
 
                         '\n'.join(sorted(committers)).encode(term_encoding, 'replace')))
 
98
        '\n'.join(sorted(committers)).encode(term_encoding, 'replace')))
103
99
        if verbose:
104
100
            self.outf.write('\n')
105
101
            bundle_file.seek(0)
106
102
            line = bundle_file.readline()
107
103
            line = bundle_file.readline()
108
 
            import bz2
109
 
            content = bz2.decompress(bundle_file.read())
 
104
            content = bundle_file.read().decode('bz2')
110
105
            self.outf.write(gettext("Decoded contents\n"))
111
106
            self.outf.write(content)
112
107
            self.outf.write('\n')