--- a/hgext/fsmonitor/__init__.py Wed Oct 18 22:10:08 2017 -0700
+++ b/hgext/fsmonitor/__init__.py Wed Oct 18 15:42:44 2017 -0700
@@ -274,7 +274,7 @@
matchfn = match.matchfn
matchalways = match.always()
dmap = self._map._map
- nonnormalset = getattr(self, '_nonnormalset', None)
+ nonnormalset = self._map.nonnormalset
copymap = self._map.copymap
getkind = stat.S_IFMT
@@ -404,7 +404,7 @@
visit = set((f for f in notefiles if (f not in results and matchfn(f)
and (f in dmap or not ignore(f)))))
- if nonnormalset is not None and not fresh_instance:
+ if not fresh_instance:
if matchalways:
visit.update(f for f in nonnormalset if f not in results)
visit.update(f for f in copymap if f not in results)
@@ -415,15 +415,11 @@
if f not in results and matchfn(f))
else:
if matchalways:
- visit.update(f for f, st in dmap.iteritems()
- if (f not in results and
- (st[2] < 0 or st[0] != 'n' or fresh_instance)))
+ visit.update(f for f, st in dmap.iteritems() if f not in results)
visit.update(f for f in copymap if f not in results)
else:
visit.update(f for f, st in dmap.iteritems()
- if (f not in results and
- (st[2] < 0 or st[0] != 'n' or fresh_instance)
- and matchfn(f)))
+ if f not in results and matchfn(f))
visit.update(f for f in copymap
if f not in results and matchfn(f))