view mercurial/mergeutil.py @ 43111:e5d535621ee1

infinitepush: mark extension as likely to be deleted

.. bc::

    The infinitepush extension is believed to be unused, and will be
    deleted at the end of 2020 unless users contact
    [e-mail].

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

# 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 " b"(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'),
        )