view mercurial/mergeutil.py @ 44551:9bae1d1a0f4c

phabricator: add a config knob to import in the secret phase

For my use anyway, it's better to have a config knob that's always set than to
try to remember a switch.  But we can add a tristate switch if desired.

Differential Revision: https://phab.mercurial-scm.org/D8137

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Matt Mackall <[e-mail]>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

from .i18n import _

from . import error


def checkunresolved(ms):
    if list(ms.unresolved()):
        raise error.Abort(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )
    if ms.mdstate() != b's' or list(ms.driverresolved()):
        raise error.Abort(
            _(b'driver-resolved merge conflicts'),
            hint=_(b'run "hg resolve --all" to resolve'),
        )