/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/hooks.py

  • Committer: Vincent Ladeuil
  • Date: 2009-12-15 20:32:34 UTC
  • mto: (4905.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4906.
  • Revision ID: v.ladeuil+lp@free.fr-20091215203234-d8br6xqfq6pec40z
Move the _warn_if_deprecated call from repo.__init__ to
repo.lock_{read,write} so that branch.lock_{read,write} can call it. This
makes it possible to access locations.conf and branch.conf.

* bzrlib/tests/blackbox/test_exceptions.py:
(TestDeprecationWarning): Test that the suppress_warning
configuration variable is taken into account.

* bzrlib/repository.py:
(Repository.__init__): Delete very old and obsolete
comments. Don't warn about deprecations yet.
(Repository.lock_write, Repository.lock_read): The repo is about
to be locked, check deprecation.
(Repository._warn_if_deprecated): Use the branch config if
available or the global one othewrwise and check for the
suppress_warning variable.

* bzrlib/remote.py:
(RemoteRepository._warn_if_deprecated): Nothing to do here. 

* bzrlib/repofmt/pack_repo.py:
(KnitPackRepository._warn_if_deprecated): Delegate to base class
if needed.

* bzrlib/branch.py:
(BzrBranch.lock_write, BzrBranch.lock_read): Check repo
deprecation.

* bzrlib/help_topics/en/configuration.txt:
Fix the variable name and its description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/hooks.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
"""Support for plugin hooking logic."""
19
19
from bzrlib import registry
20
20
from bzrlib.lazy_import import lazy_import
 
21
from bzrlib.symbol_versioning import deprecated_method
21
22
lazy_import(globals(), """
22
23
import textwrap
23
24
 
44
45
    'bzrlib.info', 'InfoHooks')
45
46
known_hooks.register_lazy(('bzrlib.lock', 'Lock.hooks'), 'bzrlib.lock',
46
47
    'LockHooks')
47
 
known_hooks.register_lazy(('bzrlib.merge', 'Merger.hooks'), 'bzrlib.merge',
48
 
    'MergeHooks')
49
48
known_hooks.register_lazy(('bzrlib.msgeditor', 'hooks'), 'bzrlib.msgeditor',
50
49
    'MessageEditorHooks')
51
50
known_hooks.register_lazy(('bzrlib.mutabletree', 'MutableTree.hooks'),
58
57
    ('bzrlib.version_info_formats.format_rio', 'RioVersionInfoBuilder.hooks'),
59
58
    'bzrlib.version_info_formats.format_rio', 'RioVersionInfoBuilderHooks')
60
59
known_hooks.register_lazy(
61
 
    ('bzrlib.merge_directive', 'BaseMergeDirective.hooks'),
 
60
    ('bzrlib.merge_directive', '_BaseMergeDirective.hooks'),
62
61
    'bzrlib.merge_directive', 'MergeDirectiveHooks')
63
62
 
64
63
 
278
277
 
279
278
See `Using hooks`_ in the User Guide for examples.
280
279
 
281
 
.. _Using hooks: ../user-guide/hooks.html
 
280
.. _Using hooks: ../user-guide/index.html#using-hooks
282
281
 
283
282
The class that contains each hook is given before the hooks it supplies. For
284
283
instance, BranchHooks as the class is the hooks class for