← 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: Patch Queue Manager
  • Date: 2016-01-31 13:36:59 UTC
  • mfrom: (6613.1.5 1538480-match-hostname)
  • Revision ID: pqm@pqm.ubuntu.com-20160131133659-ouy92ee2wlv9xz8m
(vila) Use ssl.match_hostname instead of our own. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/news_merge/__init__.py
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
from __future__ import absolute_import
 
18
 
17
19
__doc__ = """Merge hook for bzr's NEWS file.
18
20
 
19
21
To enable this plugin, add a section to your branch.conf or location.conf
33
35
 
34
36
# Since we are a built-in plugin we share the bzrlib version
35
37
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
 
38
from bzrlib.hooks import install_lazy_named_hook
45
39
 
46
40
 
47
41
def news_merge_hook(merger):
48
42
    """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()
 
43
    from bzrlib.plugins.news_merge.news_merge import NewsMerger
 
44
    return NewsMerger(merger)
 
45
 
 
46
 
 
47
install_lazy_named_hook("bzrlib.merge", "Merger.hooks", "merge_file_content",
 
48
    news_merge_hook, "NEWS file merge")
56
49
 
57
50
 
58
51
def load_tests(basic_tests, module, loader):