This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1347

dirstate: make map implementation overridable
ClosedPublic

Authored by mbthomas on Nov 8 2017, 12:31 PM.

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHG8db4ca768416: dirstate: make map implementation overridable
rHG51f155abc689: dirstate: make map implementation overridable

Summary

Other implementations of dirstate will want to replace the class used for the
dirstate map. Allow this to happen by making the class an attribute of the
dirstate.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

mbthomas created this revision.Nov 8 2017, 12:31 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptNov 8 2017, 12:31 PM

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

mbthomas updated this revision to Diff 3443.Nov 13 2017, 7:18 AM

I'd prefer this as a class attr, but would like to hear from @mbolin as to whether or not that solves the problem(s) that inspired D1354.

mercurial/dirstate.py
83	Could you set this at class-level, rather than in init? I think then @mbolin would be able to make his subclass replace the class attribute and that'd be sufficient?

durin42 mentioned this in D1354: dirstate: change all writes to dirstatemap._map to go through one method.Nov 13 2017, 7:01 PM

I think I need it to be an instance attribute, as for treedirstate it depends on the repo as to whether I want a normal dirstatemap or a treedirstatemap. See D1401 for where I override this in treedirstate.

mbthomas updated this revision to Diff 3521.Nov 15 2017, 4:08 AM

durin42 accepted this revision.Nov 17 2017, 5:22 PM

This revision is now accepted and ready to land.Nov 17 2017, 5:22 PM

Closed by commit rHG51f155abc689: dirstate: make map implementation overridable (authored by mbthomas). · Explain WhyNov 17 2017, 5:29 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/dirstate.py (3 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	3347		Nov 8 2017, 12:31 PM	★	★
Diff 2	3443		Nov 13 2017, 7:18 AM	★	★
Diff 3	3521		Nov 15 2017, 4:08 AM	★	★
Diff 4	3620	rHG51f155abc6894f1155ce0e306990b8065ccbb365	Nov 15 2017, 4:07 AM	★	★

Status	Author	Revision
Closed	mbthomas	D1347 dirstate: make map implementation overridable
Closed	mbthomas	D1346 fsmonitor: only access inner dirstate map if it is available
Closed	mbthomas	D1345 dirstate: add explicit methods for querying directories (API)
Closed	mbthomas	D1344 dirstate: remove _droppath method
Closed	mbthomas	D1343 dirstate: move dropping of folded filenames into the dirstate map
Closed	mbthomas	D1342 dirstate: move management of the dirstate dirs into the dirstatemap
Closed	mbthomas	D1341 dirstate: move management of nonnormal sets into dirstate map
Closed	mbthomas	D1340 dirstate: add explicit methods for modifying dirstate
Closed	mbthomas	D1380 dirstate: document dirstatemap interface
Closed	mbthomas	D1339 dirstate: don't remove normallookup files from nonnormalset
Closed	mbthomas	D1338 dirstate: clear map cached properties when clearing the map
Closed	mbthomas	D1337 util: add util.clearcachedproperty

Diff 3521

mercurial/dirstate.py

	self._ui = ui			self._ui = ui
	self._filecache = {}			self._filecache = {}
	self._parentwriters = 0			self._parentwriters = 0
	self._filename = 'dirstate'			self._filename = 'dirstate'
	self._pendingfilename = '%s.pending' % self._filename			self._pendingfilename = '%s.pending' % self._filename
	self._plchangecallbacks = {}			self._plchangecallbacks = {}
	self._origpl = None			self._origpl = None
	self._updatedfiles = set()			self._updatedfiles = set()
				self._mapcls = dirstatemap
				durin42Unsubmitted Not Done Could you set this at class-level, rather than in init? I think then @mbolin would be able to make his subclass replace the class attribute and that'd be sufficient? durin42: Could you set this at class-level, rather than in __init__? I think then @mbolin would be able…

	@contextlib.contextmanager			@contextlib.contextmanager
	def parentchange(self):			def parentchange(self):
	'''Context manager for handling dirstate parents.			'''Context manager for handling dirstate parents.

	If an exception occurs in the scope of the context manager,			If an exception occurs in the scope of the context manager,
	the incoherent dirstate won't be written when wlock is			the incoherent dirstate won't be written when wlock is
	released.			released.
	'''Returns true if the dirstate is in the middle of a set of changes			'''Returns true if the dirstate is in the middle of a set of changes
	that modify the dirstate parent.			that modify the dirstate parent.
	'''			'''
	return self._parentwriters > 0			return self._parentwriters > 0

	@propertycache			@propertycache
	def _map(self):			def _map(self):
	"""Return the dirstate contents (see documentation for dirstatemap)."""			"""Return the dirstate contents (see documentation for dirstatemap)."""
	self._map = dirstatemap(self._ui, self._opener, self._root)			self._map = self._mapcls(self._ui, self._opener, self._root)
	return self._map			return self._map

	@property			@property
	def _sparsematcher(self):			def _sparsematcher(self):
	"""The matcher for the sparse checkout.			"""The matcher for the sparse checkout.

	The working directory may not include every file from a manifest. The			The working directory may not include every file from a manifest. The
	matcher obtained by this property will match a path if it is to be			matcher obtained by this property will match a path if it is to be