/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/news_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/news_merge/__init__.py
33
33
  how to resolve that, so bzr will fallback to the default line-based merge.
34
34
"""
35
35
 
36
 
# Since we are a built-in plugin we share the brzlib version
37
 
from brzlib import version_info
38
 
from brzlib.hooks import install_lazy_named_hook
 
36
# Since we are a built-in plugin we share the breezy version
 
37
from breezy import version_info
 
38
from breezy.hooks import install_lazy_named_hook
39
39
 
40
40
 
41
41
def news_merge_hook(merger):
42
42
    """Merger.merge_file_content hook for bzr-format NEWS files."""
43
 
    from brzlib.plugins.news_merge.news_merge import NewsMerger
 
43
    from breezy.plugins.news_merge.news_merge import NewsMerger
44
44
    return NewsMerger(merger)
45
45
 
46
46
 
47
 
install_lazy_named_hook("brzlib.merge", "Merger.hooks", "merge_file_content",
 
47
install_lazy_named_hook("breezy.merge", "Merger.hooks", "merge_file_content",
48
48
    news_merge_hook, "NEWS file merge")
49
49
 
50
50