← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Aaron Bentley
  • Date: 2009-05-11 18:35:20 UTC
  • mto: This revision was merged to the branch mainline in revision 4351.
  • Revision ID: aaron@aaronbentley.com-20090511183520-xtvepoauy7zjtb7x
Move hook to MergeDirective, implement MergeDirective.compose_merge_request.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
23
23
    diff,
24
24
    errors,
25
25
    gpg,
 
26
    hooks,
26
27
    registry,
27
28
    revision as _mod_revision,
28
29
    rio,
35
36
from bzrlib.email_message import EmailMessage
36
37
 
37
38
 
 
39
class MergeRequestBodyParams(object):
 
40
 
 
41
    def __init__(self, body, orig_body, directive, to, basename, subject,
 
42
                 branch, tree=None):
 
43
        self.body = body
 
44
        self.orig_body = orig_body
 
45
        self.directive = directive
 
46
        self.branch = branch
 
47
        self.tree = tree
 
48
        self.to = to
 
49
        self.basename = basename
 
50
        self.subject = subject
 
51
 
 
52
 
 
53
class MergeDirectiveHooks(hooks.Hooks):
 
54
 
 
55
    def __init__(self):
 
56
        hooks.Hooks.__init__(self)
 
57
        self.create_hook(hooks.HookPoint('merge_request_body',
 
58
            "Called with a MergeRequestBodyParams when a body is needed for"
 
59
            " a merge request.  Callbacks must return a body.  If more"
 
60
            " than one callback is registered, the output of one callback is"
 
61
            " provided to the next.", (1, 15, 0), False))
 
62
 
 
63
 
38
64
class _BaseMergeDirective(object):
39
65
 
 
66
    hooks = MergeDirectiveHooks()
 
67
 
40
68
    def __init__(self, revision_id, testament_sha1, time, timezone,
41
69
                 target_branch, patch=None, source_branch=None, message=None,
42
70
                 bundle=None):
240
268
                target_repo.fetch(source_branch.repository, self.revision_id)
241
269
        return self.revision_id
242
270
 
 
271
    def compose_merge_request(self, mail_client, to, body, branch, tree=None):
 
272
        basename = self.get_disk_name(branch)
 
273
        subject = '[MERGE] '
 
274
        if self.message is not None:
 
275
            subject += self.message
 
276
        else:
 
277
            revision = branch.repository.get_revision(self.revision_id)
 
278
            subject += revision.get_summary()
 
279
        orig_body = body
 
280
        for hook in self.hooks['merge_request_body']:
 
281
            params = MergeRequestBodyParams(body, orig_body, self,
 
282
                                            to, basename, subject, branch,
 
283
                                            tree)
 
284
            body = hook(params)
 
285
        mail_client.compose_merge_request(to, subject,
 
286
                                          ''.join(self.to_lines()),
 
287
                                          basename, body)
 
288
 
243
289
 
244
290
class MergeDirective(_BaseMergeDirective):
245
291