This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1819

treemanifest: write client tree manifests eagerly during nested transactions
AbandonedPublic

Authored by singhsrb on Jan 5 2018, 6:41 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

Restricted Project

Summary

If there are nested transactions, writing the client tree manifests
early ensures that next call to the transaction already has them available and
can potentially avoid infinite recursion.

Test Plan

Ran all the tests. https://phab.mercurial-scm.org/D1826 tests the new
functionality.

Diff Detail

Repository

rFBHGX Facebook Mercurial Extensions

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

singhsrb created this revision.Jan 5 2018, 6:41 PM

Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 5 2018, 6:41 PM

singhsrb added a parent revision: D1818: treemanifest: use flat manifest hash during client tree manifest writes.Jan 5 2018, 6:41 PM

singhsrb edited parent revisions, added: D1817: treemanifest: separate out logic to write client tree manifest; removed: D1818: treemanifest: use flat manifest hash during client tree manifest writes.Jan 5 2018, 8:22 PM

singhsrb edited parent revisions, added: D1818: treemanifest: use flat manifest hash during client tree manifest writes; removed: D1817: treemanifest: separate out logic to write client tree manifest.

singhsrb added a child revision: D1826: treemanifest: demand convert flat manifest to tree manifest in treeonly mode.Jan 5 2018, 11:51 PM

singhsrb edited the test plan for this revision. (Show Details)Jan 8 2018, 9:50 AM

Will be rebasing and floating for review again.

Revision Contents
Changeset List

			Path	Packages
M			treemanifest/__init__.py (7 lines)

Status	Author	Revision
Abandoned	singhsrb	D1826 treemanifest: demand convert flat manifest to tree manifest in treeonly mode
Abandoned	singhsrb	D1825 treemanifest: add client support for flat manifest to tree manifest
Abandoned	singhsrb	D1824 treemanifest: refactor write manifest wrapper
Abandoned	singhsrb	D1823 backfill: refactor to segregate logic for converting manifests
Abandoned	singhsrb	D1822 test-treemanifest-treeonly: update test to have more flat manifests
Abandoned	singhsrb	D1709 remotetreedatastore: make MissingNodesError subclass of KeyError
Abandoned	singhsrb	D1708 treemanifest: store ui once instead of using repo.ui every time
Abandoned	singhsrb	D1819 treemanifest: write client tree manifests eagerly during nested transactions
Abandoned	singhsrb	D1818 treemanifest: use flat manifest hash during client tree manifest writes
Abandoned	singhsrb	D1817 treemanifest: separate out logic to write client tree manifest

Diff 4719

treemanifest/init.py

	tr.treedatapack = mutabledatapack(ui, packpath)			tr.treedatapack = mutabledatapack(ui, packpath)
	tr.treehistpack = mutablehistorypack(ui, packpath)			tr.treehistpack = mutablehistorypack(ui, packpath)

	# re-register to write pending changes so that a series			# re-register to write pending changes so that a series
	# of writes are correctly flushed to the store. This			# of writes are correctly flushed to the store. This
	# happens during amend.			# happens during amend.
	tr.addpending('treepack', writepending)			tr.addpending('treepack', writepending)

				# returning False indicates there are no pending changes.
				return False

	tr.addfinalize('treepack', finalize)			tr.addfinalize('treepack', finalize)
	tr.addabort('treepack', abort)			tr.addabort('treepack', abort)
	tr.addpending('treepack', writepending)			tr.addpending('treepack', writepending)
				else:
				# Write the pending changes so any recursive calls to this method can
				# potentially leverage on it.
				tr.writepending()

	# If the manifest was already committed as a flat manifest, use			# If the manifest was already committed as a flat manifest, use
	# its node.			# its node.
	if node is not None:			if node is not None:
	dpack = InterceptedMutableDataPack(tr.treedatapack, node, p1node)			dpack = InterceptedMutableDataPack(tr.treedatapack, node, p1node)
	hpack = InterceptedMutableHistoryPack(tr.treehistpack, node, p1node)			hpack = InterceptedMutableHistoryPack(tr.treehistpack, node, p1node)
	else:			else:
	dpack = tr.treedatapack			dpack = tr.treedatapack

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	4719			Jan 5 2018, 6:41 PM	★	★