/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5752.3.8 by John Arbash Meinel
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts
1
# Copyright (C) 2007-2011 Canonical Ltd
1551.12.36 by Aaron Bentley
Fix failing tests
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1551.12.36 by Aaron Bentley
Fix failing tests
16
6379.6.3 by Jelmer Vernooij
Use absolute_import.
17
from __future__ import absolute_import
1551.12.36 by Aaron Bentley
Fix failing tests
18
2520.4.105 by Aaron Bentley
Implement patch verification
19
import re
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
20
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
21
from . import lazy_import
5671.1.1 by Jelmer Vernooij
Lazy import in bzrlib.merge_directive.
22
lazy_import.lazy_import(globals(), """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
23
from breezy import (
1551.12.5 by Aaron Bentley
Get MergeDirective.from_objects working
24
    branch as _mod_branch,
25
    diff,
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
26
    email_message,
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
27
    errors,
1551.12.16 by Aaron Bentley
Enable signing merge directives
28
    gpg,
4098.5.16 by Aaron Bentley
Move hook to MergeDirective, implement MergeDirective.compose_merge_request.
29
    hooks,
2520.4.73 by Aaron Bentley
Implement new merge directive format
30
    registry,
1551.12.5 by Aaron Bentley
Get MergeDirective.from_objects working
31
    revision as _mod_revision,
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
32
    rio,
1551.12.5 by Aaron Bentley
Get MergeDirective.from_objects working
33
    testament,
1551.12.30 by Aaron Bentley
Use patch-style dates for timestamps in merge directives
34
    timestamp,
4098.5.18 by Aaron Bentley
Gracefully handle mail clients that don't support bodies.
35
    trace,
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
36
    )
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
37
from breezy.bundle import (
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
38
    serializer as bundle_serializer,
39
    )
5671.1.1 by Jelmer Vernooij
Lazy import in bzrlib.merge_directive.
40
""")
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
41
from .sixish import (
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
42
    BytesIO,
43
    )
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
44
45
4098.5.16 by Aaron Bentley
Move hook to MergeDirective, implement MergeDirective.compose_merge_request.
46
class MergeRequestBodyParams(object):
4098.5.17 by Aaron Bentley
cleanup
47
    """Parameter object for the merge_request_body hook."""
4098.5.16 by Aaron Bentley
Move hook to MergeDirective, implement MergeDirective.compose_merge_request.
48
49
    def __init__(self, body, orig_body, directive, to, basename, subject,
50
                 branch, tree=None):
51
        self.body = body
52
        self.orig_body = orig_body
53
        self.directive = directive
54
        self.branch = branch
55
        self.tree = tree
56
        self.to = to
57
        self.basename = basename
58
        self.subject = subject
59
60
61
class MergeDirectiveHooks(hooks.Hooks):
4098.5.17 by Aaron Bentley
cleanup
62
    """Hooks for MergeDirective classes."""
4098.5.16 by Aaron Bentley
Move hook to MergeDirective, implement MergeDirective.compose_merge_request.
63
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
64
    def __init__(self):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
65
        hooks.Hooks.__init__(self, "breezy.merge_directive", "BaseMergeDirective.hooks")
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
66
        self.add_hook('merge_request_body',
4098.5.16 by Aaron Bentley
Move hook to MergeDirective, implement MergeDirective.compose_merge_request.
67
            "Called with a MergeRequestBodyParams when a body is needed for"
68
            " a merge request.  Callbacks must return a body.  If more"
69
            " than one callback is registered, the output of one callback is"
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
70
            " provided to the next.", (1, 15, 0))
4098.5.16 by Aaron Bentley
Move hook to MergeDirective, implement MergeDirective.compose_merge_request.
71
72
5086.3.1 by Jelmer Vernooij
``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
73
class BaseMergeDirective(object):
5086.3.2 by Jelmer Vernooij
Add docstring.
74
    """A request to perform a merge into a branch.
75
76
    This is the base class that all merge directive implementations 
77
    should derive from.
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
78
79
    :cvar multiple_output_files: Whether or not this merge directive 
80
        stores a set of revisions in more than one file
5086.3.2 by Jelmer Vernooij
Add docstring.
81
    """
2520.4.73 by Aaron Bentley
Implement new merge directive format
82
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
83
    hooks = MergeDirectiveHooks()
4098.5.16 by Aaron Bentley
Move hook to MergeDirective, implement MergeDirective.compose_merge_request.
84
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
85
    multiple_output_files = False
86
2520.4.73 by Aaron Bentley
Implement new merge directive format
87
    def __init__(self, revision_id, testament_sha1, time, timezone,
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
88
                 target_branch, patch=None, source_branch=None,
6365.1.5 by Jelmer Vernooij
Kill optional submit_branch argument to MergeDirective constructor.
89
                 message=None, bundle=None):
