1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
# Copyright (C) 2010 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
from __future__ import absolute_import
__doc__ = """Merge hook for bzr's NEWS file.
To enable this plugin, add a section to your branch.conf or location.conf
like::
[/home/user/code/bzr]
news_merge_files = NEWS
The news_merge_files config option takes a list of file paths, separated by
commas.
Limitations:
* if there's a conflict in more than just bullet points, this doesn't yet know
how to resolve that, so bzr will fallback to the default line-based merge.
"""
# Since we are a built-in plugin we share the bzrlib version
from bzrlib import version_info
from bzrlib.hooks import install_lazy_named_hook
def news_merge_hook(merger):
"""Merger.merge_file_content hook for bzr-format NEWS files."""
from bzrlib.plugins.news_merge.news_merge import NewsMerger
return NewsMerger(merger)
install_lazy_named_hook("bzrlib.merge", "Merger.hooks", "merge_file_content",
news_merge_hook, "NEWS file merge")
def load_tests(basic_tests, module, loader):
testmod_names = [
'tests',
]
basic_tests.addTest(loader.loadTestsFromModuleNames(
["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
return basic_tests
|