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.branch import Branch
12
from bzrlib.commands import Command, register_command
13
import bzrlib.errors as errors
14
from bzrlib.option import Option
15
from bzrlib.revision import (common_ancestor, MultipleRevisionSources,
17
from bzrlib.trace import note
18
from bzrlib import urlutils
21
class cmd_send_changeset(Command):
22
"""Send a bundled up changset via mail.
24
If no revision has been specified, the last commited change will
27
Subject of the mail can be specified by the --message option,
28
otherwise information from the changeset log will be used.
30
A editor will be spawned where the user may enter a description
31
of the changeset. The description can be read from a file with
32
the --file FILE option.
34
takes_options = ['revision', 'message', 'file']
37
def run(self, to=None, message=None, revision=None, file=None):
38
from bzrlib.errors import BzrCommandError
39
from send_changeset import send_changeset
41
if isinstance(revision, (list, tuple)):
43
raise BzrCommandError('We do not support rollup-changesets yet.')
44
revision = revision[0]
46
b = Branch.open_containing('.')
50
to = b.controlfile('x-send-address', 'rb').read().strip('\n')
52
raise BzrCommandError('destination address is not known')
54
if not isinstance(revision, (list, tuple)):
57
send_changeset(b, revision, to, message, file)
60
class cmd_bundle_revisions(Command):
61
"""Generate a revision bundle.
63
This bundle contains all of the meta-information of a
64
diff, rather than just containing the patch information.
66
You can apply it to another tree using 'bzr merge'.
69
- Generate a bundle relative to a remembered location
70
bzr bundle-revisions BASE
71
- Bundle to apply the current tree into BASE
72
bzr bundle-revisions --revision A
73
- Bundle to apply revision A to remembered location
74
bzr bundle-revisions --revision A..B
75
- Bundle to transform A into B
77
takes_options = ['verbose', 'revision', 'remember',
78
Option("output", help="write bundle to specified file",
80
takes_args = ['base?']
83
def run(self, base=None, revision=None, output=None, remember=False):
84
from bzrlib import user_encoding
85
from bzrlib.bundle.serializer import write_bundle
87
target_branch = Branch.open_containing(u'.')[0]
90
base_specified = False
95
target_revision = target_branch.last_revision()
96
elif len(revision) < 3:
97
target_revision = revision[-1].in_history(target_branch).rev_id
98
if len(revision) == 2:
100
raise errors.BzrCommandError('Cannot specify base as well'
101
' as two revision arguments.')
102
base_revision = revision[0].in_history(target_branch).rev_id
104
raise errors.BzrCommandError('--revision takes 1 or 2 parameters')
106
if revision is None or len(revision) < 2:
107
submit_branch = target_branch.get_submit_branch()
111
base = target_branch.get_parent()
113
raise errors.BzrCommandError("No base branch known or"
115
elif not base_specified:
117
# note() doesn't pay attention to terminal_encoding() so
118
# we must format with 'ascii' to be safe
119
note('Using saved location: %s',
120
urlutils.unescape_for_display(base, 'ascii'))
121
base_branch = Branch.open(base)
123
# We don't want to lock the same branch across
124
# 2 different branches
125
if target_branch.base == base_branch.base:
126
base_branch = target_branch
127
if submit_branch is None or remember:
129
target_branch.set_submit_branch(base_branch.base)
131
raise errors.BzrCommandError('--remember requires a branch'
133
target_branch.repository.fetch(base_branch.repository,
134
base_branch.last_revision())
135
base_revision = common_ancestor(base_branch.last_revision(),
137
target_branch.repository)
140
if output is not None:
141
fileobj = file(output, 'wb')
144
target_branch.repository.lock_read()
146
write_bundle(target_branch.repository, target_revision,
147
base_revision, fileobj)
149
target_branch.repository.unlock()
152
class cmd_verify_changeset(Command):
153
"""Read a written changeset, and make sure it is valid.
156
takes_args = ['filename?']
158
def run(self, filename=None):
159
from read_changeset import read_changeset
160
#from bzrlib.xml import serializer_v4
162
b, relpath = Branch.open_containing('.')
164
if filename is None or filename == '-':
167
f = open(filename, 'U')
169
cset_info, cset_tree = read_changeset(f, b)
172
#serializer_v4.write(cset_tree.inventory, sys.stdout)
added
removed
bzrlib/bundle/commands.py