2520.4.73 by Aaron Bentley
Implement new merge directive format
90
        """Constructor.
91
92
        :param revision_id: The revision to merge
93
        :param testament_sha1: The sha1 of the testament of the revision to
94
            merge.
95
        :param time: The current POSIX timestamp time
96
        :param timezone: The timezone offset
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
97
        :param target_branch: Location of branch to apply the merge to
2520.4.73 by Aaron Bentley
Implement new merge directive format
98
        :param patch: The text of a diff or bundle
99
        :param source_branch: A public location to merge the revision from
100
        :param message: The message to use when committing this merge
101
        """
102
        self.revision_id = revision_id
103
        self.testament_sha1 = testament_sha1
104
        self.time = time
105
        self.timezone = timezone
106
        self.target_branch = target_branch
107
        self.patch = patch
108
        self.source_branch = source_branch
109
        self.message = message
110
5086.3.1 by Jelmer Vernooij
``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
111
    def to_lines(self):
112
        """Serialize as a list of lines
113
114
        :return: a list of lines
115
        """
116
        raise NotImplementedError(self.to_lines)
117
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
118
    def to_files(self):
119
        """Serialize as a set of files.
120
121
        :return: List of tuples with filename and contents as lines
122
        """
123
        raise NotImplementedError(self.to_files)
124
5086.3.1 by Jelmer Vernooij
``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
125
    def get_raw_bundle(self):
126
        """Return the bundle for this merge directive.
127
128
        :return: bundle text or None if there is no bundle
129
        """
130
        return None
131
2520.4.105 by Aaron Bentley
Implement patch verification
132
    def _to_lines(self, base_revision=False):
2520.4.73 by Aaron Bentley
Implement new merge directive format
133
        """Serialize as a list of lines
134
135
        :return: a list of lines
136
        """
137
        time_str = timestamp.format_patch_date(self.time, self.timezone)
138
        stanza = rio.Stanza(revision_id=self.revision_id, timestamp=time_str,
139
                            target_branch=self.target_branch,
140
                            testament_sha1=self.testament_sha1)
141
        for key in ('source_branch', 'message'):
142
            if self.__dict__[key] is not None:
143
                stanza.add(key, self.__dict__[key])
2520.4.105 by Aaron Bentley
Implement patch verification
144
        if base_revision:
145
            stanza.add('base_revision_id', self.base_revision_id)
2520.4.73 by Aaron Bentley
Implement new merge directive format
146
        lines = ['# ' + self._format_string + '\n']
147
        lines.extend(rio.to_patch_lines(stanza))
148
        lines.append('# \n')
149
        return lines
150
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
151
    def write_to_directory(self, path):
152
        """Write this merge directive to a series of files in a directory.
153
154
        :param path: Filesystem path to write to
155
        """
156
        raise NotImplementedError(self.write_to_directory)
157
2520.4.73 by Aaron Bentley
Implement new merge directive format
158
    @classmethod
159
    def from_objects(klass, repository, revision_id, time, timezone,
160
                 target_branch, patch_type='bundle',
161
                 local_target_branch=None, public_branch=None, message=None):
162
        """Generate a merge directive from various objects
163
164
        :param repository: The repository containing the revision
165
        :param revision_id: The revision to merge
166
        :param time: The POSIX timestamp of the date the request was issued.
167
        :param timezone: The timezone of the request
168
        :param target_branch: The url of the branch to merge into
169
        :param patch_type: 'bundle', 'diff' or None, depending on the type of
170
            patch desired.
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
171
        :param local_target_branch: the submit branch, either itself or a local copy
172
        :param public_branch: location of a public branch containing
173
            the target revision.
2520.4.73 by Aaron Bentley
Implement new merge directive format
174
        :param message: Message to use when committing the merge
175
        :return: The merge directive
176
177
        The public branch is always used if supplied.  If the patch_type is
178
        not 'bundle', the public branch must be supplied, and will be verified.
179
180
        If the message is not supplied, the message from revision_id will be
181
        used for the commit.
182
        """
183
        t_revision_id = revision_id
2520.4.86 by Aaron Bentley
Improve locking in _BaseMergeDirective.from_object
184
        if revision_id == _mod_revision.NULL_REVISION:
2520.4.73 by Aaron Bentley
Implement new merge directive format
185
            t_revision_id = None
186
        t = testament.StrictTestament3.from_revision(repository, t_revision_id)
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
187
        if local_target_branch is None:
188
            submit_branch = _mod_branch.Branch.open(target_branch)
189
        else:
190
            submit_branch = local_target_branch
2520.4.73 by Aaron Bentley
Implement new merge directive format
191
        if submit_branch.get_public_branch() is not None:
192
            target_branch = submit_branch.get_public_branch()
193
        if patch_type is None:
194
            patch = None
195
        else:
196
            submit_revision_id = submit_branch.last_revision()
