mercurial/mergeutil.py
author rdamazio@google.com
Mon, 10 Dec 2018 17:49:51 -0800
changeset 53699 4e17679c336bc38709c32d9b8972f0e402e0057a
parent 34901 c1149533676ba3005bc859da47d7bb1e191d04b0
permissions -rw-r--r--
remotefilelog: accepting a None node to cmp In context.py, basefilectx.cmp explicitly calls it with None, so it has to be supported. Specifically, this breaks "hg absorb -i" currently. Differential Revision: https://phab.mercurial-scm.org/D5409

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# 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(_("unresolved merge conflicts "
                            "(see 'hg help resolve')"))
    if ms.mdstate() != 's' or list(ms.driverresolved()):
        raise error.Abort(_('driver-resolved merge conflicts'),
                          hint=_('run "hg resolve --all" to resolve'))