[Updated] D11318: dirstatemap: temporarily use `from_v1_data` in `addfile`

[marmoute (Pierre-Yves David)]

Closed by commit rHG0b35bc0b8636: dirstatemap: temporarily use `from_v1_data` in `addfile` (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11318?vs=30044&id=30086

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11318/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11318

AFFECTED FILES
  mercurial/dirstatemap.py

CHANGE DETAILS

diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py
--- a/mercurial/dirstatemap.py
+++ b/mercurial/dirstatemap.py
@@ -220,7 +220,7 @@
         assert mtime is not None
         old_entry = self.get(f)
         self._dirs_incr(f, old_entry)
-        e = self._map[f] = DirstateItem(state, mode, size, mtime)
+        e = self._map[f] = DirstateItem.from_v1_data(state, mode, size, mtime)
         if e.dm_nonnormal:
             self.nonnormalset.add(f)
         if e.dm_otherparent:
@@ -273,7 +273,7 @@
             # XXX might be merged and removed ?
             old_entry = self._map.get(filename)
             self._dirs_decr(filename, old_entry=old_entry, remove_variant=True)
-            self._map[filename] = DirstateItem(b'r', 0, 0, 0)
+            self._map[filename] = DirstateItem.from_v1_data(b'r', 0, 0, 0)
             self.nonnormalset.add(filename)
         elif clean_p2 and wc_tracked:
             if p1_tracked or self.get(filename) is not None:



To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210827/943a0097/attachment-0002.html>