Mercurial > public > mercurial-scm > hg

diff mercurial/dirstate.py @ 43425:ed50f2c31a4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust-cpython: allow mutation unless leaked reference is borrowed In other words, mutation is allowed while a Python iterator holding PyLeaked exists. The iterator will be invalidated instead. We still need a borrow_count to prevent mutation while leaked data is dereferenced in Rust world, but most leak_count business is superseded by the generation counter. decrease_leak_count(py, true) will be removed soon.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 12 Oct 2019 20:26:38 +0900
parents 6230c70a1863
children ab9b0a20b9e6
line wrap: on
line diff
--- a/mercurial/dirstate.py	Sat Oct 05 08:27:57 2019 -0400
+++ b/mercurial/dirstate.py	Sat Oct 12 20:26:38 2019 +0900
@@ -687,8 +687,7 @@
         delaywrite = self._ui.configint(b'debug', b'dirstate.delaywrite')
         if delaywrite > 0:
             # do we have any files to delay for?
-            items = pycompat.iteritems(self._map)
-            for f, e in items:
+            for f, e in pycompat.iteritems(self._map):
                 if e[0] == b'n' and e[3] == now:
                     import time  # to avoid useless import
 
@@ -700,12 +699,6 @@
                     time.sleep(end - clock)
                     now = end  # trust our estimate that the end is near now
                     break
-            # since the iterator is potentially not deleted,
-            # delete the iterator to release the reference for the Rust
-            # implementation.
-            # TODO make the Rust implementation behave like Python
-            # since this would not work with a non ref-counting GC.
-            del items
 
         self._map.write(st, now)
         self._lastnormaltime = 0