/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: 2019-05-29 03:22:34 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7306.
  • Revision ID: jelmer@jelmer.uk-20190529032234-mt3fuws8gq03tapi
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/changelog_merge/__init__.py
56
56
"""
57
57
 
58
58
# Since we are a built-in plugin we share the breezy version
59
 
from ... import version_info
 
59
from ... import version_info  # noqa: F401
60
60
from ...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
 
 
65
 
64
66
def changelog_merge_hook(merger):
65
67
    """Merger.merge_file_content hook for GNU-format ChangeLog files."""
66
68
    from ...plugins.changelog_merge.changelog_merge import ChangeLogMerger
67
69
    return ChangeLogMerger(merger)
68
70
 
 
71
 
69
72
install_lazy_named_hook("breezy.merge", "Merger.hooks", "merge_file_content",
70
 
    changelog_merge_hook, 'GNU ChangeLog file merge')
 
73
                        changelog_merge_hook, 'GNU ChangeLog file merge')
 
74
 
71
75
 
72
76
def load_tests(loader, basic_tests, pattern):
73
77
    testmod_names = [
74
78
        'tests',
75
79
        ]
76
80
    basic_tests.addTest(loader.loadTestsFromModuleNames(
77
 
            ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
 
81
        ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
78
82
    return basic_tests