view mercurial/mergeutil.py @ 46725:df247f58ecee

rhg: Fall back to Python for unsupported revset syntax

rhg only supports a small subset of the syntax.
On parse error, this gives Python a chance instead of aborting immediately.

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

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