view mercurial/mergeutil.py @ 41044:fe606f2dcae9

extensions: import the exthelper class from evolve 980565468003 (API)

This should help make extensions that wrap a lot of stuff more comprehendible.
It was copied unmodified, except:

  - fix up the imports
  - rename final_xxxsetup() -> finalxxxsetup() to appease checkcode
  - avoid a [] default arg to wrapcommand()

.. api::

   Add `exthelper` class to simplify extension writing by allowing functions,
   commands, and configitems to be registered via annotations.  The previous
   APIs are still available for use.

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