diff -r ec77f709495c -r 460e479be66e mercurial/dirstatemap.py
--- a/mercurial/dirstatemap.py	Mon Jul 19 23:14:38 2021 +0200
+++ b/mercurial/dirstatemap.py	Fri Jul 30 00:11:56 2021 -0400
@@ -209,6 +209,9 @@
         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