197
            submit_revision_id = _mod_revision.ensure_null(submit_revision_id)
198
            repository.fetch(submit_branch.repository, submit_revision_id)
199
            graph = repository.get_graph()
200
            ancestor_id = graph.find_unique_lca(revision_id,
201
                                                submit_revision_id)
202
            type_handler = {'bundle': klass._generate_bundle,
203
                            'diff': klass._generate_diff,
204
                            None: lambda x, y, z: None }
205
            patch = type_handler[patch_type](repository, revision_id,
206
                                             ancestor_id)
207
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
208
        if public_branch is not None and patch_type != 'bundle':
6365.1.4 by Jelmer Vernooij
Fix some tests.
209
            public_branch_obj = _mod_branch.Branch.open(public_branch)
210
            if not public_branch_obj.repository.has_revision(revision_id):
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
211
                raise errors.PublicBranchOutOfDate(public_branch,
212
                                                   revision_id)
2520.4.73 by Aaron Bentley
Implement new merge directive format
213
6365.1.6 by Jelmer Vernooij
revert some unnecessary changes.
214
        return klass(revision_id, t.as_sha1(), time, timezone, target_branch,
215
            patch, patch_type, public_branch, message)
2520.4.73 by Aaron Bentley
Implement new merge directive format
216
3251.2.1 by Aaron Bentley
Use nick/revno-based names for merge directives
217
    def get_disk_name(self, branch):
218
        """Generate a suitable basename for storing this directive on disk
219
220
        :param branch: The Branch this merge directive was generated fro
221
        :return: A string
222
        """
223
        revno, revision_id = branch.last_revision_info()
224
        if self.revision_id == revision_id:
3251.2.2 by Aaron Bentley
Fix bug in last revno handling
225
            revno = [revno]
3251.2.1 by Aaron Bentley
Use nick/revno-based names for merge directives
226
        else:
227
            revno = branch.get_revision_id_to_revno_map().get(self.revision_id,
228
                ['merge'])
3449.4.1 by Lukáš Lalinský
Sanitize branch nick before using it as an attachment filename in ``bzr send``
229
        nick = re.sub('(\W+)', '-', branch.nick).strip('-')
230
        return '%s-%s' % (nick, '.'.join(str(n) for n in revno))
3251.2.1 by Aaron Bentley
Use nick/revno-based names for merge directives
231
2520.4.73 by Aaron Bentley
Implement new merge directive format
232
    @staticmethod
233
    def _generate_diff(repository, revision_id, ancestor_id):
234
        tree_1 = repository.revision_tree(ancestor_id)
235
        tree_2 = repository.revision_tree(revision_id)
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
236
        s = BytesIO()
2520.4.73 by Aaron Bentley
Implement new merge directive format
237
        diff.show_diff_trees(tree_1, tree_2, s, old_label='', new_label='')
238
        return s.getvalue()
239
240
    @staticmethod
241
    def _generate_bundle(repository, revision_id, ancestor_id):
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
242
        s = BytesIO()
2520.4.73 by Aaron Bentley
Implement new merge directive format
243
        bundle_serializer.write_bundle(repository, revision_id,
244
                                       ancestor_id, s)
245
        return s.getvalue()
246
2520.4.80 by Aaron Bentley
Improve merge directive tests
247
    def to_signed(self, branch):
248
        """Serialize as a signed string.
249
250
        :param branch: The source branch, to get the signing strategy
251
        :return: a string
252
        """
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
253
        my_gpg = gpg.GPGStrategy(branch.get_config_stack())
2520.4.80 by Aaron Bentley
Improve merge directive tests
254
        return my_gpg.sign(''.join(self.to_lines()))
255
256
    def to_email(self, mail_to, branch, sign=False):
257
        """Serialize as an email message.
258
259
        :param mail_to: The address to mail the message to
260
        :param branch: The source branch, to get the signing strategy and
261
            source email address
262
        :param sign: If True, gpg-sign the email
263
        :return: an email message
264
        """
6463.1.1 by Jelmer Vernooij
Migrate 'bugtracker' setting to config stacks.
265
        mail_from = branch.get_config_stack().get('email')
2520.4.80 by Aaron Bentley
Improve merge directive tests
266
        if self.message is not None:
2625.6.2 by Adeodato Simó
Merge bzr.dev, resolving conflicts and updating test_merge_directive.py.
267
            subject = self.message
2520.4.80 by Aaron Bentley
Improve merge directive tests
268
        else:
269
            revision = branch.repository.get_revision(self.revision_id)
2625.6.2 by Adeodato Simó
Merge bzr.dev, resolving conflicts and updating test_merge_directive.py.
270
            subject = revision.message
2520.4.80 by Aaron Bentley
Improve merge directive tests
271
        if sign:
272
            body = self.to_signed(branch)
273
        else:
274
            body = ''.join(self.to_lines())
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
275
        message = email_message.EmailMessage(mail_from, mail_to, subject,
276
            body)
