3
This is an attempt to take the internal delta object, and represent
4
it as a single-file text-only changeset.
5
This should have commands for both generating a changeset,
6
and for applying a changeset.
11
from bzrlib.lazy_import import lazy_import
12
lazy_import(globals(), """
18
from bzrlib.revision import common_ancestor
21
from bzrlib.commands import Command
22
from bzrlib.option import Option
23
from bzrlib.trace import note
26
class cmd_send_changeset(Command):
27
"""Send a bundled up changset via mail.
29
If no revision has been specified, the last commited change will
32
Subject of the mail can be specified by the --message option,
33
otherwise information from the changeset log will be used.
35
A editor will be spawned where the user may enter a description
36
of the changeset. The description can be read from a file with
37
the --file FILE option.
39
takes_options = ['revision', 'message', 'file']
42
def run(self, to=None, message=None, revision=None, file=None):
43
from bzrlib.errors import BzrCommandError
44
from send_changeset import send_changeset
46
if isinstance(revision, (list, tuple)):
48
raise BzrCommandError('We do not support rollup-changesets yet.')
49
revision = revision[0]
51
b = branch.Branch.open_containing('.')
55
to = b.controlfile('x-send-address', 'rb').read().strip('\n')
57
raise BzrCommandError('destination address is not known')
59
if not isinstance(revision, (list, tuple)):
62
send_changeset(b, revision, to, message, file)
65
class cmd_bundle_revisions(Command):
66
"""Generate a revision bundle.
68
This bundle contains all of the meta-information of a
69
diff, rather than just containing the patch information.
71
You can apply it to another tree using 'bzr merge'.
74
- Generate a bundle relative to a remembered location
75
bzr bundle-revisions BASE
76
- Bundle to apply the current tree into BASE
77
bzr bundle-revisions --revision A
78
- Bundle to apply revision A to remembered location
79
bzr bundle-revisions --revision A..B
80
- Bundle to transform A into B
82
takes_options = ['verbose', 'revision', 'remember',
83
Option("output", help="write bundle to specified file",
85
takes_args = ['base?']
88
def run(self, base=None, revision=None, output=None, remember=False):
89
from bzrlib import user_encoding
90
from bzrlib.bundle.serializer import write_bundle
92
target_branch = branch.Branch.open_containing(u'.')[0]
95
base_specified = False
100
target_revision = target_branch.last_revision()
101
elif len(revision) < 3:
102
target_revision = revision[-1].in_history(target_branch).rev_id
103
if len(revision) == 2:
105
raise errors.BzrCommandError('Cannot specify base as well'
106
' as two revision arguments.')
107
base_revision = revision[0].in_history(target_branch).rev_id
109
raise errors.BzrCommandError('--revision takes 1 or 2 parameters')
111
if revision is None or len(revision) < 2:
112
submit_branch = target_branch.get_submit_branch()
116
base = target_branch.get_parent()
118
raise errors.BzrCommandError("No base branch known or"
120
elif not base_specified:
122
# note() doesn't pay attention to terminal_encoding() so
123
# we must format with 'ascii' to be safe
124
note('Using saved location: %s',
125
urlutils.unescape_for_display(base, 'ascii'))
126
base_branch = branch.Branch.open(base)
128
# We don't want to lock the same branch across
129
# 2 different branches
130
if target_branch.base == base_branch.base:
131
base_branch = target_branch
132
if submit_branch is None or remember:
134
target_branch.set_submit_branch(base_branch.base)
136
raise errors.BzrCommandError('--remember requires a branch'
138
target_branch.repository.fetch(base_branch.repository,
139
base_branch.last_revision())
140
base_revision = common_ancestor(base_branch.last_revision(),
142
target_branch.repository)
145
if output is not None:
146
fileobj = file(output, 'wb')
149
target_branch.repository.lock_read()
151
write_bundle(target_branch.repository, target_revision,
152
base_revision, fileobj)
154
target_branch.repository.unlock()
157
class cmd_verify_changeset(Command):
158
"""Read a written changeset, and make sure it is valid.
161
takes_args = ['filename?']
163
def run(self, filename=None):
164
from read_changeset import read_changeset
165
#from bzrlib.xml import serializer_v4
167
b, relpath = branch.Branch.open_containing('.')
169
if filename is None or filename == '-':
172
f = open(filename, 'U')
174
cset_info, cset_tree = read_changeset(f, b)
177
#serializer_v4.write(cset_tree.inventory, sys.stdout)
added
removed
bzrlib/bundle/commands.py
