view mercurial/mergeutil.py @ 35871:49ea1ba15ffd

wireprotoserver: make response handling attributes private

The send* methods are specific to sshserver and aren't part of the
common protocol interface. So rename them accordingly.

The handlers dict is also specific to sshserver and is related to
these methods. So give it the same treatment.

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

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