This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11875

fsmonitor: fix criteria for nonnormalset computation
ClosedPublic

Authored by Alphare on Dec 7 2021, 9:07 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG602120a96072: fsmonitor: fix criteria for nonnormalset computation
Summary

... oops.

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.Dec 7 2021, 9:07 AM
marmoute accepted this revision.Dec 7 2021, 9:55 AM
marmoute added a subscriber: marmoute.

Woops.

I suspect we will need a 6.0.1 with that.

Alphare added a commit: rHG602120a96072: fsmonitor: fix criteria for nonnormalset computation.Dec 7 2021, 11:11 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG602120a96072: fsmonitor: fix criteria for nonnormalset computation (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 31356

hgext/fsmonitor/__init__.py

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 = { nonnormalset = {
f f
for f, e in self._map.items() for f, e in self._map.items()
if e.v1_state() != "n" or e.v1_mtime() == -1 if e.v1_state() != b"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