1
# Copyright (C) 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
This is an attempt to take the internal delta object, and represent
18
it as a single-file text-only changeset.
19
This should have commands for both generating a changeset,
20
and for applying a changeset.
25
from bzrlib.lazy_import import lazy_import
26
lazy_import(globals(), """
32
from bzrlib.revision import common_ancestor
35
from bzrlib.commands import Command
36
from bzrlib.option import Option
37
from bzrlib.trace import note
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
90
bzr bundle-revisions BASE
91
- Bundle to apply the current tree into BASE
93
bzr bundle-revisions --revision A
94
- Bundle to apply revision A to remembered location
96
bzr bundle-revisions --revision A..B
97
- Bundle to transform A into B
99
takes_options = ['revision', 'remember',
100
Option("output", help="write bundle to specified file",
102
takes_args = ['base?']
104
encoding_type = 'exact'
106
def run(self, base=None, revision=None, output=None, remember=False):
107
from bzrlib import user_encoding
108
from bzrlib.bundle.serializer import write_bundle
110
target_branch = branch.Branch.open_containing(u'.')[0]
113
base_specified = False
115
base_specified = True
118
target_revision = target_branch.last_revision()
119
elif len(revision) < 3:
120
target_revision = revision[-1].in_history(target_branch).rev_id
121
if len(revision) == 2:
123
raise errors.BzrCommandError('Cannot specify base as well'
124
' as two revision arguments.')
125
base_revision = revision[0].in_history(target_branch).rev_id
127
raise errors.BzrCommandError('--revision takes 1 or 2 parameters')
129
if revision is None or len(revision) < 2:
130
submit_branch = target_branch.get_submit_branch()
134
base = target_branch.get_parent()
136
raise errors.BzrCommandError("No base branch known or"
138
elif not base_specified:
140
# note() doesn't pay attention to terminal_encoding() so
141
# we must format with 'ascii' to be safe
142
note('Using saved location: %s',
143
urlutils.unescape_for_display(base, 'ascii'))
144
base_branch = branch.Branch.open(base)
146
# We don't want to lock the same branch across
147
# 2 different branches
148
if target_branch.base == base_branch.base:
149
base_branch = target_branch
150
if submit_branch is None or remember:
152
target_branch.set_submit_branch(base_branch.base)
154
raise errors.BzrCommandError('--remember requires a branch'
156
target_branch.repository.fetch(base_branch.repository,
157
base_branch.last_revision())
158
base_revision = common_ancestor(base_branch.last_revision(),
160
target_branch.repository)
163
if output is not None:
164
fileobj = file(output, 'wb')
167
target_branch.repository.lock_read()
169
write_bundle(target_branch.repository, target_revision,
170
base_revision, fileobj)
172
target_branch.repository.unlock()
175
class cmd_verify_changeset(Command):
176
"""Read a written changeset, and make sure it is valid.
179
takes_args = ['filename?']
181
def run(self, filename=None):
182
from read_changeset import read_changeset
183
#from bzrlib.xml import serializer_v4
185
b, relpath = branch.Branch.open_containing('.')
187
if filename is None or filename == '-':
190
f = open(filename, 'U')
192
cset_info, cset_tree = read_changeset(f, b)
195
#serializer_v4.write(cset_tree.inventory, sys.stdout)
added
removed
bzrlib/bundle/commands.py