2520.4.80 by Aaron Bentley
Improve merge directive tests
277
        return message
278
279
    def install_revisions(self, target_repo):
280
        """Install revisions and return the target revision"""
281
        if not target_repo.has_revision(self.revision_id):
282
            if self.patch_type == 'bundle':
283
                info = bundle_serializer.read_bundle(
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
284
                    BytesIO(self.get_raw_bundle()))
2520.4.80 by Aaron Bentley
Improve merge directive tests
285
                # We don't use the bundle's target revision, because
286
                # MergeDirective.revision_id is authoritative.
1551.19.19 by Aaron Bentley
Merge directives can now fetch prerequisites from the target branch
287
                try:
288
                    info.install_revisions(target_repo, stream_input=False)
289
                except errors.RevisionNotPresent:
290
                    # At least one dependency isn't present.  Try installing
291
                    # missing revisions from the submit branch
3535.8.1 by James Westby
Handle something that isn't a branch being specified in target_branch.
292
                    try:
293
                        submit_branch = \
294
                            _mod_branch.Branch.open(self.target_branch)
295
                    except errors.NotBranchError:
296
                        raise errors.TargetNotBranch(self.target_branch)
1551.19.20 by Aaron Bentley
Updates from review
297
                    missing_revisions = []
298
                    bundle_revisions = set(r.revision_id for r in
299
                                           info.real_revisions)
1551.19.19 by Aaron Bentley
Merge directives can now fetch prerequisites from the target branch
300
                    for revision in info.real_revisions:
301
                        for parent_id in revision.parent_ids:
1551.19.20 by Aaron Bentley
Updates from review
302
                            if (parent_id not in bundle_revisions and
1551.19.19 by Aaron Bentley
Merge directives can now fetch prerequisites from the target branch
303
                                not target_repo.has_revision(parent_id)):
304
                                missing_revisions.append(parent_id)
1551.19.20 by Aaron Bentley
Updates from review
305
                    # reverse missing revisions to try to get heads first
306
                    unique_missing = []
307
                    unique_missing_set = set()
308
                    for revision in reversed(missing_revisions):
309
                        if revision in unique_missing_set:
310
                            continue
311
                        unique_missing.append(revision)
312
                        unique_missing_set.add(revision)
313
                    for missing_revision in unique_missing:
1551.19.19 by Aaron Bentley
Merge directives can now fetch prerequisites from the target branch
314
                        target_repo.fetch(submit_branch.repository,
315
                                          missing_revision)
316
                    info.install_revisions(target_repo, stream_input=False)
2520.4.80 by Aaron Bentley
Improve merge directive tests
317
            else:
318
                source_branch = _mod_branch.Branch.open(self.source_branch)
319
                target_repo.fetch(source_branch.repository, self.revision_id)
320
        return self.revision_id
321
4098.5.16 by Aaron Bentley
Move hook to MergeDirective, implement MergeDirective.compose_merge_request.
322
    def compose_merge_request(self, mail_client, to, body, branch, tree=None):
4098.5.17 by Aaron Bentley
cleanup
323
        """Compose a request to merge this directive.
324
325
        :param mail_client: The mail client to use for composing this request.
326
        :param to: The address to compose the request to.
327
        :param branch: The Branch that was used to produce this directive.
328
        :param tree: The Tree (if any) for the Branch used to produce this
329
            directive.
330
        """
4098.5.16 by Aaron Bentley
Move hook to MergeDirective, implement MergeDirective.compose_merge_request.
331
        basename = self.get_disk_name(branch)
332
        subject = '[MERGE] '
333
        if self.message is not None:
334
            subject += self.message
335
        else:
336
            revision = branch.repository.get_revision(self.revision_id)
337
            subject += revision.get_summary()
4098.5.18 by Aaron Bentley
Gracefully handle mail clients that don't support bodies.
338
        if getattr(mail_client, 'supports_body', False):
339
            orig_body = body
340
            for hook in self.hooks['merge_request_body']:
341
                params = MergeRequestBodyParams(body, orig_body, self,
342
                                                to, basename, subject, branch,
343
                                                tree)
344
                body = hook(params)
345
        elif len(self.hooks['merge_request_body']) > 0:
346
            trace.warning('Cannot run merge_request_body hooks because mail'
347
                          ' client %s does not support message bodies.',
348
                        mail_client.__class__.__name__)
4098.5.16 by Aaron Bentley
Move hook to MergeDirective, implement MergeDirective.compose_merge_request.
349
        mail_client.compose_merge_request(to, subject,
350
                                          ''.join(self.to_lines()),
351
                                          basename, body)
