~bzr-pqm/bzr/bzr.dev

# 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

__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

# Put most of the code in a separate module that we lazy-import to keep the

# overhead of this plugin as minimal as possible.

from bzrlib.lazy_import import lazy_import

lazy_import(globals(), """

from bzrlib.plugins.news_merge import news_merge as _mod_news_merge

""")

from bzrlib.merge import Merger

def news_merge_hook(merger):

    """Merger.merge_file_content hook for bzr-format NEWS files."""

    return _mod_news_merge.NewsMerger(merger)

def install_hook():

    Merger.hooks.install_named_hook(

        'merge_file_content', news_merge_hook, 'NEWS file merge')

install_hook()

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