17
17
from __future__ import absolute_import
22
21
from . import lazy_import
23
22
lazy_import.lazy_import(globals(), """
24
23
from breezy import (
25
24
branch as _mod_branch,
32
31
revision as _mod_revision,
37
from breezy.bzr import (
40
from breezy.bzr.bundle import (
37
from breezy.bundle import (
41
38
serializer as bundle_serializer,
47
41
from .sixish import (
68
62
"""Hooks for MergeDirective classes."""
70
64
def __init__(self):
71
hooks.Hooks.__init__(self, "breezy.merge_directive",
72
"BaseMergeDirective.hooks")
65
hooks.Hooks.__init__(self, "breezy.merge_directive", "BaseMergeDirective.hooks")
66
self.add_hook('merge_request_body',
75
67
"Called with a MergeRequestBodyParams when a body is needed for"
76
68
" a merge request. Callbacks must return a body. If more"
77
69
" than one callback is registered, the output of one callback is"
81
73
class BaseMergeDirective(object):
82
74
"""A request to perform a merge into a branch.
84
This is the base class that all merge directive implementations
76
This is the base class that all merge directive implementations
85
77
should derive from.
87
:cvar multiple_output_files: Whether or not this merge directive
79
:cvar multiple_output_files: Whether or not this merge directive
88
80
stores a set of revisions in more than one file
151
143
stanza.add(key, self.__dict__[key])
152
144
if base_revision:
153
145
stanza.add('base_revision_id', self.base_revision_id)
154
lines = [b'# ' + self._format_string + b'\n']
146
lines = ['# ' + self._format_string + '\n']
155
147
lines.extend(rio.to_patch_lines(stanza))
156
lines.append(b'# \n')
159
151
def write_to_directory(self, path):
167
159
def from_objects(klass, repository, revision_id, time, timezone,
168
target_branch, patch_type='bundle',
169
local_target_branch=None, public_branch=None, message=None):
160
target_branch, patch_type='bundle',
161
local_target_branch=None, public_branch=None, message=None):
170
162
"""Generate a merge directive from various objects
172
164
:param repository: The repository containing the revision
209
201
submit_revision_id)
210
202
type_handler = {'bundle': klass._generate_bundle,
211
203
'diff': klass._generate_diff,
212
None: lambda x, y, z: None}
204
None: lambda x, y, z: None }
213
205
patch = type_handler[patch_type](repository, revision_id,
222
214
return klass(revision_id, t.as_sha1(), time, timezone, target_branch,
223
patch, patch_type, public_branch, message)
215
patch, patch_type, public_branch, message)
225
217
def get_disk_name(self, branch):
226
218
"""Generate a suitable basename for storing this directive on disk
232
224
if self.revision_id == revision_id:
236
revno = branch.revision_id_to_dotted_revno(self.revision_id)
237
except errors.NoSuchRevision:
227
revno = branch.get_revision_id_to_revno_map().get(self.revision_id,
239
229
nick = re.sub('(\\W+)', '-', branch.nick).strip('-')
240
230
return '%s-%s' % (nick, '.'.join(str(n) for n in revno))
261
251
:return: a string
263
253
my_gpg = gpg.GPGStrategy(branch.get_config_stack())
264
return my_gpg.sign(b''.join(self.to_lines()), gpg.MODE_CLEAR)
254
return my_gpg.sign(''.join(self.to_lines()), gpg.MODE_CLEAR)
266
256
def to_email(self, mail_to, branch, sign=False):
267
257
"""Serialize as an email message.
282
272
body = self.to_signed(branch)
284
body = b''.join(self.to_lines())
274
body = ''.join(self.to_lines())
285
275
message = email_message.EmailMessage(mail_from, mail_to, subject,
289
279
def install_revisions(self, target_repo):
309
299
info.real_revisions)
310
300
for revision in info.real_revisions:
311
301
for parent_id in revision.parent_ids:
312
if (parent_id not in bundle_revisions
313
and not target_repo.has_revision(parent_id)):
302
if (parent_id not in bundle_revisions and
303
not target_repo.has_revision(parent_id)):
314
304
missing_revisions.append(parent_id)
315
305
# reverse missing revisions to try to get heads first
316
306
unique_missing = []
355
345
elif len(self.hooks['merge_request_body']) > 0:
356
346
trace.warning('Cannot run merge_request_body hooks because mail'
357
347
' client %s does not support message bodies.',
358
mail_client.__class__.__name__)
348
mail_client.__class__.__name__)
359
349
mail_client.compose_merge_request(to, subject,
360
b''.join(self.to_lines()),
350
''.join(self.to_lines()),
377
367
directly using the standard patch program.
380
_format_string = b'Bazaar merge directive format 1'
370
_format_string = 'Bazaar merge directive format 1'
382
372
def __init__(self, revision_id, testament_sha1, time, timezone,
383
373
target_branch, patch=None, patch_type=None,
397
387
:param message: The message to use when committing this merge
399
389
BaseMergeDirective.__init__(self, revision_id, testament_sha1, time,
400
timezone, target_branch, patch, source_branch, message)
390
timezone, target_branch, patch, source_branch, message)
401
391
if patch_type not in (None, 'diff', 'bundle'):
402
392
raise ValueError(patch_type)
403
393
if patch_type != 'bundle' and source_branch is None:
464
454
kwargs['revision_id'] = kwargs['revision_id'].encode('utf-8')
465
if 'testament_sha1' in kwargs:
466
kwargs['testament_sha1'] = kwargs['testament_sha1'].encode('ascii')
467
455
return MergeDirective(time=time, timezone=timezone,
468
456
patch_type=patch_type, patch=patch, **kwargs)
491
479
class MergeDirective2(BaseMergeDirective):
493
_format_string = b'Bazaar merge directive format 2 (Bazaar 0.90)'
481
_format_string = 'Bazaar merge directive format 2 (Bazaar 0.90)'
495
483
def __init__(self, revision_id, testament_sha1, time, timezone,
496
484
target_branch, patch=None, source_branch=None, message=None,
498
486
if source_branch is None and bundle is None:
499
487
raise errors.NoMergeSource()
500
488
BaseMergeDirective.__init__(self, revision_id, testament_sha1, time,
501
timezone, target_branch, patch, source_branch, message)
489
timezone, target_branch, patch, source_branch, message)
502
490
self.bundle = bundle
503
491
self.base_revision_id = base_revision_id
532
520
except StopIteration:
535
if start.startswith(b'# Begin patch'):
523
if start.startswith('# Begin patch'):
537
525
for line in line_iter:
538
if line.startswith(b'# Begin bundle'):
526
if line.startswith('# Begin bundle'):
541
529
patch_lines.append(line)
544
patch = b''.join(patch_lines)
532
patch = ''.join(patch_lines)
545
533
if start is not None:
546
if start.startswith(b'# Begin bundle'):
547
bundle = b''.join(line_iter)
534
if start.startswith('# Begin bundle'):
535
bundle = ''.join(line_iter)
549
537
raise errors.IllegalMergeDirectivePayload(start)
550
538
time, timezone = timestamp.parse_patch_date(stanza.get('timestamp'))
558
546
kwargs['revision_id'] = kwargs['revision_id'].encode('utf-8')
559
547
kwargs['base_revision_id'] =\
560
548
kwargs['base_revision_id'].encode('utf-8')
561
if 'testament_sha1' in kwargs:
562
kwargs['testament_sha1'] = kwargs['testament_sha1'].encode('ascii')
563
549
return klass(time=time, timezone=timezone, patch=patch, bundle=bundle,
566
552
def to_lines(self):
567
553
lines = self._to_lines(base_revision=True)
568
554
if self.patch is not None:
569
lines.append(b'# Begin patch\n')
555
lines.append('# Begin patch\n')
570
556
lines.extend(self.patch.splitlines(True))
571
557
if self.bundle is not None:
572
lines.append(b'# Begin bundle\n')
558
lines.append('# Begin bundle\n')
573
559
lines.extend(self.bundle.splitlines(True))
577
563
def from_objects(klass, repository, revision_id, time, timezone,
578
target_branch, include_patch=True, include_bundle=True,
579
local_target_branch=None, public_branch=None, message=None,
580
base_revision_id=None):
564
target_branch, include_patch=True, include_bundle=True,
565
local_target_branch=None, public_branch=None, message=None,
566
base_revision_id=None):
581
567
"""Generate a merge directive from various objects
583
569
:param repository: The repository containing the revision
599
585
If the message is not supplied, the message from revision_id will be
600
586
used for the commit.
602
with cleanup.ExitStack() as exit_stack:
603
exit_stack.enter_context(repository.lock_write())
590
repository.lock_write()
591
locked.append(repository)
604
592
t_revision_id = revision_id
605
if revision_id == b'null:':
593
if revision_id == 'null:':
606
594
t_revision_id = None
607
595
t = testament.StrictTestament3.from_revision(repository,
609
597
if local_target_branch is None:
610
598
submit_branch = _mod_branch.Branch.open(target_branch)
612
600
submit_branch = local_target_branch
613
exit_stack.enter_context(submit_branch.lock_read())
601
submit_branch.lock_read()
602
locked.append(submit_branch)
614
603
if submit_branch.get_public_branch() is not None:
615
604
target_branch = submit_branch.get_public_branch()
616
605
submit_revision_id = submit_branch.last_revision()
631
620
if include_bundle:
632
bundle = base64.b64encode(klass._generate_bundle(repository, revision_id,
621
bundle = klass._generate_bundle(repository, revision_id,
622
ancestor_id).encode('base-64')
637
626
if public_branch is not None and not include_bundle:
638
627
public_branch_obj = _mod_branch.Branch.open(public_branch)
639
exit_stack.enter_context(public_branch_obj.lock_read())
628
public_branch_obj.lock_read()
629
locked.append(public_branch_obj)
640
630
if not public_branch_obj.repository.has_revision(
642
632
raise errors.PublicBranchOutOfDate(public_branch,
644
634
testament_sha1 = t.as_sha1()
636
for entry in reversed(locked):
645
638
return klass(revision_id, testament_sha1, time, timezone,
646
target_branch, patch, public_branch, message, bundle,
639
target_branch, patch, public_branch, message, bundle,
649
642
def _verify_patch(self, repository):
650
643
calculated_patch = self._generate_diff(repository, self.revision_id,
651
644
self.base_revision_id)
652
645
# Convert line-endings to UNIX
653
stored_patch = re.sub(b'\r\n?', b'\n', self.patch)
654
calculated_patch = re.sub(b'\r\n?', b'\n', calculated_patch)
646
stored_patch = re.sub('\r\n?', '\n', self.patch)
647
calculated_patch = re.sub('\r\n?', '\n', calculated_patch)
655
648
# Strip trailing whitespace
656
calculated_patch = re.sub(b' *\n', b'\n', calculated_patch)
657
stored_patch = re.sub(b' *\n', b'\n', stored_patch)
649
calculated_patch = re.sub(' *\n', '\n', calculated_patch)
650
stored_patch = re.sub(' *\n', '\n', stored_patch)
658
651
return (calculated_patch == stored_patch)
660
653
def get_merge_request(self, repository):
added
removed
breezy/merge_directive.py
