Read about our upcoming Code of Conduct on this issue

Commit a2d74b57 authored by Raphaël Gomès's avatar Raphaël Gomès
Browse files

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
parent 6fb282ce9113
Pipeline #28810 failed with stages
in 56 minutes and 49 seconds
......@@ -333,7 +333,11 @@ def overridewalk(orig, self, match, subrepos, unknown, ignored, full=True):
# 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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment