| Submitter | phabricator |
|---|---|
| Date | Oct. 18, 2017, 10:42 p.m. |
| Message ID | <differential-rev-PHID-DREV-e2e5nnoread57rwqipkk-req@phab.mercurial-scm.org> |
| Download | mbox | patch |
| Permalink | /patch/25222/ |
| State | Superseded |
| Headers | show |
Comments
wez added inline comments. INLINE COMMENTS > __init__.py:416 > if f not in results and matchfn(f)) > - else: > - if matchalways: ah, I think we do need to keep this code path for the fresh instance case, otherwise we won't know how to resync with the world REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1184 To: quark, #hg-reviewers Cc: wez, mercurial-devel
quark added inline comments. INLINE COMMENTS > wez wrote in __init__.py:416 > ah, I think we do need to keep this code path for the fresh instance case, otherwise we won't know how to resync with the world Ah, sorry. Will update. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1184 To: quark, #hg-reviewers Cc: wez, mercurial-devel
wez added inline comments. INLINE COMMENTS > __init__.py:420 > - if (f not in results and > - (st[2] < 0 or st[0] != 'n' or fresh_instance))) > - visit.update(f for f in copymap if f not in results) ... so we should probably restore this logic, but can perhaps optimize some of these elements in here because we now know that `fresh_instance` will always be true in this path REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1184 To: quark, #hg-reviewers Cc: wez, mercurial-devel
wez accepted this revision. wez added a comment. lgtm REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1184 To: quark, #hg-reviewers, wez Cc: wez, mercurial-devel
Patch
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,28 +404,15 @@ 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) else: visit.update(f for f in nonnormalset if f not in results and matchfn(f)) visit.update(f for f in copymap 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 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))) - visit.update(f for f in copymap - if f not in results and matchfn(f)) audit = pathutil.pathauditor(self._root, cached=True).check auditpass = [f for f in visit if audit(f)]