← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Jelmer Vernooij
  • Date: 2011-03-30 11:45:54 UTC
  • mto: (5622.4.1 uninstall-hook)
  • mto: This revision was merged to the branch mainline in revision 5747.
  • Revision ID: jelmer@samba.org-20110330114554-zx7av89umf2dd9an
Don't require arguments to hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
58
58
class MergeDirectiveHooks(hooks.Hooks):
59
59
    """Hooks for MergeDirective classes."""
60
60
 
61
 
    def __init__(self, module_name, member_name):
62
 
        hooks.Hooks.__init__(self, module_name, member_name)
 
61
    def __init__(self):
 
62
        hooks.Hooks.__init__(self, "bzrlib.merge_directive", "BaseMergeDirective.hooks")
63
63
        self.add_hook('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"
77
77
        stores a set of revisions in more than one file
78
78
    """
79
79
 
80
 
    hooks = MergeDirectiveHooks("bzrlib.merge_directive", "BaseMergeDirective.hooks")
 
80
    hooks = MergeDirectiveHooks()
81
81
 
82
82
    multiple_output_files = False
83
83