352
2520.4.73 by Aaron Bentley
Implement new merge directive format
353
5086.3.1 by Jelmer Vernooij
``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
354
class MergeDirective(BaseMergeDirective):
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
355
1551.12.38 by Aaron Bentley
Add docs for MergeDirective and RIO-patch functions
356
    """A request to perform a merge into a branch.
357
358
    Designed to be serialized and mailed.  It provides all the information
359
    needed to perform a merge automatically, by providing at minimum a revision
360
    bundle or the location of a branch.
361
362
    The serialization format is robust against certain common forms of
363
    deterioration caused by mailing.
364
365
    The format is also designed to be patch-compatible.  If the directive
366
    includes a diff or revision bundle, it should be possible to apply it
367
    directly using the standard patch program.
368
    """
369
1551.12.45 by Aaron Bentley
Change format marker to not experimental
370
    _format_string = 'Bazaar merge directive format 1'
1551.12.12 by Aaron Bentley
Add format header
371
1551.12.4 by Aaron Bentley
Add failing test
372
    def __init__(self, revision_id, testament_sha1, time, timezone,
6365.1.6 by Jelmer Vernooij
revert some unnecessary changes.
373
                 target_branch, patch=None, patch_type=None,
6365.1.5 by Jelmer Vernooij
Kill optional submit_branch argument to MergeDirective constructor.
374
                 source_branch=None, message=None, bundle=None):
1551.12.38 by Aaron Bentley
Add docs for MergeDirective and RIO-patch functions
375
        """Constructor.
376
377
        :param revision_id: The revision to merge
378
        :param testament_sha1: The sha1 of the testament of the revision to
379
            merge.
380
        :param time: The current POSIX timestamp time
381
        :param timezone: The timezone offset
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
382
        :param target_branch: Location of the branch to apply the merge to
1551.12.38 by Aaron Bentley
Add docs for MergeDirective and RIO-patch functions
383
        :param patch: The text of a diff or bundle
384
        :param patch_type: None, "diff" or "bundle", depending on the contents
385
            of patch
386
        :param source_branch: A public location to merge the revision from
387
        :param message: The message to use when committing this merge
388
        """
5086.3.1 by Jelmer Vernooij
``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
389
        BaseMergeDirective.__init__(self, revision_id, testament_sha1, time,
6365.1.5 by Jelmer Vernooij
Kill optional submit_branch argument to MergeDirective constructor.
390
            timezone, target_branch, patch, source_branch, message)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
391
        if patch_type not in (None, 'diff', 'bundle'):
392
            raise ValueError(patch_type)
1551.12.13 by Aaron Bentley
Rename fields
393
        if patch_type != 'bundle' and source_branch is None:
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
394
            raise errors.NoMergeSource()
395
        if patch_type is not None and patch is None:
396
            raise errors.PatchMissing(patch_type)
397
        self.patch_type = patch_type
2520.4.73 by Aaron Bentley
Implement new merge directive format
398
399
    def clear_payload(self):
400
        self.patch = None
401
        self.patch_type = None
402
2520.4.80 by Aaron Bentley
Improve merge directive tests
403
    def get_raw_bundle(self):
404
        return self.bundle
405
2520.4.73 by Aaron Bentley
Implement new merge directive format
406
    def _bundle(self):
407
        if self.patch_type == 'bundle':
408
            return self.patch
409
        else:
410
            return None
411
412
    bundle = property(_bundle)
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
413
1551.12.12 by Aaron Bentley
Add format header
414
    @classmethod
415
    def from_lines(klass, lines):
1551.12.38 by Aaron Bentley
Add docs for MergeDirective and RIO-patch functions
416
        """Deserialize a MergeRequest from an iterable of lines
417
418
        :param lines: An iterable of lines
419
        :return: a MergeRequest
420
        """
1551.12.51 by Aaron Bentley
Allow leading junk before merge directive header
421
        line_iter = iter(lines)
4792.7.3 by Martin
MergeDirective.from_lines claims to want an iterable but currently requires a list, rewrite so it really wants an iterable
422
        firstline = ""
1551.12.51 by Aaron Bentley
Allow leading junk before merge directive header
423
        for line in line_iter:
2520.4.73 by Aaron Bentley
Implement new merge directive format
424
            if line.startswith('# Bazaar merge directive format '):
4792.7.3 by Martin
MergeDirective.from_lines claims to want an iterable but currently requires a list, rewrite so it really wants an iterable
425
                return _format_registry.get(line[2:].rstrip())._from_lines(
426
                    line_iter)
427
            firstline = firstline or line.strip()
428
        raise errors.NotAMergeDirective(firstline)
2520.4.73 by Aaron Bentley
Implement new merge directive format
429
430
    @classmethod
431
    def _from_lines(klass, line_iter):
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
432
        stanza = rio.read_patch_stanza(line_iter)
433
        patch_lines = list(line_iter)
434
        if len(patch_lines) == 0:
435
            patch = None
1551.12.53 by Aaron Bentley
Fix deserialization of merge directives with no patch
436
            patch_type = None
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
437
        else:
