This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8419

nodemap: move the main switch to the `format` section
ClosedPublic

Authored by marmoute on Apr 14 2020, 11:49 AM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHGd688a8d537b9: nodemap: move the main switch to the `format` section

Summary

The config to enable persistent nodemap is now format.use-persistent-nodemap.
However the option remain marked as experimental because it only improve
performance for people using the rust extensions.

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

marmoute created this revision.Apr 14 2020, 11:49 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptApr 14 2020, 11:49 AM

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

marmoute added a child revision: D8420: nodemap: move and update the commend about persistence being experimental.Apr 14 2020, 11:49 AM

marmoute updated this revision to Diff 21230.Apr 27 2020, 1:12 PM

Herald added a subscriber: mercurial-patches. · View Herald TranscriptApr 27 2020, 1:12 PM

Alphare accepted this revision.May 7 2020, 9:13 AM

marmoute added a commit: rHGd688a8d537b9: nodemap: move the main switch to the `format` section.May 7 2020, 11:35 AM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHGd688a8d537b9: nodemap: move the main switch to the `format` section (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/configitems.py (6 lines)
M			mercurial/localrepo.py (2 lines)
M			tests/test-persistent-nodemap.t (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	21067		Apr 14 2020, 11:49 AM	★	★
Diff 2	21230		Apr 27 2020, 1:12 PM	★	★
Diff 3	21295	rHGd688a8d537b967f184e955e56b69d4e105203b04	Apr 13 2020, 9:18 PM	★	★

Status	Author	Revision
Closed	marmoute	D8413 nodemap: access the mmap opener option using bytes
Closed	marmoute	D8412 nodemap: rename a variable to prevent shawoding "_"
Closed	marmoute	D8431 upgrade: support upgrade and downgrade from persistent nodemap
Closed	marmoute	D8430 nodemap: teach `hg debugformat` about the persistent nodemap option
Closed	marmoute	D8429 upgrade: support the --quiet flag
Closed	marmoute	D8428 upgrade: clearly list optimisation
Closed	marmoute	D8422 nodemap: move the mode option to storage.revlog.nodemap.mode
Closed	marmoute	D8421 nodemap: move the option for mmap usage to storage.revlog.nodemap.mmap
Closed	marmoute	D8420 nodemap: move and update the commend about persistence being experimental
Closed	marmoute	D8419 nodemap: move the main switch to the `format` section
Closed	marmoute	D8418 nodemap: drop the 'exp-' prefix for internal opener option
Closed	marmoute	D8417 nodemap: gate the feature behind a new requirement
Closed	marmoute	D8416 nodemap: move on disk file to version 1
Closed	marmoute	D8415 nodemap: add a new mode value, "strict"
Closed	marmoute	D8414 nodemap: add a new mode option, with an optional "warn" value
Closed	marmoute	D8411 nodemap: also warm manifest nodemap with other caches
Closed	marmoute	D8410 nodemap: also use persistent nodemap for manifest
Closed	marmoute	D8409 nodemap: create files in the repository used in the test
Closed	marmoute	D8427 upgrade: properly filter action depending on planned work
Closed	marmoute	D8408 nodemap: skip persistent nodemap warming for revlog not using it
Closed	marmoute	D8453 wait-on-file: adjust the timer counter

Diff 21295

mercurial/configitems.py

	)			)
	coreconfigitem(			coreconfigitem(
	b'experimental', b'revisions.disambiguatewithin', default=None,			b'experimental', b'revisions.disambiguatewithin', default=None,
	)			)
	coreconfigitem(			coreconfigitem(
	b'experimental', b'rust.index', default=False,			b'experimental', b'rust.index', default=False,
	)			)
	coreconfigitem(			coreconfigitem(
	b'experimental', b'exp-persistent-nodemap', default=False,
	)
	coreconfigitem(
	b'experimental', b'exp-persistent-nodemap.mmap', default=True,			b'experimental', b'exp-persistent-nodemap.mmap', default=True,
	)			)
	coreconfigitem(			coreconfigitem(
	b'experimental', b'exp-persistent-nodemap.mode', default=b'compat',			b'experimental', b'exp-persistent-nodemap.mode', default=b'compat',
	)			)
	coreconfigitem(			coreconfigitem(
	b'experimental', b'server.filesdata.recommended-batch-size', default=50000,			b'experimental', b'server.filesdata.recommended-batch-size', default=50000,
	)			)
	)			)
	coreconfigitem(			coreconfigitem(
	b'format', b'usegeneraldelta', default=True,			b'format', b'usegeneraldelta', default=True,
	)			)
	coreconfigitem(			coreconfigitem(
	b'format', b'usestore', default=True,			b'format', b'usestore', default=True,
	)			)
	coreconfigitem(			coreconfigitem(
				b'format', b'use-persistent-nodemap', default=False, experimental=True
				)
				coreconfigitem(
	b'format',			b'format',
	b'exp-use-copies-side-data-changeset',			b'exp-use-copies-side-data-changeset',
	default=False,			default=False,
	experimental=True,			experimental=True,
	)			)
	coreconfigitem(			coreconfigitem(
	b'format', b'exp-use-side-data', default=False, experimental=True,			b'format', b'exp-use-side-data', default=False, experimental=True,
	)			)

mercurial/localrepo.py

	requirements.add(repository.NARROW_REQUIREMENT)			requirements.add(repository.NARROW_REQUIREMENT)

	if createopts.get(b'lfs'):			if createopts.get(b'lfs'):
	requirements.add(b'lfs')			requirements.add(b'lfs')

	if ui.configbool(b'format', b'bookmarks-in-store'):			if ui.configbool(b'format', b'bookmarks-in-store'):
	requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT)			requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT)

	if ui.configbool(b'experimental', b'exp-persistent-nodemap'):			if ui.configbool(b'format', b'use-persistent-nodemap'):
	requirements.add(NODEMAP_REQUIREMENT)			requirements.add(NODEMAP_REQUIREMENT)

	return requirements			return requirements


	def filterknowncreateopts(ui, createopts):			def filterknowncreateopts(ui, createopts):
	"""Filters a dict of repo creation options against options that are known.			"""Filters a dict of repo creation options against options that are known.

tests/test-persistent-nodemap.t

	===================================			===================================
	Test the persistent on-disk nodemap			Test the persistent on-disk nodemap
	===================================			===================================

	$ cat << EOF >> $HGRCPATH			$ cat << EOF >> $HGRCPATH
	> [experimental]			> [format]
	> exp-persistent-nodemap=yes			> use-persistent-nodemap=yes
	> [devel]			> [devel]
	> persistent-nodemap=yes			> persistent-nodemap=yes
	> EOF			> EOF
	$ hg init test-repo			$ hg init test-repo
	$ cd test-repo			$ cd test-repo
	$ hg debugbuilddag .+5000 --new-file --config "experimental.exp-persistent-nodemap.mode=warn"			$ hg debugbuilddag .+5000 --new-file --config "experimental.exp-persistent-nodemap.mode=warn"
	persistent nodemap in strict mode without efficient method (no-rust no-pure !)			persistent nodemap in strict mode without efficient method (no-rust no-pure !)
	persistent nodemap in strict mode without efficient method (no-rust no-pure !)			persistent nodemap in strict mode without efficient method (no-rust no-pure !)