~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/hooks.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
 
18
17
"""Support for plugin hooking logic."""
19
18
 
 
19
from __future__ import absolute_import
 
20
 
20
21
from bzrlib import (
21
22
    registry,
22
23
    symbol_versioning,
30
31
    errors,
31
32
    pyutils,
32
33
    )
 
34
from bzrlib.i18n import gettext
33
35
""")
34
36
 
35
37
 
70
72
 
71
73
_builtin_known_hooks = (
72
74
    ('bzrlib.branch', 'Branch.hooks', 'BranchHooks'),
73
 
    ('bzrlib.bzrdir', 'BzrDir.hooks', 'BzrDirHooks'),
 
75
    ('bzrlib.controldir', 'ControlDir.hooks', 'ControlDirHooks'),
74
76
    ('bzrlib.commands', 'Command.hooks', 'CommandHooks'),
75
77
    ('bzrlib.config', 'ConfigHooks', '_ConfigHooks'),
76
78
    ('bzrlib.info', 'hooks', 'InfoHooks'),
81
83
    ('bzrlib.smart.client', '_SmartClient.hooks', 'SmartClientHooks'),
82
84
    ('bzrlib.smart.server', 'SmartTCPServer.hooks', 'SmartServerHooks'),
83
85
    ('bzrlib.status', 'hooks', 'StatusHooks'),
 
86
    ('bzrlib.transport', 'Transport.hooks', 'TransportHooks'),
84
87
    ('bzrlib.version_info_formats.format_rio', 'RioVersionInfoBuilder.hooks',
85
88
        'RioVersionInfoBuilderHooks'),
86
89
    ('bzrlib.merge_directive', 'BaseMergeDirective.hooks',
126
129
        """
127
130
        dict.__init__(self)
128
131
        self._callable_names = {}
 
132
        self._lazy_callable_names = {}
129
133
        self._module = module
130
134
        self._member_name = member_name
131
135
 
195
199
        the code names are rarely meaningful for end users and this is not
196
200
        intended for debugging.
197
201
        """
198
 
        return self._callable_names.get(a_callable, "No hook name")
 
202
        name = self._callable_names.get(a_callable, None)
 
203
        if name is None and a_callable is not None:
 
204
            name = self._lazy_callable_names.get((a_callable.__module__,
 
205
                                                  a_callable.__name__),
 
206
                                                 None)
 
207
        if name is None:
 
208
            return 'No hook name'
 
209
        return name
 
210
 
199
211
 
200
212
    def install_named_hook_lazy(self, hook_name, callable_module,
201
213
        callable_member, name):
220
232
                self)
221
233
        else:
222
234
            hook_lazy(callable_module, callable_member, name)
 
235
        if name is not None:
 
236
            self.name_hook_lazy(callable_module, callable_member, name)
223
237
 
224
238
    def install_named_hook(self, hook_name, a_callable, name):
225
239
        """Install a_callable in to the hook hook_name, and label it name.
265
279
        """Associate name with a_callable to show users what is running."""
266
280
        self._callable_names[a_callable] = name
267
281
 
 
282
    def name_hook_lazy(self, callable_module, callable_member, callable_name):
 
283
        self._lazy_callable_names[(callable_module, callable_member)]= \
 
284
            callable_name
 
285
 
268
286
 
269
287
class HookPoint(object):
270
288
    """A single hook that clients can register to be called back when it fires.
310
328
            introduced_string = _format_version_tuple(self.introduced)
311
329
        else:
312
330
            introduced_string = 'unknown'
313
 
        strings.append('Introduced in: %s' % introduced_string)
 
331
        strings.append(gettext('Introduced in: %s') % introduced_string)
314
332
        if self.deprecated:
315
333
            deprecated_string = _format_version_tuple(self.deprecated)
316
 
            strings.append('Deprecated in: %s' % deprecated_string)
 
334
            strings.append(gettext('Deprecated in: %s') % deprecated_string)
317
335
        strings.append('')
318
336
        strings.extend(textwrap.wrap(self.__doc__,
319
337
            break_long_words=False))