dirstate: infer the 'n' state from `possibly_dirty`

This flag is only used with 'n' so lets set the state based on that parameter in
this case.

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

mercurial/dirstate.py

@@ -530,7 +530,7 b' class dirstate(object):'
                     return
                 elif entry.merged or entry.from_p2:
                     return
-        self._addpath(f, b'n', 0, possibly_dirty=True)
+        self._addpath(f, possibly_dirty=True)
         self._map.copymap.pop(f, None)
 
     def otherparent(self, f):

mercurial/dirstatemap.py

@@ -175,6 +175,7 b' class dirstatemap(object):'
             size = FROM_P2
             mtime = AMBIGUOUS_TIME
         elif possibly_dirty:
+            state = b'n'
             size = NONNORMAL
             mtime = AMBIGUOUS_TIME
         else:

rust/hg-core/src/dirstate/dirstate_map.rs

@@ -94,6 +94,7 b' impl DirstateMap {'
             entry.size = SIZE_FROM_OTHER_PARENT;
             entry.mtime = MTIME_UNSET;
         } else if possibly_dirty {
+            entry.state = EntryState::Normal;
             entry.size = SIZE_NON_NORMAL;
             entry.mtime = MTIME_UNSET;
         } else {

rust/hg-core/src/dirstate_tree/dirstate_map.rs

@@ -745,6 +745,7 b" impl<'on_disk> super::dispatch::Dirstate"
             entry.size = SIZE_FROM_OTHER_PARENT;
             entry.mtime = MTIME_UNSET;
         } else if possibly_dirty {
+            entry.state = EntryState::Normal;
             entry.size = SIZE_NON_NORMAL;
             entry.mtime = MTIME_UNSET;
         } else {