1
=== modified file '__init__.py'
2
--- __init__.py	2011-11-23 20:51:29 +0000
3
+++ __init__.py	2011-11-24 16:26:25 +0000
4
@@ -30,13 +30,10 @@
5
30
See `bzr help search` or `bzr help plugins/search`.
30
See `bzr help search` or `bzr help plugins/search`.
6
31
"""
31
"""
7
32
32
8
33
import bzrlib.commands
9
34
10
35
# Relative because at __init__ time the module does not exist.
33
# Relative because at __init__ time the module does not exist.
11
36
from bzrlib.branch import Branch
34
from bzrlib.branch import Branch
12
37
from bzrlib import log
35
from bzrlib import log
15
38
import commands
36
from bzrlib.commands import plugin_cmds
14
39
import errors
16
40
import index
37
import index
17
41
from bzrlib.smart.request import request_handlers as smart_request_handlers
38
from bzrlib.smart.request import request_handlers as smart_request_handlers
18
42
39
19
@@ -45,7 +42,8 @@
20
45
    'index',
42
    'index',
21
46
    'search',
43
    'search',
22
47
    ]:
44
    ]:
24
48
    bzrlib.commands.register_command(getattr(commands, 'cmd_' + command))
45
    plugin_cmds.register_lazy("cmd_" + command, [],
25
46
        "bzrlib.plugins.search.commands")
26
49
47
27
50
48
28
51
version_info = (1, 7, 0, 'dev', 0)
49
version_info = (1, 7, 0, 'dev', 0)
29
@@ -53,6 +51,7 @@
30
53
51
31
54
def auto_index_branch(result):
52
def auto_index_branch(result):
32
55
    """Handled for the post_change_branch_tip hook to update a search index."""
53
    """Handled for the post_change_branch_tip hook to update a search index."""
33
54
    from bzrlib.plugins.search import errors
34
56
    try:
55
    try:
35
57
        search_index = index.open_index_branch(result.branch)
56
        search_index = index.open_index_branch(result.branch)
36
58
    except errors.NoSearchIndex:
57
    except errors.NoSearchIndex:
Status:	Merged
Approved by:	Vincent Ladeuil on 2011-12-02
Approved revision:	91
Merged at revision:	92
Proposed branch:	lp:~jelmer/bzr-search/lazy-commands
Merge into:	lp:bzr-search
Diff against target:	36 lines (+4/-5) 1 file modified __init__.py (+4/-5)
To merge this branch:	bzr merge lp:~jelmer/bzr-search/lazy-commands
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Vincent Ladeuil		2011-11-24	Approve on 2011-12-02
Review via email: mp+83321@code.launchpad.net