← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/commands.py

  • Committer: Martin von Gagern
  • Date: 2011-06-01 12:53:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6009.
  • Revision ID: martin.vgagern@gmx.net-20110601125356-lwozv2vecea6hxfz
Change from no_decorate to classify as name for the argument.

The command line switch remains as --no-classify, to keep backwards
compatibility.  Users are free to include --no-classify in an alias, and
still use --classify to change back.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/commands.py
32
32
    urlutils,
33
33
    transport,
34
34
    )
35
 
from bzrlib.i18n import gettext
36
35
""")
37
36
 
38
37
from bzrlib.commands import Command
57
56
            bundle_info = read_bundle(bundle_file)
58
57
        else:
59
58
            if verbose:
60
 
                raise errors.BzrCommandError(gettext(
61
 
                            '--verbose requires a merge directive'))
 
59
                raise errors.BzrCommandError('--verbose requires a merge'
 
60
                    ' directive')
62
61
        reader_method = getattr(bundle_info, 'get_bundle_reader', None)
63
62
        if reader_method is None:
64
 
            raise errors.BzrCommandError(gettext('Bundle format not supported'))
 
63
            raise errors.BzrCommandError('Bundle format not supported')
65
64
 
66
65
        by_kind = {}
67
66
        file_ids = set()
71
70
                (bytes, parents, repo_kind, revision_id, file_id))
72
71
            if file_id is not None:
73
72
                file_ids.add(file_id)
74
 
        self.outf.write(gettext('Records\n'))
 
73
        self.outf.write('Records\n')
75
74
        for kind, records in sorted(by_kind.iteritems()):
76
75
            multiparent = sum(1 for b, m, k, r, f in records if
77
76
                              len(m.get('parents', [])) > 1)
78
 
            self.outf.write(gettext('{0}: {1} ({2} multiparent)\n').format(
79
 
                kind, len(records), multiparent))
80
 
        self.outf.write(gettext('unique files: %d\n') % len(file_ids))
 
77
            self.outf.write('%s: %d (%d multiparent)\n' % \
 
78
                (kind, len(records), multiparent))
 
79
        self.outf.write('unique files: %d\n' % len(file_ids))
81
80
        self.outf.write('\n')
82
81
        nicks = set()
83
82
        committers = set()
86
85
                nicks.add(revision.properties['branch-nick'])
87
86
            committers.add(revision.committer)
88
87
 
89
 
        self.outf.write(gettext('Revisions\n'))
90
 
        self.outf.write((gettext('nicks: %s\n')
 
88
        self.outf.write('Revisions\n')
 
89
        self.outf.write(('nicks: %s\n'
91
90
            % ', '.join(sorted(nicks))).encode(term_encoding, 'replace'))
92
 
        self.outf.write((gettext('committers: \n%s\n') %
 
91
        self.outf.write(('committers: \n%s\n' %
93
92
        '\n'.join(sorted(committers)).encode(term_encoding, 'replace')))
94
93
        if verbose:
95
94
            self.outf.write('\n')
97
96
            line = bundle_file.readline()
98
97
            line = bundle_file.readline()
99
98
            content = bundle_file.read().decode('bz2')
100
 
            self.outf.write(gettext("Decoded contents\n"))
 
99
            self.outf.write("Decoded contents\n")
101
100
            self.outf.write(content)
102
101
            self.outf.write('\n')