Commits

Benoit Boissinot committed e5aaa45

dirstate: fix in memory dirstate entries for 1-second race

Only the on-disk file was modified, we need to modify the in-memory dirstate
as well.

Comments (0)

Files changed (1)

mercurial/dirstate.py

         # use the modification time of the newly created temporary file as the
         # filesystem's notion of 'now'
         now = int(util.fstat(st).st_mtime)
-
-        cs = cStringIO.StringIO()
-        copymap = self._copymap
-        pack = struct.pack
-        write = cs.write
-        write("".join(self._pl))
-        for f, e in self._map.iteritems():
-            if f in copymap:
-                f = "%s\0%s" % (f, copymap[f])
-
+        for f in self._map.keys():
+            e = self._map[f]
             if e[0] == 'n' and e[3] == now:
                 # The file was last modified "simultaneously" with the current
                 # write to dirstate (i.e. within the same second for file-
                 # dirstate, forcing future 'status' calls to compare the
                 # contents of the file. This prevents mistakenly treating such
                 # files as clean.
-                e = (e[0], 0, -1, -1)   # mark entry as 'unset'
+                self._map[f] = (e[0], 0, -1, -1)   # mark entry as 'unset'
 
+        cs = cStringIO.StringIO()
+        copymap = self._copymap
+        pack = struct.pack
+        write = cs.write
+        write("".join(self._pl))
+        for f, e in self._map.iteritems():
+            if f in copymap:
+                f = "%s\0%s" % (f, copymap[f])
             e = pack(_format, e[0], e[1], e[2], e[3], len(f))
             write(e)
             write(f)