Merge lp:~jelmer/lpreview-body/lazy-hooks into lp:lpreview-body

[Jelmer Vernooij]

If the current version of bzr supports it, lazily install the hooks.

[Jelmer Vernooij (jelmer)]

The right functions have now landed in bzr.dev.

[j.c.sackett (jcsackett)]

Nice and straightforward. Looks good to me.

review: Approve

=== modified file '__init__.py'
--- __init__.py	2010-08-04 10:58:33 +0000
+++ __init__.py	2011-02-19 21:07:17 +0000
@@ -16,8 +16,7 @@
 
 """Provide review message bodies for proposed merges to Launchpad itself."""
 
-from bzrlib import commands, merge_directive
-
+from bzrlib import commands
 
 def shim(params):
     from body_callback import body_callback
@@ -31,25 +30,37 @@
                     hook_params['old_body'])
 
 
-if getattr(merge_directive.MergeDirective, 'hooks', None) is not None:
-    merge_directive.MergeDirective.hooks.install_named_hook(
-        'merge_request_body',
-        shim, 'Generate a message body for Launchpad merge requests.'
-    )
 try:
-    from bzrlib.plugins.launchpad import lp_propose
-except ImportError:
-    pass
+    from bzrlib.hooks import install_lazy_named_hook
+except ImportError: # bzr < 2.4
+    from bzrlib import merge_directive
+    if getattr(merge_directive.MergeDirective, 'hooks', None) is not None:
+        merge_directive.MergeDirective.hooks.install_named_hook(
+            'merge_request_body',
+            shim, 'Generate a message body for Launchpad merge requests.'
+        )
+    try:
+        from bzrlib.plugins.launchpad import lp_propose
+    except ImportError:
+        pass
+    else:
+        lp_propose.Proposer.hooks.install_named_hook(
+                'merge_proposal_body',
+                proposer_callback,
+                'Generate a message body for Launchpad merge requests.'
+            )
 else:
-    lp_propose.Proposer.hooks.install_named_hook(
-            'merge_proposal_body',
-            proposer_callback,
-            'Generate a message body for Launchpad merge requests.'
-        )
+    install_lazy_named_hook(
+        "bzrlib.merge_directive", "MergeDirective.hooks",
+        'merge_request_body',
+        shim, 'Generate a message body for Launchpad merge requests.')
+    install_lazy_named_hook(
+       "bzrlib.plugins.launcjpad.lp_propose", "Proposer.hooks",
+        'merge_proposal_body', proposer_callback,
+        'Generate a message body for Launchpad merge requests.')
 
 
 commands.plugin_cmds.register_lazy(
     'cmd_qa_ready', [], 'bzrlib.plugins.lpreview_body.qa_ready')
-
 commands.plugin_cmds.register_lazy(
     'cmd_lp_link_bug', [], 'bzrlib.plugins.lpreview_body.link_bug')