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
20
class cmd_send_changeset(Command):
21
"""Send a bundled up changset via mail.
23
If no revision has been specified, the last commited change will
26
Subject of the mail can be specified by the --message option,
27
otherwise information from the changeset log will be used.
29
A editor will be spawned where the user may enter a description
30
of the changeset. The description can be read from a file with
31
the --file FILE option.
33
takes_options = ['revision', 'message', 'file']
36
def run(self, to=None, message=None, revision=None, file=None):
37
from bzrlib.errors import BzrCommandError
38
from send_changeset import send_changeset
40
if isinstance(revision, (list, tuple)):
42
raise BzrCommandError('We do not support rollup-changesets yet.')
43
revision = revision[0]
45
b = Branch.open_containing('.')
49
to = b.controlfile('x-send-address', 'rb').read().strip('\n')
51
raise BzrCommandError('destination address is not known')
53
if not isinstance(revision, (list, tuple)):
56
send_changeset(b, revision, to, message, file)
59
class cmd_bundle_revisions(Command):
60
"""Generate a revision bundle.
62
This bundle contains all of the meta-information of a
63
diff, rather than just containing the patch information.
65
You can apply it to another tree using 'bzr merge'.
68
- Bundle for the last commit
70
- Bundle to apply the current tree into BASE
71
bzr bundle --revision A
72
- Bundle for revision A
73
bzr bundle --revision A..B
74
- Bundle to transform A into B
75
bzr bundle --revision A..B BASE
76
- Bundle to transform revision A of BASE into revision B
79
takes_options = ['verbose', 'revision']
80
takes_args = ['base?']
83
def run(self, base=None, revision=None):
84
from bzrlib import user_encoding
85
from bzrlib.bundle.serializer import write_bundle
90
base_branch = Branch.open(base)
92
# We don't want to lock the same branch across
93
# 2 different branches
94
target_branch = Branch.open_containing(u'.')[0]
95
if base_branch is not None and target_branch.base == base_branch.base:
100
target_revision = target_branch.last_revision()
101
elif len(revision) == 1:
102
target_revision = revision[0].in_history(target_branch).rev_id
103
if base_branch is not None:
104
base_revision = base_branch.last_revision()
105
elif len(revision) == 2:
106
target_revision = revision[1].in_history(target_branch).rev_id
107
if base_branch is not None:
108
base_revision = revision[0].in_history(base_branch).rev_id
110
base_revision = revision[0].in_history(target_branch).rev_id
112
raise errors.BzrCommandError('--revision takes 1 or 2 parameters')
114
if revision is None or len(revision) == 1:
115
if base_branch is not None:
116
target_branch.repository.fetch(base_branch.repository,
117
base_branch.last_revision())
118
base_revision = common_ancestor(base_branch.last_revision(),
120
target_branch.repository)
121
if base_revision is None:
122
base_revision = NULL_REVISION
124
if base_revision is None:
125
rev = target_branch.repository.get_revision(target_revision)
127
base_revision = rev.parent_ids[0]
129
base_revision = NULL_REVISION
131
if base_branch is not None:
132
target_branch.repository.fetch(base_branch.repository,
133
revision_id=base_revision)
135
write_bundle(target_branch.repository, target_revision, base_revision,
139
class cmd_verify_changeset(Command):
140
"""Read a written changeset, and make sure it is valid.
143
takes_args = ['filename?']
145
def run(self, filename=None):
146
from read_changeset import read_changeset
147
#from bzrlib.xml import serializer_v4
149
b, relpath = Branch.open_containing('.')
151
if filename is None or filename == '-':
154
f = open(filename, 'U')
156
cset_info, cset_tree = read_changeset(f, b)
159
#serializer_v4.write(cset_tree.inventory, sys.stdout)
added
removed
bzrlib/bundle/commands.py
