1
# Copyright (C) 2007 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
18
from email import Message
19
from StringIO import StringIO
22
branch as _mod_branch,
26
revision as _mod_revision,
31
from bzrlib.bundle import (
32
serializer as bundle_serializer,
36
class MergeDirective(object):
38
"""A request to perform a merge into a branch.
40
Designed to be serialized and mailed. It provides all the information
41
needed to perform a merge automatically, by providing at minimum a revision
42
bundle or the location of a branch.
44
The serialization format is robust against certain common forms of
45
deterioration caused by mailing.
47
The format is also designed to be patch-compatible. If the directive
48
includes a diff or revision bundle, it should be possible to apply it
49
directly using the standard patch program.
52
_format_string = 'Bazaar merge directive format 1'
54
def __init__(self, revision_id, testament_sha1, time, timezone,
55
target_branch, patch=None, patch_type=None,
56
source_branch=None, message=None):
59
:param revision_id: The revision to merge
60
:param testament_sha1: The sha1 of the testament of the revision to
62
:param time: The current POSIX timestamp time
63
:param timezone: The timezone offset
64
:param target_branch: The branch to apply the merge to
65
:param patch: The text of a diff or bundle
66
:param patch_type: None, "diff" or "bundle", depending on the contents
68
:param source_branch: A public location to merge the revision from
69
:param message: The message to use when committing this merge
71
assert patch_type in (None, 'diff', 'bundle')
72
if patch_type != 'bundle' and source_branch is None:
73
raise errors.NoMergeSource()
74
if patch_type is not None and patch is None:
75
raise errors.PatchMissing(patch_type)
76
self.revision_id = revision_id
77
self.testament_sha1 = testament_sha1
79
self.timezone = timezone
80
self.target_branch = target_branch
82
self.patch_type = patch_type
83
self.source_branch = source_branch
84
self.message = message
87
def from_lines(klass, lines):
88
"""Deserialize a MergeRequest from an iterable of lines
90
:param lines: An iterable of lines
91
:return: a MergeRequest
93
line_iter = iter(lines)
94
for line in line_iter:
95
if line.startswith('# ' + klass._format_string):
98
raise errors.NotAMergeDirective(lines[0])
99
stanza = rio.read_patch_stanza(line_iter)
100
patch_lines = list(line_iter)
101
if len(patch_lines) == 0:
105
patch = ''.join(patch_lines)
107
bundle_serializer.read_bundle(StringIO(patch))
108
except errors.NotABundle:
111
patch_type = 'bundle'
112
time, timezone = timestamp.parse_patch_date(stanza.get('timestamp'))
114
for key in ('revision_id', 'testament_sha1', 'target_branch',
115
'source_branch', 'message'):
117
kwargs[key] = stanza.get(key)
120
kwargs['revision_id'] = kwargs['revision_id'].encode('utf-8')
121
return MergeDirective(time=time, timezone=timezone,
122
patch_type=patch_type, patch=patch, **kwargs)
125
"""Serialize as a list of lines
127
:return: a list of lines
129
time_str = timestamp.format_patch_date(self.time, self.timezone)
130
stanza = rio.Stanza(revision_id=self.revision_id, timestamp=time_str,
131
target_branch=self.target_branch,
132
testament_sha1=self.testament_sha1)
133
for key in ('source_branch', 'message'):
134
if self.__dict__[key] is not None:
135
stanza.add(key, self.__dict__[key])
136
lines = ['# ' + self._format_string + '\n']
137
lines.extend(rio.to_patch_lines(stanza))
139
if self.patch is not None:
140
lines.extend(self.patch.splitlines(True))
143
def to_signed(self, branch):
144
"""Serialize as a signed string.
146
:param branch: The source branch, to get the signing strategy
149
my_gpg = gpg.GPGStrategy(branch.get_config())
150
return my_gpg.sign(''.join(self.to_lines()))
152
def to_email(self, mail_to, branch, sign=False):
153
"""Serialize as an email message.
155
:param mail_to: The address to mail the message to
156
:param branch: The source branch, to get the signing strategy and
158
:param sign: If True, gpg-sign the email
159
:return: an email message
161
mail_from = branch.get_config().username()
162
message = Message.Message()
163
message['To'] = mail_to
164
message['From'] = mail_from
165
if self.message is not None:
166
message['Subject'] = self.message
168
revision = branch.repository.get_revision(self.revision_id)
169
message['Subject'] = revision.message
171
body = self.to_signed(branch)
173
body = ''.join(self.to_lines())
174
message.set_payload(body)
178
def from_objects(klass, repository, revision_id, time, timezone,
179
target_branch, patch_type='bundle',
180
local_target_branch=None, public_branch=None, message=None):
181
"""Generate a merge directive from various objects
183
:param repository: The repository containing the revision
184
:param revision_id: The revision to merge
185
:param time: The POSIX timestamp of the date the request was issued.
186
:param timezone: The timezone of the request
187
:param target_branch: The url of the branch to merge into
188
:param patch_type: 'bundle', 'diff' or None, depending on the type of
190
:param local_target_branch: a local copy of the target branch
191
:param public_branch: location of a public branch containing the target
193
:param message: Message to use when committing the merge
194
:return: The merge directive
196
The public branch is always used if supplied. If the patch_type is
197
not 'bundle', the public branch must be supplied, and will be verified.
199
If the message is not supplied, the message from revision_id will be
202
t = testament.StrictTestament3.from_revision(repository, revision_id)
203
submit_branch = _mod_branch.Branch.open(target_branch)
204
if submit_branch.get_public_branch() is not None:
205
target_branch = submit_branch.get_public_branch()
206
if patch_type is None:
209
submit_revision_id = submit_branch.last_revision()
210
repository.fetch(submit_branch.repository, submit_revision_id)
211
ancestor_id = _mod_revision.common_ancestor(revision_id,
214
type_handler = {'bundle': klass._generate_bundle,
215
'diff': klass._generate_diff,
216
None: lambda x, y, z: None }
217
patch = type_handler[patch_type](repository, revision_id,
219
if patch_type == 'bundle':
221
bundle_serializer.write_bundle(repository, revision_id,
224
elif patch_type == 'diff':
225
patch = klass._generate_diff(repository, revision_id,
228
if public_branch is not None and patch_type != 'bundle':
229
public_branch_obj = _mod_branch.Branch.open(public_branch)
230
if not public_branch_obj.repository.has_revision(revision_id):
231
raise errors.PublicBranchOutOfDate(public_branch,
234
return MergeDirective(revision_id, t.as_sha1(), time, timezone,
235
target_branch, patch, patch_type, public_branch,
239
def _generate_diff(repository, revision_id, ancestor_id):
240
tree_1 = repository.revision_tree(ancestor_id)
241
tree_2 = repository.revision_tree(revision_id)
243
diff.show_diff_trees(tree_1, tree_2, s, old_label='', new_label='')
247
def _generate_bundle(repository, revision_id, ancestor_id):
249
bundle_serializer.write_bundle(repository, revision_id,
253
def install_revisions(self, target_repo):
254
"""Install revisions and return the target revision"""
255
if not target_repo.has_revision(self.revision_id):
256
if self.patch_type == 'bundle':
257
info = bundle_serializer.read_bundle(StringIO(self.patch))
258
# We don't use the bundle's target revision, because
259
# MergeDirective.revision_id is authoritative.
260
info.install_revisions(target_repo)
262
source_branch = _mod_branch.Branch.open(self.source_branch)
263
target_repo.fetch(source_branch.repository, self.revision_id)
264
return self.revision_id
added
removed
bzrlib/merge_directive.py
