This is an archive of the discontinued Mercurial Phabricator instance.

infinitepush: put metadata fill in wlock
ClosedPublic

Authored by durham on Jul 17 2017, 6:17 AM.

Reviewers

stash

Group Reviewers

Restricted Project

Commits

rFBHGXdadd9cc0a957: infinitepush: put metadata fill in wlock

Summary

Upstream has added warnings when writing files outside the wlock, so let's put
this write in the wlock.

Test Plan

The tests now pass

Repository

rFBHGX Facebook Mercurial Extensions

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

simonfar added inline comments.

infinitepush/infinitepushcommands.py
95 ↗	(On Diff #191)	It's not immediately obvious why `with index:` on its own doesn't take `wlock`. After all, this is a recursive lock.

Switch to taking the lock internally

fileindexapi is used only in tests, so any solution should work

This revision is now accepted and ready to land.Jul 17 2017, 7:01 AM

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			infinitepush/fileindexapi.py (9 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	191		Jul 17 2017, 6:16 AM	★	★
Diff 2	192	Switch to taking the lock internally	Jul 17 2017, 6:49 AM	★	★
Diff 3	199	rFBHGXdadd9cc0a957b421072aa2901242d83e22bee6be	Jul 17 2017, 7:02 AM	★	★

	self._repo = repo			self._repo = repo
	root = repo.ui.config('infinitepush', 'indexpath')			root = repo.ui.config('infinitepush', 'indexpath')
	if not root:			if not root:
	root = os.path.join('scratchbranches', 'index')			root = os.path.join('scratchbranches', 'index')

	self._nodemap = os.path.join(root, 'nodemap')			self._nodemap = os.path.join(root, 'nodemap')
	self._bookmarkmap = os.path.join(root, 'bookmarkmap')			self._bookmarkmap = os.path.join(root, 'bookmarkmap')
	self._metadatamap = os.path.join(root, 'nodemetadatamap')			self._metadatamap = os.path.join(root, 'nodemetadatamap')
				self._lock = None

				def __enter__(self):
				self._lock = self._repo.wlock()
				return self

				def __exit__(self, exc_type, exc_val, exc_tb):
				if self._lock:
				self._lock.__exit__(exc_type, exc_val, exc_tb)

	def addbundle(self, bundleid, nodesctx):			def addbundle(self, bundleid, nodesctx):
	for node in nodesctx:			for node in nodesctx:
	nodepath = os.path.join(self._nodemap, node.hex())			nodepath = os.path.join(self._nodemap, node.hex())
	self._write(nodepath, bundleid)			self._write(nodepath, bundleid)

	def addbookmark(self, bookmark, node):			def addbookmark(self, bookmark, node):
	bookmarkpath = os.path.join(self._bookmarkmap, bookmark)			bookmarkpath = os.path.join(self._bookmarkmap, bookmark)