This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1184

fsmonitor: use nonnormalset from dirstatemap
ClosedPublic

Authored by quark on Oct 18 2017, 6:42 PM.

Details

Reviewers
wez
durin42
Group Reviewers
hg-reviewers
Commits
rHG2e350d2a0eca: fsmonitor: use nonnormalset from dirstatemap
rHGaf61beb79658: fsmonitor: use nonnormalset from dirstatemap
Summary

dirstate._nonnormalset has been moved to dirstate._map.nonnormalset by
60927b19ed65 (dirstate: move nonnormal and otherparent sets to dirstatemap)
and is guaranteed to be existed.

Let's update fsmonitor code to use the new nonnormalset. Thix fixed a perf
regression that slows down hg status by 0.5 seconds in one of our
production repos.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Oct 18 2017, 6:42 PM
quark edited the summary of this revision. (Show Details)Oct 18 2017, 6:44 PM
wez added a subscriber: wez.Oct 18 2017, 6:53 PM
wez added inline comments.
hgext/fsmonitor/__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

quark added inline comments.Oct 18 2017, 6:55 PM
hgext/fsmonitor/__init__.py
416

Ah, sorry. Will update.

wez added inline comments.Oct 18 2017, 6:55 PM
hgext/fsmonitor/__init__.py
420

... 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

quark updated this revision to Diff 3012.Oct 18 2017, 6:56 PM
quark updated this revision to Diff 3013.Oct 18 2017, 6:59 PM
quark marked 3 inline comments as done.Oct 18 2017, 6:59 PM
quark updated this revision to Diff 3014.Oct 18 2017, 7:06 PM
wez accepted this revision.Oct 18 2017, 8:42 PM

lgtm

durin42 accepted this revision.Oct 19 2017, 10:57 AM
This revision is now accepted and ready to land.Oct 19 2017, 10:57 AM
Closed by commit rHGaf61beb79658: fsmonitor: use nonnormalset from dirstatemap (authored by quark). · Explain WhyOct 19 2017, 11:11 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fsmonitor/__init__.py (10 lines)

Diff 3013

hgext/fsmonitor/__init__.py

else: else:
# always ignore # always ignore
ignore = util.always ignore = util.always
dirignore = util.always dirignore = util.always
matchfn = match.matchfn matchfn = match.matchfn
matchalways = match.always() matchalways = match.always()
dmap = self._map._map dmap = self._map._map
nonnormalset = getattr(self, '_nonnormalset', None) nonnormalset = self._map.nonnormalset
copymap = self._map.copymap copymap = self._map.copymap
getkind = stat.S_IFMT getkind = stat.S_IFMT
dirkind = stat.S_IFDIR dirkind = stat.S_IFDIR
regkind = stat.S_IFREG regkind = stat.S_IFREG
lnkkind = stat.S_IFLNK lnkkind = stat.S_IFLNK
join = self._join join = self._join
normcase = util.normcase normcase = util.normcase
if normalize: if normalize:
# any notable files that have changed case will already be handled # any notable files that have changed case will already be handled
# above, so just check membership in the foldmap # above, so just check membership in the foldmap
notefiles = set((normalize(f, True, True) for f in notefiles notefiles = set((normalize(f, True, True) for f in notefiles
if normcase(f) not in foldmap)) if normcase(f) not in foldmap))
visit = set((f for f in notefiles if (f not in results and matchfn(f) visit = set((f for f in notefiles if (f not in results and matchfn(f)
and (f in dmap or not ignore(f))))) and (f in dmap or not ignore(f)))))
if nonnormalset is not None and not fresh_instance: if not fresh_instance:
if matchalways: if matchalways:
visit.update(f for f in nonnormalset if f not in results) visit.update(f for f in nonnormalset if f not in results)
visit.update(f for f in copymap if f not in results) visit.update(f for f in copymap if f not in results)
else: else:
visit.update(f for f in nonnormalset visit.update(f for f in nonnormalset
if f not in results and matchfn(f)) if f not in results and matchfn(f))
visit.update(f for f in copymap visit.update(f for f in copymap
if f not in results and matchfn(f)) if f not in results and matchfn(f))
else: else:
wezUnsubmitted
Done

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

wez: ah, I think we do need to keep this code path for the fresh instance case, otherwise we won't…
quarkAuthorUnsubmitted
Done

Ah, sorry. Will update.

quark: Ah, sorry. Will update.
if matchalways: if matchalways:
visit.update(f for f, st in dmap.iteritems() visit.update(f for f, st in dmap.iteritems()
if (f not in results and if (f not in results and (st[2] < 0 or st[0] != 'n')))
(st[2] < 0 or st[0] != 'n' or fresh_instance)))
wezUnsubmitted
Done

... 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

wez: ... so we should probably restore this logic, but can perhaps optimize some of these elements…
visit.update(f for f in copymap if f not in results) visit.update(f for f in copymap if f not in results)
else: else:
visit.update(f for f, st in dmap.iteritems() visit.update(f for f, st in dmap.iteritems()
if (f not in results and if (f not in results and (st[2] < 0 or st[0] != 'n')
(st[2] < 0 or st[0] != 'n' or fresh_instance)
and matchfn(f))) and matchfn(f)))
visit.update(f for f in copymap visit.update(f for f in copymap
if f not in results and matchfn(f)) if f not in results and matchfn(f))
audit = pathutil.pathauditor(self._root, cached=True).check audit = pathutil.pathauditor(self._root, cached=True).check
auditpass = [f for f in visit if audit(f)] auditpass = [f for f in visit if audit(f)]
auditpass.sort() auditpass.sort()
auditfail = visit.difference(auditpass) auditfail = visit.difference(auditpass)