← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/news_merge/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/news_merge/__init__.py
33
33
 
34
34
# Since we are a built-in plugin we share the bzrlib version
35
35
from bzrlib import version_info
36
 
 
37
 
# Put most of the code in a separate module that we lazy-import to keep the
38
 
# overhead of this plugin as minimal as possible.
39
 
from bzrlib.lazy_import import lazy_import
40
 
lazy_import(globals(), """
41
 
from bzrlib.plugins.news_merge import news_merge as _mod_news_merge
42
 
""")
43
 
 
44
 
from bzrlib.merge import Merger
 
36
from bzrlib.hooks import install_lazy_named_hook
45
37
 
46
38
 
47
39
def news_merge_hook(merger):
48
40
    """Merger.merge_file_content hook for bzr-format NEWS files."""
49
 
    return _mod_news_merge.NewsMerger(merger)
50
 
 
51
 
 
52
 
def install_hook():
53
 
    Merger.hooks.install_named_hook(
54
 
        'merge_file_content', news_merge_hook, 'NEWS file merge')
55
 
install_hook()
 
41
    from bzrlib.plugins.news_merge.news_merge import NewsMerger
 
42
    return NewsMerger(merger)
 
43
 
 
44
 
 
45
install_lazy_named_hook("bzrlib.merge", "Merger.hooks", "merge_file_content",
 
46
    news_merge_hook, "NEWS file merge")
56
47
 
57
48
 
58
49
def load_tests(basic_tests, module, loader):