40
37
from bzrlib.trace import note
43
class cmd_bundle_info(Command):
44
"""Output interesting stats about a bundle"""
47
takes_args = ['location']
48
takes_options = ['verbose']
40
class cmd_send_changeset(Command):
41
"""Send a bundled up changset via mail.
43
If no revision has been specified, the last commited change will
46
Subject of the mail can be specified by the --message option,
47
otherwise information from the changeset log will be used.
49
A editor will be spawned where the user may enter a description
50
of the changeset. The description can be read from a file with
51
the --file FILE option.
53
takes_options = ['revision', 'message', 'file']
56
def run(self, to=None, message=None, revision=None, file=None):
57
from bzrlib.errors import BzrCommandError
58
from send_changeset import send_changeset
60
if isinstance(revision, (list, tuple)):
62
raise BzrCommandError('We do not support rollup-changesets yet.')
63
revision = revision[0]
65
b = branch.Branch.open_containing('.')
69
to = b.controlfile('x-send-address', 'rb').read().strip('\n')
71
raise BzrCommandError('destination address is not known')
73
if not isinstance(revision, (list, tuple)):
76
send_changeset(b, revision, to, message, file)
79
class cmd_bundle_revisions(Command):
80
"""Generate a revision bundle.
82
This bundle contains all of the meta-information of a
83
diff, rather than just containing the patch information.
85
You can apply it to another tree using 'bzr merge'.
88
- Generate a bundle relative to a remembered location
89
bzr bundle-revisions BASE
90
- Bundle to apply the current tree into BASE
91
bzr bundle-revisions --revision A
92
- Bundle to apply revision A to remembered location
93
bzr bundle-revisions --revision A..B
94
- Bundle to transform A into B
96
takes_options = ['verbose', 'revision', 'remember',
97
Option("output", help="write bundle to specified file",
99
takes_args = ['base?']
49
101
encoding_type = 'exact'
51
def run(self, location, verbose=False):
52
from bzrlib.bundle.serializer import read_bundle
53
from bzrlib.bundle import read_mergeable_from_url
54
from bzrlib import osutils
55
term_encoding = osutils.get_terminal_encoding()
56
bundle_info = read_mergeable_from_url(location)
57
if isinstance(bundle_info, merge_directive._BaseMergeDirective):
58
bundle_file = StringIO(bundle_info.get_raw_bundle())
59
bundle_info = read_bundle(bundle_file)
62
raise errors.BzrCommandError('--verbose requires a merge'
64
reader_method = getattr(bundle_info, 'get_bundle_reader', None)
65
if reader_method is None:
66
raise errors.BzrCommandError('Bundle format not supported')
70
for bytes, parents, repo_kind, revision_id, file_id\
71
in reader_method().iter_records():
72
by_kind.setdefault(repo_kind, []).append(
73
(bytes, parents, repo_kind, revision_id, file_id))
74
if file_id is not None:
76
self.outf.write('Records\n')
77
for kind, records in sorted(by_kind.iteritems()):
78
multiparent = sum(1 for b, m, k, r, f in records if
79
len(m.get('parents', [])) > 1)
80
self.outf.write('%s: %d (%d multiparent)\n' % \
81
(kind, len(records), multiparent))
82
self.outf.write('unique files: %d\n' % len(file_ids))
86
for revision in bundle_info.real_revisions:
87
if 'branch-nick' in revision.properties:
88
nicks.add(revision.properties['branch-nick'])
89
committers.add(revision.committer)
91
self.outf.write('Revisions\n')
92
self.outf.write(('nicks: %s\n'
93
% ', '.join(sorted(nicks))).encode(term_encoding, 'replace'))
94
self.outf.write(('committers: \n%s\n' %
95
'\n'.join(sorted(committers)).encode(term_encoding, 'replace')))
99
line = bundle_file.readline()
100
line = bundle_file.readline()
101
content = bundle_file.read().decode('bz2')
102
self.outf.write("Decoded contents\n")
103
self.outf.write(content)
104
self.outf.write('\n')
103
def run(self, base=None, revision=None, output=None, remember=False):
104
from bzrlib import user_encoding
105
from bzrlib.bundle.serializer import write_bundle
107
target_branch = branch.Branch.open_containing(u'.')[0]
110
base_specified = False
112
base_specified = True
115
target_revision = target_branch.last_revision()
116
elif len(revision) < 3:
117
target_revision = revision[-1].in_history(target_branch).rev_id
118
if len(revision) == 2:
120
raise errors.BzrCommandError('Cannot specify base as well'
121
' as two revision arguments.')
122
base_revision = revision[0].in_history(target_branch).rev_id
124
raise errors.BzrCommandError('--revision takes 1 or 2 parameters')
126
if revision is None or len(revision) < 2:
127
submit_branch = target_branch.get_submit_branch()
131
base = target_branch.get_parent()
133
raise errors.BzrCommandError("No base branch known or"
135
elif not base_specified:
137
# note() doesn't pay attention to terminal_encoding() so
138
# we must format with 'ascii' to be safe
139
note('Using saved location: %s',
140
urlutils.unescape_for_display(base, 'ascii'))
141
base_branch = branch.Branch.open(base)
143
# We don't want to lock the same branch across
144
# 2 different branches
145
if target_branch.base == base_branch.base:
146
base_branch = target_branch
147
if submit_branch is None or remember:
149
target_branch.set_submit_branch(base_branch.base)
151
raise errors.BzrCommandError('--remember requires a branch'
153
target_branch.repository.fetch(base_branch.repository,
154
base_branch.last_revision())
155
base_revision = common_ancestor(base_branch.last_revision(),
157
target_branch.repository)
160
if output is not None:
161
fileobj = file(output, 'wb')
164
target_branch.repository.lock_read()
166
write_bundle(target_branch.repository, target_revision,
167
base_revision, fileobj)
169
target_branch.repository.unlock()
172
class cmd_verify_changeset(Command):
173
"""Read a written changeset, and make sure it is valid.
176
takes_args = ['filename?']
178
def run(self, filename=None):
179
from read_changeset import read_changeset
180
#from bzrlib.xml import serializer_v4
182
b, relpath = branch.Branch.open_containing('.')
184
if filename is None or filename == '-':
187
f = open(filename, 'U')
189
cset_info, cset_tree = read_changeset(f, b)
192
#serializer_v4.write(cset_tree.inventory, sys.stdout)
added
removed
bzrlib/bundle/commands.py
