/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 breezy/plugins/changelog_merge/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 18:10:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521181028-zn04pdfw0od9hfj3
Rename brzlib => breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/changelog_merge/__init__.py
55
55
strange results if there is a criss-cross merge.
56
56
"""
57
57
 
58
 
# Since we are a built-in plugin we share the brzlib version
59
 
from brzlib import version_info
60
 
from brzlib.hooks import install_lazy_named_hook
 
58
# Since we are a built-in plugin we share the breezy version
 
59
from breezy import version_info
 
60
from breezy.hooks import install_lazy_named_hook
61
61
 
62
62
# Put most of the code in a separate module that we lazy-import to keep the
63
63
# overhead of this plugin as minimal as possible.
64
64
def changelog_merge_hook(merger):
65
65
    """Merger.merge_file_content hook for GNU-format ChangeLog files."""
66
 
    from brzlib.plugins.changelog_merge.changelog_merge import ChangeLogMerger
 
66
    from breezy.plugins.changelog_merge.changelog_merge import ChangeLogMerger
67
67
    return ChangeLogMerger(merger)
68
68
 
69
 
install_lazy_named_hook("brzlib.merge", "Merger.hooks", "merge_file_content",
 
69
install_lazy_named_hook("breezy.merge", "Merger.hooks", "merge_file_content",
70
70
    changelog_merge_hook, 'GNU ChangeLog file merge')
71
71
 
72
72
def load_tests(basic_tests, module, loader):