( )⚙ D11707 fsmonitor: fix traceback after removal of nonnormalset (issue6600)

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11707

fsmonitor: fix traceback after removal of nonnormalset (issue6600)
ClosedPublic

Authored by Alphare on Oct 20 2021, 4:26 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG1421c75b20de: fsmonitor: fix traceback after removal of nonnormalset (issue6600)
Summary

This basically does the same thing it used to do, but in the only place it's
needed.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Oct 20 2021, 4:26 AM
Alphare added a comment.Oct 20 2021, 5:20 AM

This only affects default which is why it's not for stable (just so it's clear it's not a mistake).

marmoute accepted this revision.Oct 20 2021, 8:41 AM
Alphare added a commit: rHG1421c75b20de: fsmonitor: fix traceback after removal of nonnormalset (issue6600).Nov 4 2021, 4:46 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1421c75b20de: fsmonitor: fix traceback after removal of nonnormalset (issue6600) (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 31029

hgext/fsmonitor/__init__.py

matchfn = match.matchfn matchfn = match.matchfn
matchalways = match.always() matchalways = match.always()
dmap = self._map dmap = self._map
if util.safehasattr(dmap, b'_map'): if util.safehasattr(dmap, b'_map'):
# for better performance, directly access the inner dirstate map if the # for better performance, directly access the inner dirstate map if the
# standard dirstate implementation is in use. # standard dirstate implementation is in use.
dmap = dmap._map dmap = dmap._map
nonnormalset = self._map.nonnormalset nonnormalset = {
f
for f, e in self._map.items()
if e.v1_state() != "n" or e.v1_mtime() == -1
}
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