1
=== modified file '__init__.py'
2
--- __init__.py	2010-02-11 17:55:04 +0000
3
+++ __init__.py	2011-03-30 13:25:38 +0000
4
@@ -66,14 +66,52 @@
5
66
66
6
67
from bzrlib import commands
67
from bzrlib import commands
7
68
68
8
69
from bzrlib.plugins.dbus.hook import install_hooks
9
70
10
71
11
72
def test_suite():
69
def test_suite():
12
73
    import tests
70
    import tests
13
74
    return tests.test_suite()
71
    return tests.test_suite()
14
75
72
15
76
73
16
74
def install_hooks():
17
75
    """Install the dbus hooks into bzrlib."""
18
76
    try:
19
77
        from bzrlib.hooks import install_lazy_named_hook
20
78
    except ImportError: # bzr < 2.4
21
79
        from bzrlib.branch import Branch
22
80
        from bzrlib.smart.server import SmartTCPServer
23
81
        from bzrlib.plugins.dbus.hook import (
24
82
            on_post_change_branch_tip,
25
83
            on_post_commit,
26
84
            on_server_start,
27
85
            on_server_stop,
28
86
            )
29
87
        Branch.hooks.install_named_hook(
30
88
            'post_change_branch_tip', on_post_change_branch_tip,
31
89
            'Announcing on branch change on D-Bus')
32
90
        Branch.hooks.install_named_hook(
33
91
             'post_commit', on_post_commit,
34
92
             'Zeitgeist dataprovider')
35
93
        SmartTCPServer.hooks.install_named_hook(
36
94
            'server_started', on_server_start,
37
95
            'Registering server URL mapping')
38
96
        SmartTCPServer.hooks.install_named_hook(
39
97
            'server_stopped', on_server_stop,
40
98
            'Unregistering server mapping')
41
99
    else:
42
100
        install_lazy_named_hook("bzrlib.branch", "Branch.hooks",
43
101
            'post_change_branch_tip', "bzrlib.plugins.dbus.hook",
44
102
            "on_post_change_branch_tip",
45
103
            'Announcing on branch change on D-Bus')
46
104
        install_lazy_named_hook("bzrlib.branch", "Branch.hooks",
47
105
             'post_commit', "bzrlib.plugins.dbus.hook",
48
106
             "on_post_commit", 'Zeitgeist dataprovider')
49
107
        install_lazy_named_hook("bzrlib.smart.server", "SmartTCPServer.hooks",
50
108
            'server_started', "bzrlib.plugins.dbus.hook",
51
109
            "on_server_start", 'Registering server URL mapping')
52
110
        install_lazy_named_hook("bzrlib.smart.server", "SmartTCPServer.hooks",
53
111
            'server_stopped', "bzrlib.plugins.dbus.hook",
54
112
            "on_server_stop", 'Unregistering server mapping')
55
113
56
114
57
77
install_hooks()
115
install_hooks()
58
78
116
59
79
117
60
80
118
61
=== modified file 'hook.py'
62
--- hook.py	2010-06-29 23:38:25 +0000
63
+++ hook.py	2011-03-30 13:25:38 +0000
64
@@ -20,25 +20,6 @@
65
20
"""System wide hooks to trigger dbus events from bzr activity."""
20
"""System wide hooks to trigger dbus events from bzr activity."""
66
21
21
67
22
22
68
23
from bzrlib.branch import Branch
69
24
from bzrlib.smart.server import SmartTCPServer
70
25
71
26
def install_hooks():
72
27
    """Install the dbus hooks into bzrlib."""
73
28
    Branch.hooks.install_named_hook(
74
29
        'post_change_branch_tip', on_post_change_branch_tip,
75
30
        'Announcing on branch change on D-Bus')
76
31
    Branch.hooks.install_named_hook(
77
32
         'post_commit', on_post_commit,
78
33
         'Zeitgeist dataprovider')
79
34
    SmartTCPServer.hooks.install_named_hook(
80
35
        'server_started', on_server_start,
81
36
        'Registering server URL mapping')
82
37
    SmartTCPServer.hooks.install_named_hook(
83
38
        'server_stopped', on_server_stop,
84
39
        'Unregistering server mapping')
85
40
86
41
87
42
def get_activity():
23
def get_activity():
88
43
    import activity
24
    import activity
89
44
    import dbus
25
    import dbus
Status:	Merged
Approved by:	John A Meinel on 2011-03-31
Approved revision:	48
Merged at revision:	48
Proposed branch:	lp:~jelmer/bzr-dbus/lazy-hooks
Merge into:	lp:bzr-dbus
Diff against target:	89 lines (+41/-22) 2 files modified __init__.py (+41/-3) hook.py (+0/-19)
To merge this branch:	bzr merge lp:~jelmer/bzr-dbus/lazy-hooks
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
John A Meinel		2011-03-30	Approve on 2011-03-31
Review via email: mp+55537@code.launchpad.net