##// END OF EJS Templates
fsmonitor: use nonnormalset from dirstatemap...
Jun Wu -
r34898:2e350d2a default
parent child Browse files
Show More
@@ -274,7 +274,7 b' def overridewalk(orig, self, match, subr'
274 matchfn = match.matchfn
274 matchfn = match.matchfn
275 matchalways = match.always()
275 matchalways = match.always()
276 dmap = self._map._map
276 dmap = self._map._map
277 nonnormalset = getattr(self, '_nonnormalset', None)
277 nonnormalset = self._map.nonnormalset
278
278
279 copymap = self._map.copymap
279 copymap = self._map.copymap
280 getkind = stat.S_IFMT
280 getkind = stat.S_IFMT
@@ -404,7 +404,7 b' def overridewalk(orig, self, match, subr'
404 visit = set((f for f in notefiles if (f not in results and matchfn(f)
404 visit = set((f for f in notefiles if (f not in results and matchfn(f)
405 and (f in dmap or not ignore(f)))))
405 and (f in dmap or not ignore(f)))))
406
406
407 if nonnormalset is not None and not fresh_instance:
407 if not fresh_instance:
408 if matchalways:
408 if matchalways:
409 visit.update(f for f in nonnormalset if f not in results)
409 visit.update(f for f in nonnormalset if f not in results)
410 visit.update(f for f in copymap if f not in results)
410 visit.update(f for f in copymap if f not in results)
@@ -415,15 +415,11 b' def overridewalk(orig, self, match, subr'
415 if f not in results and matchfn(f))
415 if f not in results and matchfn(f))
416 else:
416 else:
417 if matchalways:
417 if matchalways:
418 visit.update(f for f, st in dmap.iteritems()
418 visit.update(f for f, st in dmap.iteritems() if f not in results)
419 if (f not in results and
420 (st[2] < 0 or st[0] != 'n' or fresh_instance)))
421 visit.update(f for f in copymap if f not in results)
419 visit.update(f for f in copymap if f not in results)
422 else:
420 else:
423 visit.update(f for f, st in dmap.iteritems()
421 visit.update(f for f, st in dmap.iteritems()
424 if (f not in results and
422 if f not in results and matchfn(f))
425 (st[2] < 0 or st[0] != 'n' or fresh_instance)
426 and matchfn(f)))
427 visit.update(f for f in copymap
423 visit.update(f for f in copymap
428 if f not in results and matchfn(f))
424 if f not in results and matchfn(f))
429
425
General Comments 0
You need to be logged in to leave comments. Login now