438
            patch = ''.join(patch_lines)
1551.12.53 by Aaron Bentley
Fix deserialization of merge directives with no patch
439
            try:
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
440
                bundle_serializer.read_bundle(BytesIO(patch))
1551.15.29 by Aaron Bentley
Make merge directives robust against broken bundles
441
            except (errors.NotABundle, errors.BundleNotSupported,
442
                    errors.BadBundle):
1551.12.53 by Aaron Bentley
Fix deserialization of merge directives with no patch
443
                patch_type = 'diff'
444
            else:
445
                patch_type = 'bundle'
1551.12.30 by Aaron Bentley
Use patch-style dates for timestamps in merge directives
446
        time, timezone = timestamp.parse_patch_date(stanza.get('timestamp'))
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
447
        kwargs = {}
1551.12.13 by Aaron Bentley
Rename fields
448
        for key in ('revision_id', 'testament_sha1', 'target_branch',
1551.12.26 by Aaron Bentley
Get email working, with optional message
449
                    'source_branch', 'message'):
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
450
            try:
451
                kwargs[key] = stanza.get(key)
452
            except KeyError:
453
                pass
1551.12.54 by Aaron Bentley
Decoded revision ids are utf-8
454
        kwargs['revision_id'] = kwargs['revision_id'].encode('utf-8')
1551.12.3 by Aaron Bentley
Add timestamps to merge directives
455
        return MergeDirective(time=time, timezone=timezone,
456
                              patch_type=patch_type, patch=patch, **kwargs)
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
457
458
    def to_lines(self):
2520.4.73 by Aaron Bentley
Implement new merge directive format
459
        lines = self._to_lines()
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
460
        if self.patch is not None:
461
            lines.extend(self.patch.splitlines(True))
462
        return lines
463
2520.4.73 by Aaron Bentley
Implement new merge directive format
464
    @staticmethod
465
    def _generate_bundle(repository, revision_id, ancestor_id):
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
466
        s = BytesIO()
2520.4.73 by Aaron Bentley
Implement new merge directive format
467
        bundle_serializer.write_bundle(repository, revision_id,
468
                                       ancestor_id, s, '0.9')
469
        return s.getvalue()
470
2520.4.109 by Aaron Bentley
start work on directive cherry-picking
471
    def get_merge_request(self, repository):
472
        """Provide data for performing a merge
473
474
        Returns suggested base, suggested target, and patch verification status
475
        """
476
        return None, self.revision_id, 'inapplicable'
477
2520.4.76 by Aaron Bentley
Move base64-encoding into merge directives
478
5086.3.1 by Jelmer Vernooij
``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
479
class MergeDirective2(BaseMergeDirective):
2520.4.73 by Aaron Bentley
Implement new merge directive format
480
2687.2.2 by Martin Pool
Fix up other references to 0.19
481
    _format_string = 'Bazaar merge directive format 2 (Bazaar 0.90)'
2520.4.73 by Aaron Bentley
Implement new merge directive format
482
483
    def __init__(self, revision_id, testament_sha1, time, timezone,
6365.1.6 by Jelmer Vernooij
revert some unnecessary changes.
484
                 target_branch, patch=None, source_branch=None, message=None,
485
                 bundle=None, base_revision_id=None):
2520.4.73 by Aaron Bentley
Implement new merge directive format
486
        if source_branch is None and bundle is None:
487
            raise errors.NoMergeSource()
5086.3.1 by Jelmer Vernooij
``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
488
        BaseMergeDirective.__init__(self, revision_id, testament_sha1, time,
6365.1.6 by Jelmer Vernooij
revert some unnecessary changes.
489
            timezone, target_branch, patch, source_branch, message)
2520.4.73 by Aaron Bentley
Implement new merge directive format
490
        self.bundle = bundle
2520.4.105 by Aaron Bentley
Implement patch verification
491
        self.base_revision_id = base_revision_id
2520.4.73 by Aaron Bentley
Implement new merge directive format
492
493
    def _patch_type(self):
494
        if self.bundle is not None:
495
            return 'bundle'
496
        elif self.patch is not None:
497
            return 'diff'
498
        else:
499
            return None
500
501
    patch_type = property(_patch_type)
502
503
    def clear_payload(self):
504
        self.patch = None
505
        self.bundle = None
506
2520.4.80 by Aaron Bentley
Improve merge directive tests
507
    def get_raw_bundle(self):
508
        if self.bundle is None:
509
            return None
510
        else:
511
            return self.bundle.decode('base-64')
512
2520.4.73 by Aaron Bentley
Implement new merge directive format
513
    @classmethod
514
    def _from_lines(klass, line_iter):
515
        stanza = rio.read_patch_stanza(line_iter)
516
        patch = None
517
        bundle = None
518
        try:
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
519
            start = next(line_iter)
