view mercurial/mergeutil.py @ 46588:47557ea79fc7

copies-rust: move CPU-heavy Rust processing into a child thread

… that runs in parallel with the parent thread fetching data.
This can be disabled through a new config. CLI example:

    hg --config=devel.copy-tracing.multi-thread=no

For now both threads use the GIL, later commits will reduce this.

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

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