view mercurial/mergeutil.py @ 44382:f0027a3dd7cb

revlog-compression: update the config to be a list

format.revlog-compression is now a list of engine, the first supported one is to
be used. Doing this have several benefits:

1) this is fully backward compatible, config using a single entry will be read
as a single item list, not changing any behavior.

2) This open the way to use zstd by default without impacting platform were it
is not available. This will be done in a later changesets.

Using zstd provide a significant performance boost explained in : bb271ec2fbfb.
However zstd is not available in some cases, A notable example is the `--pure`
version of Mercurial which doesn't come with zstd support.

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

# 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 list(ms.unresolved()):
        raise error.Abort(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )
    if ms.mdstate() != b's' or list(ms.driverresolved()):
        raise error.Abort(
            _(b'driver-resolved merge conflicts'),
            hint=_(b'run "hg resolve --all" to resolve'),
        )