This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10716

dirstate-v2: Add a new experimental `exp-dirstate-v2` repository requirement
ClosedPublic

Authored by SimonSapin on May 17 2021, 6:05 AM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHGed0d54b20c5b: dirstate-v2: Add a new experimental `exp-dirstate-v2` repository requirement
rHG3ab64581fc84: dirstate-v2: Add a new experimental `exp-dirstate-v2` repository requirement

Summary

This requirement is added to .hg/requires when creating a new repository
if Rust extensions are enabled and the format.exp-dirstate-v2 config is set.
Nothing yet changes based on this requirement, but its mere presence affects
some tests (for example if they print .hg/requires). The next two changesets
update tests’ expected outputs accordingly.

There is no CI so far that enables this configuration.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

SimonSapin created this revision.May 17 2021, 6:05 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMay 17 2021, 6:05 AM

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

SimonSapin added a child revision: D10717: tests: More cleanly separate expected hexdump output.May 17 2021, 6:05 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.May 19 2021, 5:29 AM

This revision is now accepted and ready to land.May 19 2021, 5:29 AM

SimonSapin added a commit: rHG3ab64581fc84: dirstate-v2: Add a new experimental `exp-dirstate-v2` repository requirement.May 19 2021, 7:13 AM

Closed by commit rHG3ab64581fc84: dirstate-v2: Add a new experimental `exp-dirstate-v2` repository requirement (authored by SimonSapin). · Explain Why

This revision was automatically updated to reflect the committed changes.

✅ refresh by Heptapod after a successful CI run (🐙 💚)

SimonSapin added a commit: rHGed0d54b20c5b: dirstate-v2: Add a new experimental `exp-dirstate-v2` repository requirement.May 19 2021, 7:43 AM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/configitems.py (8 lines)
M			mercurial/dirstate.py (2 lines)
M			mercurial/localrepo.py (15 lines)
M			mercurial/requirements.py (2 lines)
M			mercurial/upgrade_utils/actions.py (1 line)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	27968		May 17 2021, 6:05 AM	★	★
Diff 2	27996		May 17 2021, 8:39 AM	★	★
Diff 3	28090	rHG3ab64581fc84c09db2649b4b584ad80ad5026f0d	May 14 2021, 8:34 AM	★	★
Diff 4	28097		May 19 2021, 7:41 AM	★	★

Commit	Parents	Author	Summary	Date
55b9fa85965f	159d2de3286c	Simon Sapin		May 14 2021, 8:34 AM

Status	Author	Revision
Closed	SimonSapin	D10722 dirstate-v2: Change the on-disk format to be tree-shaped
Closed	SimonSapin	D10721 dirstate-tree: Extract into a method sorting children of a given node
Closed	SimonSapin	D10720 dirstate-v2: Add a variant of some tests, that uses the new format
Closed	SimonSapin	D10719 dirstate-v2: Change the on-disk format when the requirement is enabled
Closed	SimonSapin	D10718 dirstate-v2: Update the expected output of some tests for new requirement
Closed	SimonSapin	D10717 tests: More cleanly separate expected hexdump output
Closed	SimonSapin	D10716 dirstate-v2: Add a new experimental `exp-dirstate-v2` repository requirement

Diff 27968

