← 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 Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/commands.py
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
16
17
"""\
17
18
This is an attempt to take the internal delta object, and represent
18
19
it as a single-file text-only changeset.
20
21
and for applying a changeset.
21
22
"""
22
23
 
 
24
from __future__ import absolute_import
 
25
 
23
26
from cStringIO import StringIO
24
27
 
25
28
from bzrlib.lazy_import import lazy_import
32
35
    urlutils,
33
36
    transport,
34
37
    )
 
38
from bzrlib.i18n import gettext
35
39
""")
36
40
 
37
41
from bzrlib.commands import Command
56
60
            bundle_info = read_bundle(bundle_file)
57
61
        else:
58
62
            if verbose:
59
 
                raise errors.BzrCommandError('--verbose requires a merge'
60
 
                    ' directive')
 
63
                raise errors.BzrCommandError(gettext(
 
64
                            '--verbose requires a merge directive'))
61
65
        reader_method = getattr(bundle_info, 'get_bundle_reader', None)
62
66
        if reader_method is None:
63
 
            raise errors.BzrCommandError('Bundle format not supported')
 
67
            raise errors.BzrCommandError(gettext('Bundle format not supported'))
64
68
 
65
69
        by_kind = {}
66
70
        file_ids = set()
70
74
                (bytes, parents, repo_kind, revision_id, file_id))
71
75
            if file_id is not None:
72
76
                file_ids.add(file_id)
73
 
        self.outf.write('Records\n')
 
77
        self.outf.write(gettext('Records\n'))
74
78
        for kind, records in sorted(by_kind.iteritems()):
75
79
            multiparent = sum(1 for b, m, k, r, f in records if
76
80
                              len(m.get('parents', [])) > 1)
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
            self.outf.write(gettext('{0}: {1} ({2} multiparent)\n').format(
 
82
                kind, len(records), multiparent))
 
83
        self.outf.write(gettext('unique files: %d\n') % len(file_ids))
80
84
        self.outf.write('\n')
81
85
        nicks = set()
82
86
        committers = set()
85
89
                nicks.add(revision.properties['branch-nick'])
86
90
            committers.add(revision.committer)
87
91
 
88
 
        self.outf.write('Revisions\n')
89
 
        self.outf.write(('nicks: %s\n'
 
92
        self.outf.write(gettext('Revisions\n'))
 
93
        self.outf.write((gettext('nicks: %s\n')
90
94
            % ', '.join(sorted(nicks))).encode(term_encoding, 'replace'))
91
 
        self.outf.write(('committers: \n%s\n' %
 
95
        self.outf.write((gettext('committers: \n%s\n') %
92
96
        '\n'.join(sorted(committers)).encode(term_encoding, 'replace')))
93
97
        if verbose:
94
98
            self.outf.write('\n')
96
100
            line = bundle_file.readline()
97
101
            line = bundle_file.readline()
98
102
            content = bundle_file.read().decode('bz2')
99
 
            self.outf.write("Decoded contents\n")
 
103
            self.outf.write(gettext("Decoded contents\n"))
100
104
            self.outf.write(content)
101
105
            self.outf.write('\n')