view mercurial/mergeutil.py @ 47770:460e479be66e

typing: add several assertions to dirstatemap to appease pytype

I think it's been mentioned in IRC that these can't be None in this case.  This
fixes:

    File "/mnt/c/Users/Matt/hg/mercurial/dirstatemap.py", line 213, in addfile: unsupported operand type(s) for &: 'None' and 'int' [unsupported-operands]
      No attribute '__and__' on None or '__rand__' on int
    Called from (traceback):
      line 290, in reset_state
    File "/mnt/c/Users/Matt/hg/mercurial/dirstatemap.py", line 214, in addfile: unsupported operand type(s) for &: 'None' and 'int' [unsupported-operands]
      No attribute '__and__' on None or '__rand__' on int
    Called from (traceback):
      line 290, in reset_state

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

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Olivia 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 ms.unresolvedcount():
        raise error.StateError(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )