view mercurial/mergeutil.py @ 36612:e89959970a08

wireproto: don't expose changegroupsubset capability if not available

We just marked the changegroupsubset command as only available to
version 1 of the wire transports. There is a capability of the same
name of the command that indicates if the command is supported.

This commit teaches the capabilities code to conditionally emit that
capability depending on whether the command is available for the
current transport.

Most test output is reordering of capabilities. But the limited tests
for version 2 of the SSH protocol do show the capability disappearing.

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

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