changeset 48306:1421c75b20de

fsmonitor: fix traceback after removal of nonnormalset (issue6600) This basically does the same thing it used to do, but in the only place it's needed. Differential Revision: https://phab.mercurial-scm.org/D11707
author Raphaël Gomès <rgomes@octobus.net>
date Wed, 20 Oct 2021 10:25:51 +0200
parents 6fb282ce9113
children 698b70b9e8ea
files hgext/fsmonitor/__init__.py
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/fsmonitor/__init__.py	Wed Oct 20 10:26:39 2021 +0200
+++ b/hgext/fsmonitor/__init__.py	Wed Oct 20 10:25:51 2021 +0200
@@ -333,7 +333,11 @@
         # for better performance, directly access the inner dirstate map if the
         # standard dirstate implementation is in use.
         dmap = dmap._map
-    nonnormalset = self._map.nonnormalset
+    nonnormalset = {
+        f
+        for f, e in self._map.items()
+        if e.v1_state() != "n" or e.v1_mtime() == -1
+    }
 
     copymap = self._map.copymap
     getkind = stat.S_IFMT