mercurial/mergeutil.py
author Augie Fackler <augie@google.com>
Mon, 18 May 2020 17:29:53 -0400
changeset 46361 dfca84970da8
parent 45916 fa87536d3d70
child 46819 d4ba4d51f85f
permissions -rw-r--r--
cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())) This avoids some pointless copying. Differential Revision: https://phab.mercurial-scm.org/D8566

# 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 ms.unresolvedcount():
        raise error.StateError(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )