D1184: fsmonitor: use nonnormalset from dirstatemap
quark (Jun Wu)
phabricator at mercurial-scm.org
Wed Oct 18 18:59:44 EDT 2017
quark updated this revision to Diff 3013.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1184?vs=3012&id=3013
REVISION DETAIL
https://phab.mercurial-scm.org/D1184
AFFECTED FILES
hgext/fsmonitor/__init__.py
CHANGE DETAILS
diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py
--- a/hgext/fsmonitor/__init__.py
+++ b/hgext/fsmonitor/__init__.py
@@ -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)
@@ -416,13 +416,11 @@
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)))
+ if (f not in results and (st[2] < 0 or st[0] != 'n')))
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)
+ if (f not in results and (st[2] < 0 or st[0] != 'n')
and matchfn(f)))
visit.update(f for f in copymap
if f not in results and matchfn(f))
To: quark, #hg-reviewers
Cc: wez, mercurial-devel
More information about the Mercurial-devel
mailing list