← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-03-22 09:57:11 UTC
  • mfrom: (5724.1.4 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20110322095711-9bggm9tnxnw9frow
(jameinel) Fix tar exporters to always write to binary streams. (John A
 Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
59
59
    """Hooks for MergeDirective classes."""
60
60
 
61
61
    def __init__(self):
62
 
        hooks.Hooks.__init__(self, "bzrlib.merge_directive", "BaseMergeDirective.hooks")
63
 
        self.add_hook('merge_request_body',
 
62
        hooks.Hooks.__init__(self)
 
63
        self.create_hook(hooks.HookPoint('merge_request_body',
64
64
            "Called with a MergeRequestBodyParams when a body is needed for"
65
65
            " a merge request.  Callbacks must return a body.  If more"
66
66
            " than one callback is registered, the output of one callback is"
67
 
            " provided to the next.", (1, 15, 0))
 
67
            " provided to the next.", (1, 15, 0), False))
68
68
 
69
69
 
70
70
class BaseMergeDirective(object):