← 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:53:30 UTC
  • mto: This revision was merged to the branch mainline in revision 4351.
  • Revision ID: aaron@aaronbentley.com-20090511185330-88td7u0kzk88c6ye
cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
37
37
 
38
38
 
39
39
class MergeRequestBodyParams(object):
 
40
    """Parameter object for the merge_request_body hook."""
40
41
 
41
42
    def __init__(self, body, orig_body, directive, to, basename, subject,
42
43
                 branch, tree=None):
51
52
 
52
53
 
53
54
class MergeDirectiveHooks(hooks.Hooks):
 
55
    """Hooks for MergeDirective classes."""
54
56
 
55
57
    def __init__(self):
56
58
        hooks.Hooks.__init__(self)
269
271
        return self.revision_id
270
272
 
271
273
    def compose_merge_request(self, mail_client, to, body, branch, tree=None):
 
274
        """Compose a request to merge this directive.
 
275
 
 
276
        :param mail_client: The mail client to use for composing this request.
 
277
        :param to: The address to compose the request to.
 
278
        :param branch: The Branch that was used to produce this directive.
 
279
        :param tree: The Tree (if any) for the Branch used to produce this
 
280
            directive.
 
281
        """
272
282
        basename = self.get_disk_name(branch)
273
283
        subject = '[MERGE] '
274
284
        if self.message is not None: