Mercurial > public > mercurial-scm > hg

diff mercurial/dirstatemap.py @ 47530:a1745a292885

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: drop `state` to `_addpath` All its value are inferred within the dirstatemap now. Differential Revision: https://phab.mercurial-scm.org/D10972
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 04 Jul 2021 01:59:41 +0200
parents d3cf20328abd
children 6025353c9c55
line wrap: on
line diff
--- a/mercurial/dirstatemap.py	Sun Jul 04 01:58:03 2021 +0200
+++ b/mercurial/dirstatemap.py	Sun Jul 04 01:59:41 2021 +0200
@@ -147,7 +147,6 @@
     def addfile(
         self,
         f,
-        state=None,
         mode=0,
         size=None,
         mtime=None,
@@ -180,9 +179,9 @@
             size = NONNORMAL
             mtime = AMBIGUOUS_TIME
         else:
-            assert state != b'a'
             assert size != FROM_P2
             assert size != NONNORMAL
+            state = b'n'
             size = size & rangemask
             mtime = mtime & rangemask
         assert state is not None
@@ -475,7 +474,6 @@
         def addfile(
             self,
             f,
-            state=None,
             mode=0,
             size=None,
             mtime=None,
@@ -486,7 +484,6 @@
         ):
             return self._rustmap.addfile(
                 f,
-                state,
                 mode,
                 size,
                 mtime,