This is an archive of the discontinued Mercurial Phabricator instance.

Differential D945

fsmonitor: update to match new dirstate refactor
ClosedPublic

Authored by durham on Oct 4 2017, 8:57 PM.

Details

Reviewers
quark
yuja
ryanmce
Group Reviewers
hg-reviewers
Commits
rHG7259f0ddfc0f: fsmonitor: update to match new dirstate refactor
Summary

The dirstate was refactored so dirstate._map is now at dirstate._map._map. Same
for _copymap, is not _map.copymap. It seems none of the mercurial tests cover
this stuff, but it was caught by our Facebook extension tests.

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

durham created this revision.Oct 4 2017, 8:57 PM
quark accepted this revision.Oct 5 2017, 9:37 PM
yuja requested changes to this revision.Oct 7 2017, 8:51 AM
yuja added a subscriber: yuja.

This patch can't be applied.

This revision now requires changes to proceed.Oct 7 2017, 8:51 AM
durham updated this revision to Diff 2536.Oct 9 2017, 3:48 PM
quark accepted this revision.Oct 10 2017, 3:36 PM
ryanmce accepted this revision.Oct 11 2017, 10:02 AM
ryanmce added a subscriber: ryanmce.

queued

Closed by commit rHG7259f0ddfc0f: fsmonitor: update to match new dirstate refactor (authored by durham). · Explain WhyOct 11 2017, 10:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 2583

hgext/fsmonitor/__init__.py

clock = 'c:0:0' clock = 'c:0:0'
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 dmap = self._map._map
nonnormalset = getattr(self, '_nonnormalset', None) nonnormalset = getattr(self, '_nonnormalset', None)
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