comparison mercurial/dirstatemap.py @ 47790:a11520e66ade stable

typing: add several assertions to dirstatemap to appease pytype

(grafted from default to stable)

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

47789:064cd182555f

            size = NONNORMAL
            mtime = AMBIGUOUS_TIME
        else:
            assert size != FROM_P2
            assert size != NONNORMAL
            state = b'n'
            size = size & rangemask
            mtime = mtime & rangemask
        assert state is not None
        assert size is not None

47790:a11520e66ade

            size = NONNORMAL
            mtime = AMBIGUOUS_TIME
        else:
            assert size != FROM_P2
            assert size != NONNORMAL
            assert size is not None
            assert mtime is not None

            state = b'n'
            size = size & rangemask
            mtime = mtime & rangemask
        assert state is not None
        assert size is not None