2520.4.73 by Aaron Bentley
Implement new merge directive format
520
        except StopIteration:
521
            pass
522
        else:
523
            if start.startswith('# Begin patch'):
524
                patch_lines = []
525
                for line in line_iter:
526
                    if line.startswith('# Begin bundle'):
527
                        start = line
528
                        break
529
                    patch_lines.append(line)
530
                else:
531
                    start = None
532
                patch = ''.join(patch_lines)
533
            if start is not None:
534
                if start.startswith('# Begin bundle'):
535
                    bundle = ''.join(line_iter)
536
                else:
537
                    raise errors.IllegalMergeDirectivePayload(start)
538
        time, timezone = timestamp.parse_patch_date(stanza.get('timestamp'))
539
        kwargs = {}
540
        for key in ('revision_id', 'testament_sha1', 'target_branch',
2520.4.105 by Aaron Bentley
Implement patch verification
541
                    'source_branch', 'message', 'base_revision_id'):
2520.4.73 by Aaron Bentley
Implement new merge directive format
542
            try:
543
                kwargs[key] = stanza.get(key)
544
            except KeyError:
545
                pass
546
        kwargs['revision_id'] = kwargs['revision_id'].encode('utf-8')
2520.4.105 by Aaron Bentley
Implement patch verification
547
        kwargs['base_revision_id'] =\
548
            kwargs['base_revision_id'].encode('utf-8')
2520.4.73 by Aaron Bentley
Implement new merge directive format
549
        return klass(time=time, timezone=timezone, patch=patch, bundle=bundle,
550
                     **kwargs)
551
552
    def to_lines(self):
2520.4.105 by Aaron Bentley
Implement patch verification
553
        lines = self._to_lines(base_revision=True)
2520.4.73 by Aaron Bentley
Implement new merge directive format
554
        if self.patch is not None:
555
            lines.append('# Begin patch\n')
556
            lines.extend(self.patch.splitlines(True))
557
        if self.bundle is not None:
558
            lines.append('# Begin bundle\n')
559
            lines.extend(self.bundle.splitlines(True))
560
        return lines
561
562
    @classmethod
563
    def from_objects(klass, repository, revision_id, time, timezone,
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
564
                 target_branch, include_patch=True, include_bundle=True,
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
565
                 local_target_branch=None, public_branch=None, message=None,
566
                 base_revision_id=None):
2520.4.73 by Aaron Bentley
Implement new merge directive format
567
        """Generate a merge directive from various objects
568
569
        :param repository: The repository containing the revision
570
        :param revision_id: The revision to merge
571
        :param time: The POSIX timestamp of the date the request was issued.
572
        :param timezone: The timezone of the request
573
        :param target_branch: The url of the branch to merge into
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
574
        :param include_patch: If true, include a preview patch
575
        :param include_bundle: If true, include a bundle
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
576
        :param local_target_branch: the target branch, either itself or a local copy
577
        :param public_branch: location of a public branch containing
578
            the target revision.
2520.4.73 by Aaron Bentley
Implement new merge directive format
579
        :param message: Message to use when committing the merge
580
        :return: The merge directive
581
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
582
        The public branch is always used if supplied.  If no bundle is
583
        included, the public branch must be supplied, and will be verified.
2520.4.73 by Aaron Bentley
Implement new merge directive format
584
585
        If the message is not supplied, the message from revision_id will be
586
        used for the commit.
587
        """
2520.4.86 by Aaron Bentley
Improve locking in _BaseMergeDirective.from_object
588
        locked = []
589
        try:
590
            repository.lock_write()
591
            locked.append(repository)
592
            t_revision_id = revision_id
593
            if revision_id == 'null:':
594
                t_revision_id = None
595
            t = testament.StrictTestament3.from_revision(repository,
596
                t_revision_id)
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
597
            if local_target_branch is None:
598
                submit_branch = _mod_branch.Branch.open(target_branch)
599
            else:
600
                submit_branch = local_target_branch
2520.4.86 by Aaron Bentley
Improve locking in _BaseMergeDirective.from_object
601
            submit_branch.lock_read()
602
            locked.append(submit_branch)
603
            if submit_branch.get_public_branch() is not None:
604
                target_branch = submit_branch.get_public_branch()
2520.4.105 by Aaron Bentley
Implement patch verification
605
            submit_revision_id = submit_branch.last_revision()
606
            submit_revision_id = _mod_revision.ensure_null(submit_revision_id)
607
            graph = repository.get_graph(submit_branch.repository)
608
            ancestor_id = graph.find_unique_lca(revision_id,
609
                                                submit_revision_id)
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
610
            if base_revision_id is None:
611
                base_revision_id = ancestor_id
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
612
            if (include_patch, include_bundle) != (False, False):
613
                repository.fetch(submit_branch.repository, submit_revision_id)
614
            if include_patch:
615
                patch = klass._generate_diff(repository, revision_id,
616
                                             base_revision_id)
617
            else:
2520.4.86 by Aaron Bentley
Improve locking in _BaseMergeDirective.from_object
618
                patch = None
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
619
620
            if include_bundle:
621
                bundle = klass._generate_bundle(repository, revision_id,
622
                    ancestor_id).encode('base-64')
623
            else:
2520.4.73 by Aaron Bentley
Implement new merge directive format
624
                bundle = None
2520.4.86 by Aaron Bentley
Improve locking in _BaseMergeDirective.from_object
625
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
626
            if public_branch is not None and not include_bundle:
627
                public_branch_obj = _mod_branch.Branch.open(public_branch)
628
                public_branch_obj.lock_read()
629
                locked.append(public_branch_obj)
630
                if not public_branch_obj.repository.has_revision(
631
                    revision_id):
632
                    raise errors.PublicBranchOutOfDate(public_branch,
633
                                                       revision_id)
4634.90.3 by Andrew Bennetts
Fix other bugs revealed by clearing chk_map page cache during blackbox tests.
634
            testament_sha1 = t.as_sha1()
2520.4.86 by Aaron Bentley
Improve locking in _BaseMergeDirective.from_object
635
        finally:
636
            for entry in reversed(locked):
637
                entry.unlock()
4634.90.3 by Andrew Bennetts
Fix other bugs revealed by clearing chk_map page cache during blackbox tests.
638
        return klass(revision_id, testament_sha1, time, timezone,
639
            target_branch, patch, public_branch, message, bundle,
6365.1.5 by Jelmer Vernooij
Kill optional submit_branch argument to MergeDirective constructor.
640
            base_revision_id)
2520.4.105 by Aaron Bentley
Implement patch verification
641
642
    def _verify_patch(self, repository):
643
        calculated_patch = self._generate_diff(repository, self.revision_id,
644
                                               self.base_revision_id)
645
        # Convert line-endings to UNIX
646
        stored_patch = re.sub('\r\n?', '\n', self.patch)
2520.7.2 by Aaron Bentley
Restore patch verification for CR, CRLF files
647
        calculated_patch = re.sub('\r\n?', '\n', calculated_patch)
2520.4.105 by Aaron Bentley
Implement patch verification
648
        # Strip trailing whitespace
649
        calculated_patch = re.sub(' *\n', '\n', calculated_patch)
650
        stored_patch = re.sub(' *\n', '\n', stored_patch)
2520.4.108 by Aaron Bentley
Start work on using merge base from directives
651
        return (calculated_patch == stored_patch)
652
2520.4.109 by Aaron Bentley
start work on directive cherry-picking
653
    def get_merge_request(self, repository):
654
        """Provide data for performing a merge
2520.4.108 by Aaron Bentley
Start work on using merge base from directives
655
2520.4.109 by Aaron Bentley
start work on directive cherry-picking
656
        Returns suggested base, suggested target, and patch verification status
657
        """
2520.4.108 by Aaron Bentley
Start work on using merge base from directives
658
        verified = self._maybe_verify(repository)
2520.4.109 by Aaron Bentley
start work on directive cherry-picking
659
        return self.base_revision_id, self.revision_id, verified
2520.4.105 by Aaron Bentley
Implement patch verification
660
2520.4.108 by Aaron Bentley
Start work on using merge base from directives
661
    def _maybe_verify(self, repository):
662
        if self.patch is not None:
663
            if self._verify_patch(repository):
664
                return 'verified'
665
            else:
666
                return 'failed'
667
        else:
668
            return 'inapplicable'
669
2520.4.73 by Aaron Bentley
Implement new merge directive format
670
671
class MergeDirectiveFormatRegistry(registry.Registry):
672
2694.1.1 by Aaron Bentley
Restore support for Merge directive 2 / 0.19
673
    def register(self, directive, format_string=None):
674
        if format_string is None:
2694.1.3 by Aaron Bentley
Fix whitespace
675
            format_string = directive._format_string
2694.1.1 by Aaron Bentley
Restore support for Merge directive 2 / 0.19
676
        registry.Registry.register(self, format_string, directive)
2520.4.73 by Aaron Bentley
Implement new merge directive format
677
678
679
_format_registry = MergeDirectiveFormatRegistry()
680
_format_registry.register(MergeDirective)
681
_format_registry.register(MergeDirective2)
4241.14.12 by Vincent Ladeuil
Far too many modifications for a single commit, need to restart.
682
# 0.19 never existed.  It got renamed to 0.90.  But by that point, there were
683
# already merge directives in the wild that used 0.19. Registering with the old
684
# format string to retain compatibility with those merge directives.
2694.1.1 by Aaron Bentley
Restore support for Merge directive 2 / 0.19
685
_format_registry.register(MergeDirective2,
686
                          'Bazaar merge directive format 2 (Bazaar 0.19)')