mercurial/mergeutil.py

test: explicitly disable sparse-revlog in test-http-bad-server.t

The `test-http-bad-server.t` test is very fragile with hard-coded number all
around. Adding any new capability have massive consequences on it that are
long and tiresome to handle. Since the test check more generic protocol level
behavior, it does not need to follow all new capabilities. Disabling the
capabilities is a much simpler way to avoid the issue.

We make sure `sparse-revlog` will not impact this test once turned on by
default.

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

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