mercurial/configitems.py

	)			)
	coreconfigitem(			coreconfigitem(
	b'format',			b'format',
	b'chunkcachesize',			b'chunkcachesize',
	default=None,			default=None,
	experimental=True,			experimental=True,
	)			)
	coreconfigitem(			coreconfigitem(
				# Enable this dirstate format when creating a new repository.
				# Which format to use for existing repos is controlled by .hg/requires
				b'format',
				b'exp-dirstate-v2',
				default=False,
				experimental=True,
				)
				coreconfigitem(
	b'format',			b'format',
	b'dotencode',			b'dotencode',
	default=True,			default=True,
	)			)
	coreconfigitem(			coreconfigitem(
	b'format',			b'format',
	b'generaldelta',			b'generaldelta',
	default=False,			default=False,

mercurial/dirstate.py

	from .interfaces import (			from .interfaces import (
	dirstate as intdirstate,			dirstate as intdirstate,
	util as interfaceutil,			util as interfaceutil,
	)			)

	parsers = policy.importmod('parsers')			parsers = policy.importmod('parsers')
	rustmod = policy.importrust('dirstate')			rustmod = policy.importrust('dirstate')

				SUPPORTS_DIRSTATE_V2 = rustmod is not None

	propertycache = util.propertycache			propertycache = util.propertycache
	filecache = scmutil.filecache			filecache = scmutil.filecache
	_rangemask = 0x7FFFFFFF			_rangemask = 0x7FFFFFFF

	dirstatetuple = parsers.dirstatetuple			dirstatetuple = parsers.dirstatetuple


	class repocache(filecache):			class repocache(filecache):

mercurial/localrepo.py

	ui.setconfig(b'extensions', name, b'', source=b'autoload')			ui.setconfig(b'extensions', name, b'', source=b'autoload')


	def gathersupportedrequirements(ui):			def gathersupportedrequirements(ui):
	"""Determine the complete set of recognized requirements."""			"""Determine the complete set of recognized requirements."""
	# Start with all requirements supported by this file.			# Start with all requirements supported by this file.
	supported = set(localrepository._basesupported)			supported = set(localrepository._basesupported)

				if dirstate.SUPPORTS_DIRSTATE_V2:
				supported.add(requirementsmod.DIRSTATE_V2_REQUIREMENT)

	# Execute ``featuresetupfuncs`` entries if they belong to an extension			# Execute ``featuresetupfuncs`` entries if they belong to an extension
	# relevant to this ui instance.			# relevant to this ui instance.
	modules = {m.__name__ for n, m in extensions.extensions(ui)}			modules = {m.__name__ for n, m in extensions.extensions(ui)}

	for fn in featuresetupfuncs:			for fn in featuresetupfuncs:
	if fn.__module__ in modules:			if fn.__module__ in modules:
	fn(ui, supported)			fn(ui, supported)

	elif compengine != b'zlib':			elif compengine != b'zlib':
	requirements.add(b'exp-compression-%s' % compengine)			requirements.add(b'exp-compression-%s' % compengine)

	if scmutil.gdinitconfig(ui):			if scmutil.gdinitconfig(ui):
	requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT)			requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT)
	if ui.configbool(b'format', b'sparse-revlog'):			if ui.configbool(b'format', b'sparse-revlog'):
	requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT)			requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT)

				# experimental config: format.exp-dirstate-v2
				if ui.configbool(b'format', b'exp-dirstate-v2'):
				if dirstate.SUPPORTS_DIRSTATE_V2:
				requirements.add(requirementsmod.DIRSTATE_V2_REQUIREMENT)
				else:
				raise error.Abort(
				_(
				b"dirstate v2 format requested by config "
				b"but not supported (requires Rust extensions)"
				)
				)

	# experimental config: format.exp-use-side-data			# experimental config: format.exp-use-side-data
	if ui.configbool(b'format', b'exp-use-side-data'):			if ui.configbool(b'format', b'exp-use-side-data'):
	requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT)			requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT)
	requirements.add(requirementsmod.REVLOGV2_REQUIREMENT)			requirements.add(requirementsmod.REVLOGV2_REQUIREMENT)
	requirements.add(requirementsmod.SIDEDATA_REQUIREMENT)			requirements.add(requirementsmod.SIDEDATA_REQUIREMENT)
	# experimental config: format.exp-use-copies-side-data-changeset			# experimental config: format.exp-use-copies-side-data-changeset
	if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'):			if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'):
	requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT)			requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT)

mercurial/requirements.py

	# requirements.py - objects and functions related to repository requirements			# requirements.py - objects and functions related to repository requirements
	#			#
	# Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>			# Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
	#			#
	# This software may be used and distributed according to the terms of the			# This software may be used and distributed according to the terms of the
	# GNU General Public License version 2 or any later version.			# GNU General Public License version 2 or any later version.

	from __future__ import absolute_import			from __future__ import absolute_import

	GENERALDELTA_REQUIREMENT = b'generaldelta'			GENERALDELTA_REQUIREMENT = b'generaldelta'
	DOTENCODE_REQUIREMENT = b'dotencode'			DOTENCODE_REQUIREMENT = b'dotencode'
	STORE_REQUIREMENT = b'store'			STORE_REQUIREMENT = b'store'
	FNCACHE_REQUIREMENT = b'fncache'			FNCACHE_REQUIREMENT = b'fncache'

				DIRSTATE_V2_REQUIREMENT = b'exp-dirstate-v2'

	# When narrowing is finalized and no longer subject to format changes,			# When narrowing is finalized and no longer subject to format changes,
	# we should move this to just "narrow" or similar.			# we should move this to just "narrow" or similar.
	NARROW_REQUIREMENT = b'narrowhg-experimental'			NARROW_REQUIREMENT = b'narrowhg-experimental'

	# Enables sparse working directory usage			# Enables sparse working directory usage
	SPARSE_REQUIREMENT = b'exp-sparse'			SPARSE_REQUIREMENT = b'exp-sparse'

	# Enables the internal phase which is used to hide changesets instead			# Enables the internal phase which is used to hide changesets instead

mercurial/upgrade_utils/actions.py

	requirements.REVLOGV1_REQUIREMENT, # allowed in case of downgrade			requirements.REVLOGV1_REQUIREMENT, # allowed in case of downgrade
	requirements.STORE_REQUIREMENT,			requirements.STORE_REQUIREMENT,
	requirements.SPARSEREVLOG_REQUIREMENT,			requirements.SPARSEREVLOG_REQUIREMENT,
	requirements.SIDEDATA_REQUIREMENT,			requirements.SIDEDATA_REQUIREMENT,
	requirements.COPIESSDC_REQUIREMENT,			requirements.COPIESSDC_REQUIREMENT,
	requirements.NODEMAP_REQUIREMENT,			requirements.NODEMAP_REQUIREMENT,
	requirements.SHARESAFE_REQUIREMENT,			requirements.SHARESAFE_REQUIREMENT,
	requirements.REVLOGV2_REQUIREMENT,			requirements.REVLOGV2_REQUIREMENT,
				requirements.DIRSTATE_V2_REQUIREMENT,
	}			}
	for name in compression.compengines:			for name in compression.compengines:
	engine = compression.compengines[name]			engine = compression.compengines[name]
	if engine.available() and engine.revlogheader():			if engine.available() and engine.revlogheader():
	supported.add(b'exp-compression-%s' % name)			supported.add(b'exp-compression-%s' % name)
	if engine.name() == b'zstd':			if engine.name() == b'zstd':
	supported.add(b'revlog-compression-zstd')			supported.add(b'revlog-compression-zstd')
	return supported			return supported