« back to all changes in this revision
Viewing changes to bzrlib/merge_directive.py
- browse files at revision 1551.10.30
- compare with another revision
- compare with revision 4634.39.44
- download diff
- download tarball
- view history from revision 1551.10.30
- Committer: Aaron Bentley
- Date: 2007-03-10 20:35:58 UTC
- mfrom: (2332 +trunk)
- mto: (1551.19.24 Aaron's mergeable stuff)
- mto: This revision was merged to the branch mainline in revision 2333.
- Revision ID: aaron.bentley@utoronto.ca-20070310203558-8dptj9p637ypat0f
Merge from bzr.dev
- files added:
- bzrlib/merge_directive.py
- files modified:
- NEWS
added
removed
bzrlib/merge_directive.py
1
# Copyright (C) 2007 Canonical Ltd
2
#
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.
7
#
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.
12
#
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
16
17
18
from email import Message
19
from StringIO import StringIO
20
21
from bzrlib import (
22
branch as _mod_branch,
23
diff,
24
errors,
25
gpg,
26
revision as _mod_revision,
27
rio,
28
testament,
29
timestamp,
30
)
31
from bzrlib.bundle import serializer as bundle_serializer
32
33
34
class MergeDirective(object):
35
36
"""A request to perform a merge into a branch.
37
38
Designed to be serialized and mailed. It provides all the information
39
needed to perform a merge automatically, by providing at minimum a revision
40
bundle or the location of a branch.
41
42
The serialization format is robust against certain common forms of
43
deterioration caused by mailing.
44
45
The format is also designed to be patch-compatible. If the directive
46
includes a diff or revision bundle, it should be possible to apply it
47
directly using the standard patch program.
48
"""
49
50
_format_string = 'Bazaar merge directive format 1'
51
52
def __init__(self, revision_id, testament_sha1, time, timezone,
53
target_branch, patch=None, patch_type=None,
54
source_branch=None, message=None):
55
"""Constructor.
56
57
:param revision_id: The revision to merge
58
:param testament_sha1: The sha1 of the testament of the revision to
59
merge.
60
:param time: The current POSIX timestamp time
61
:param timezone: The timezone offset
62
:param target_branch: The branch to apply the merge to
63
:param patch: The text of a diff or bundle
64
:param patch_type: None, "diff" or "bundle", depending on the contents
65
of patch
66
:param source_branch: A public location to merge the revision from
67
:param message: The message to use when committing this merge
68
"""
69
assert patch_type in (None, 'diff', 'bundle')
70
if patch_type != 'bundle' and source_branch is None:
71
raise errors.NoMergeSource()
72
if patch_type is not None and patch is None:
73
raise errors.PatchMissing(patch_type)
74
self.revision_id = revision_id
75
self.testament_sha1 = testament_sha1
76
self.time = time
77
self.timezone = timezone
78
self.target_branch = target_branch
79
self.patch = patch
80
self.patch_type = patch_type
81
self.source_branch = source_branch
82
self.message = message
83
84
@classmethod
85
def from_lines(klass, lines):
86
"""Deserialize a MergeRequest from an iterable of lines
87
88
:param lines: An iterable of lines
89
:return: a MergeRequest
90
"""
91
assert lines[0].startswith('# ' + klass._format_string + '\n')
92
line_iter = iter(lines[1:])
93
stanza = rio.read_patch_stanza(line_iter)
94
patch_lines = list(line_iter)
95
if len(patch_lines) == 0:
96
patch = None
97
else:
98
patch = ''.join(patch_lines)
99
try:
100
bundle_serializer.read_bundle(StringIO(patch))
101
except errors.NotABundle:
102
patch_type = 'diff'
103
else:
104
patch_type = 'bundle'
105
time, timezone = timestamp.parse_patch_date(stanza.get('timestamp'))
106
kwargs = {}
107
for key in ('revision_id', 'testament_sha1', 'target_branch',
108
'source_branch', 'message'):
109
try:
110
kwargs[key] = stanza.get(key)
111
except KeyError:
112
pass
113
return MergeDirective(time=time, timezone=timezone,
114
patch_type=patch_type, patch=patch, **kwargs)
115
116
def to_lines(self):
117
"""Serialize as a list of lines
118
119
:return: a list of lines
120
"""
121
time_str = timestamp.format_patch_date(self.time, self.timezone)
122
stanza = rio.Stanza(revision_id=self.revision_id, timestamp=time_str,
123
target_branch=self.target_branch,
124
testament_sha1=self.testament_sha1)
125
for key in ('source_branch', 'message'):
126
if self.__dict__[key] is not None:
127
stanza.add(key, self.__dict__[key])
128
lines = ['# ' + self._format_string + '\n']
129
lines.extend(rio.to_patch_lines(stanza))
130
lines.append('# \n')
131
if self.patch is not None:
132
lines.extend(self.patch.splitlines(True))
133
return lines
134
135
def to_signed(self, branch):
136
"""Serialize as a signed string.
137
138
:param branch: The source branch, to get the signing strategy
139
:return: a string
140
"""
141
my_gpg = gpg.GPGStrategy(branch.get_config())
142
return my_gpg.sign(''.join(self.to_lines()))
143
144
def to_email(self, mail_to, branch, sign=False):
145
"""Serialize as an email message.
146
147
:param mail_to: The address to mail the message to
148
:param branch: The source branch, to get the signing strategy and
149
source email address
150
:param sign: If True, gpg-sign the email
151
:return: an email message
152
"""
153
mail_from = branch.get_config().username()
154
message = Message.Message()
155
message['To'] = mail_to
156
message['From'] = mail_from
157
if self.message is not None:
158
message['Subject'] = self.message
159
else:
160
revision = branch.repository.get_revision(self.revision_id)
161
message['Subject'] = revision.message
162
if sign:
163
body = self.to_signed(branch)
164
else:
165
body = ''.join(self.to_lines())
166
message.set_payload(body)
167
return message
168
169
@classmethod
170
def from_objects(klass, repository, revision_id, time, timezone,
171
target_branch, patch_type='bundle',
172
local_target_branch=None, public_branch=None, message=None):
173
"""Generate a merge directive from various objects
174
175
:param repository: The repository containing the revision
176
:param revision_id: The revision to merge
177
:param time: The POSIX timestamp of the date the request was issued.
178
:param timezone: The timezone of the request
179
:param target_branch: The url of the branch to merge into
180
:param patch_type: 'bundle', 'diff' or None, depending on the type of
181
patch desired.
182
:param local_target_branch: a local copy of the target branch
183
:param public_branch: location of a public branch containing the target
184
revision.
185
:param message: Message to use when committing the merge
186
:return: The merge directive
187
188
The public branch is always used if supplied. If the patch_type is
189
not 'bundle', the public branch must be supplied, and will be verified.
190
191
If the message is not supplied, the message from revision_id will be
192
used for the commit.
193
"""
194
t = testament.StrictTestament3.from_revision(repository, revision_id)
195
if patch_type is None:
196
patch = None
197
else:
198
submit_branch = _mod_branch.Branch.open(target_branch)
199
submit_revision_id = submit_branch.last_revision()
200
repository.fetch(submit_branch.repository, submit_revision_id)
201
ancestor_id = _mod_revision.common_ancestor(revision_id,
202
submit_revision_id,
203
repository)
204
type_handler = {'bundle': klass._generate_bundle,
205
'diff': klass._generate_diff,
206
None: lambda x, y, z: None }
207
patch = type_handler[patch_type](repository, revision_id,
208
ancestor_id)
209
if patch_type == 'bundle':
210
s = StringIO()
211
bundle_serializer.write_bundle(repository, revision_id,
212
ancestor_id, s)
213
patch = s.getvalue()
214
elif patch_type == 'diff':
215
patch = klass._generate_diff(repository, revision_id,
216
ancestor_id)
217
218
if public_branch is not None and patch_type != 'bundle':
219
public_branch_obj = _mod_branch.Branch.open(public_branch)
220
if not public_branch_obj.repository.has_revision(revision_id):
221
raise errors.PublicBranchOutOfDate(public_branch,
222
revision_id)
223
224
return MergeDirective(revision_id, t.as_sha1(), time, timezone,
225
target_branch, patch, patch_type, public_branch,
226
message)
227
228
@staticmethod
229
def _generate_diff(repository, revision_id, ancestor_id):
230
tree_1 = repository.revision_tree(ancestor_id)
231
tree_2 = repository.revision_tree(revision_id)
232
s = StringIO()
233
diff.show_diff_trees(tree_1, tree_2, s, old_label='', new_label='')
234
return s.getvalue()
235
236
@staticmethod
237
def _generate_bundle(repository, revision_id, ancestor_id):
238
s = StringIO()
239
bundle_serializer.write_bundle(repository, revision_id,
240
ancestor_id, s)
241
return s.getvalue()
Loggerhead is a web-based interface for Breezy
Version: 2.0.1