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.revisionspec import RevisionSpec
18
from bzrlib.trace import note
19
from bzrlib import urlutils
22
class cmd_send_changeset(Command):
23
"""Send a bundled up changset via mail.
25
If no revision has been specified, the last commited change will
28
Subject of the mail can be specified by the --message option,
29
otherwise information from the changeset log will be used.
31
A editor will be spawned where the user may enter a description
32
of the changeset. The description can be read from a file with
33
the --file FILE option.
35
takes_options = ['revision', 'message', 'file']
38
def run(self, to=None, message=None, revision=None, file=None):
39
from bzrlib.errors import BzrCommandError
40
from send_changeset import send_changeset
42
if isinstance(revision, (list, tuple)):
44
raise BzrCommandError('We do not support rollup-changesets yet.')
45
revision = revision[0]
47
b = Branch.open_containing('.')
51
to = b.controlfile('x-send-address', 'rb').read().strip('\n')
53
raise BzrCommandError('destination address is not known')
55
if not isinstance(revision, (list, tuple)):
58
send_changeset(b, revision, to, message, file)
61
class cmd_bundle_revisions(Command):
62
"""Generate a revision bundle.
64
This bundle contains all of the meta-information of a
65
diff, rather than just containing the patch information.
67
You can apply it to another tree using 'bzr merge'.
70
- Generate a bundle relative to a remembered location
71
bzr bundle-revisions BASE
72
- Bundle to apply the current tree into BASE
73
bzr bundle-revisions --revision A
74
- Bundle to apply revision A to remembered location
75
bzr bundle-revisions --revision A..B
76
- Bundle to transform A into B
78
takes_options = ['verbose', 'revision', 'remember',
79
Option("output", help="write bundle to specified file",
81
takes_args = ['base?']
84
def run(self, base=None, revision=None, output=None, remember=False):
85
from bzrlib import user_encoding
86
from bzrlib.bundle.serializer import write_bundle
88
target_branch = Branch.open_containing(u'.')[0]
91
base_specified = False
96
target_revision = target_branch.last_revision()
97
elif len(revision) < 3:
98
target_revision = revision[-1].in_history(target_branch).rev_id
99
if len(revision) == 2:
101
raise errors.BzrCommandError('Cannot specify base as well'
102
' as two revision arguments.')
103
base_revision = revision[0].in_history(target_branch).rev_id
105
raise errors.BzrCommandError('--revision takes 1 or 2 parameters')
107
if revision is None or len(revision) < 2:
108
submit_branch = target_branch.get_submit_branch()
112
base = target_branch.get_parent()
114
raise errors.BzrCommandError("No base branch known or"
116
elif not base_specified:
118
# note() doesn't pay attention to terminal_encoding() so
119
# we must format with 'ascii' to be safe
120
note('Using saved location: %s',
121
urlutils.unescape_for_display(base, 'ascii'))
122
base_branch = Branch.open(base)
124
# We don't want to lock the same branch across
125
# 2 different branches
126
if target_branch.base == base_branch.base:
127
base_branch = target_branch
128
if submit_branch is None or remember:
130
target_branch.set_submit_branch(base_branch.base)
132
raise errors.BzrCommandError('--remember requires a branch'
134
target_branch.repository.fetch(base_branch.repository,
135
base_branch.last_revision())
136
base_revision = common_ancestor(base_branch.last_revision(),
138
target_branch.repository)
141
if output is not None:
142
fileobj = file(output, 'wb')
145
target_branch.repository.lock_read()
147
write_bundle(target_branch.repository, target_revision,
148
base_revision, fileobj)
150
target_branch.repository.unlock()
153
class cmd_verify_changeset(Command):
154
"""Read a written changeset, and make sure it is valid.
157
takes_args = ['filename?']
159
def run(self, filename=None):
160
from read_changeset import read_changeset
161
#from bzrlib.xml import serializer_v4
163
b, relpath = Branch.open_containing('.')
165
if filename is None or filename == '-':
168
f = open(filename, 'U')
170
cset_info, cset_tree = read_changeset(f, b)
173
#serializer_v4.write(cset_tree.inventory, sys.stdout)
added
removed
bzrlib/bundle/commands.py
