Merge lp:~jelmer/bzr-dbus/lazy-hooks into lp:bzr-dbus

[Jelmer Vernooij]

Lazily register hooks if possible.

Lazily register hooks if supported by the version of bzrlib used.

This avoids loading of the smart server unless it's actually used.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 3/31/2011 5:03 PM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-dbus/lazy-hooks into lp:bzr-dbus.
>
> Requested reviews:
> Bazaar Developers (bzr)
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-dbus/lazy-hooks/+merge/55537
>
> Lazily register hooks if supported by the version of bzrlib used.
>
> This avoids loading of the smart server unless it's actually used.

 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk2UmPsACgkQJdeBCYSNAAOTFwCgs22JedZ6mZOPR1T5anDpf18r
1E8AoL+E71X2zB+Ws50ZmBIton8PfDyW
=8x7X
-----END PGP SIGNATURE-----

review: Approve

=== modified file '__init__.py'
--- __init__.py	2010-02-11 17:55:04 +0000
+++ __init__.py	2011-03-30 13:25:38 +0000
@@ -66,14 +66,52 @@
 
 from bzrlib import commands
 
-from bzrlib.plugins.dbus.hook import install_hooks
-
-
 def test_suite():
     import tests
     return tests.test_suite()
 
 
+def install_hooks():
+    """Install the dbus hooks into bzrlib."""
+    try:
+        from bzrlib.hooks import install_lazy_named_hook
+    except ImportError: # bzr < 2.4
+        from bzrlib.branch import Branch
+        from bzrlib.smart.server import SmartTCPServer
+        from bzrlib.plugins.dbus.hook import (
+            on_post_change_branch_tip,
+            on_post_commit,
+            on_server_start,
+            on_server_stop,
+            )
+        Branch.hooks.install_named_hook(
+            'post_change_branch_tip', on_post_change_branch_tip,
+            'Announcing on branch change on D-Bus')
+        Branch.hooks.install_named_hook(
+             'post_commit', on_post_commit,
+             'Zeitgeist dataprovider')
+        SmartTCPServer.hooks.install_named_hook(
+            'server_started', on_server_start,
+            'Registering server URL mapping')
+        SmartTCPServer.hooks.install_named_hook(
+            'server_stopped', on_server_stop,
+            'Unregistering server mapping')
+    else:
+        install_lazy_named_hook("bzrlib.branch", "Branch.hooks",
+            'post_change_branch_tip', "bzrlib.plugins.dbus.hook",
+            "on_post_change_branch_tip",
+            'Announcing on branch change on D-Bus')
+        install_lazy_named_hook("bzrlib.branch", "Branch.hooks",
+             'post_commit', "bzrlib.plugins.dbus.hook",
+             "on_post_commit", 'Zeitgeist dataprovider')
+        install_lazy_named_hook("bzrlib.smart.server", "SmartTCPServer.hooks",
+            'server_started', "bzrlib.plugins.dbus.hook",
+            "on_server_start", 'Registering server URL mapping')
+        install_lazy_named_hook("bzrlib.smart.server", "SmartTCPServer.hooks",
+            'server_stopped', "bzrlib.plugins.dbus.hook",
+            "on_server_stop", 'Unregistering server mapping')
+
+
 install_hooks()
 
 

=== modified file 'hook.py'
--- hook.py	2010-06-29 23:38:25 +0000
+++ hook.py	2011-03-30 13:25:38 +0000
@@ -20,25 +20,6 @@
 """System wide hooks to trigger dbus events from bzr activity."""
 
 
-from bzrlib.branch import Branch
-from bzrlib.smart.server import SmartTCPServer
-
-def install_hooks():
-    """Install the dbus hooks into bzrlib."""
-    Branch.hooks.install_named_hook(
-        'post_change_branch_tip', on_post_change_branch_tip,
-        'Announcing on branch change on D-Bus')
-    Branch.hooks.install_named_hook(
-         'post_commit', on_post_commit,
-         'Zeitgeist dataprovider')
-    SmartTCPServer.hooks.install_named_hook(
-        'server_started', on_server_start,
-        'Registering server URL mapping')
-    SmartTCPServer.hooks.install_named_hook(
-        'server_stopped', on_server_stop,
-        'Unregistering server mapping')
-
-
 def get_activity():
     import activity
     import dbus