This is an archive of the discontinued Mercurial Phabricator instance.

fsmonitor: update to match new dirstate refactor
ClosedPublic

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

Download Raw Diff

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

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

durham created this revision.Oct 4 2017, 8:57 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 4 2017, 8:57 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

quark accepted this revision.Oct 5 2017, 9:37 PM

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

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

			Path	Packages
M			hgext/fsmonitor/__init__.py (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2446		Oct 4 2017, 8:57 PM	★	★
Diff 2	2536		Oct 9 2017, 3:48 PM	★	★
Diff 3	2583	rHG7259f0ddfc0f18138420e7c9c7e4145a25016d7b	Oct 9 2017, 3:47 PM	★	★

Diff 2446

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._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
	fresh_instance = False			fresh_instance = False