# HG changeset patch
# User Raphaël Gomès <rgomes@octobus.net>
# Date 2021-10-20 08:25:51
# Node ID 1421c75b20dedd5a0918402dfcef78d95d384fa1
# Parent  6fb282ce9113a7d11ec2325108e39044ba7f6213

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

diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py
--- a/hgext/fsmonitor/__init__.py
+++ b/hgext/fsmonitor/__init__.py
@@ -333,7 +333,11 @@ def overridewalk(orig, self, match, subr
         # 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