view mercurial/mergeutil.py @ 43685:da925257a39e

typing: add pseudo localstr.__init__() to help pytype

Apparently, pytype failed to parse localstr.__new__()? This fixes the
following errors:

  line 126, in __hash__: No attribute '_utf8' on localstr [attribute-error]
  line 188, in tolocal: Function localstr.__init__ was called with the wrong
  arguments [wrong-arg-types]
  Expected: (self, string: str, ...)
  Actually passed: (self, string: bytes, ...)

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