mercurial/mergeutil.py
author Matt Harbison <matt_harbison@yahoo.com>
Thu, 11 Mar 2021 19:21:58 -0500
branchstable
changeset 46694 d6601547f22b
parent 45916 fa87536d3d70
child 46361 dfca84970da8
permissions -rw-r--r--
subrepo: handle unexpected file types from git gracefully This was flagged by pytype because `tar.extractfile(...)` can return None if the entry is not a file or symlink. I don't think that git supports other types, but better safe than sorry. Differential Revision: https://phab.mercurial-scm.org/D10179

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