This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	23914		Dec 1 2020, 5:12 PM	★	★
Diff 2	24037		Dec 4 2020, 6:48 PM	★	★
Diff 3	24062	rHG08802795ae90c2ad7f4f5c16c1bb6766e1e91403	Dec 1 2020, 2:35 PM	★	★

Commit	Parents	Author	Summary	Date
e70128bd33ab	a4085278f3a6	Pierre-Yves David		Dec 1 2020, 2:35 PM

Status	Author	Revision
Closed	marmoute	D9475 upgrade: move optimisation to something more declarative
Closed	marmoute	D9474 upgrade: capitalize the `deficiency` constant
Closed	marmoute	D9473 upgrade: capitalize the `deficiency` constant
Closed	Alphare	D9421 copies-rust: extract the processing of a ChangedFiles in its own function
Closed	Alphare	D9420 copies-rust: move the parent token to an enum
Closed	indygreg	D9281 cext: add .pyi files for C extensions
Closed	mharbison72	D9356 phabricator: allow local revisions to be specified with `phabupdate`
Closed	Alphare	D9419 copies: properly copies parent dictionary before updating it
Closed	marmoute	D9487 upgrade: start moving the "to be happening" data in a dedicated object
Closed	marmoute	D9486 upgrade: gather code about requirement checking together
Closed	marmoute	D9485 upgrade: extract the checking of target requirements change
Closed	marmoute	D9484 upgrade: drop an outdated comment
Closed	marmoute	D9483 upgrade: gather code about source checking together
Closed	marmoute	D9482 upgrade: move requirements checking in a dedicated function
Closed	marmoute	D9477 upgrade: split definition and management of the actions from the main code
Closed	marmoute	D9476 upgrade: split actual upgrade code away from the main module
Closed	marmoute	D9469 upgrade: display the list of processed revlog before proceeding
Closed	SimonSapin	D9519 rhg: add a test with persistent-nodemap
Closed	SimonSapin	D9490 rust: use NodePrefix::from_hex instead of hex::decode directly
Closed	SimonSapin	D9479 rhg: allow specifying a changeset ID prefix
Closed	martinvonz	D9514 tests: update test-releasenotes-formatting.t with new exit codes

Diff 23914

mercurial/upgrade_utils/actions.py


	# list of requirements that request a clone of all revlog if added/removed			# list of requirements that request a clone of all revlog if added/removed
	RECLONES_REQUIREMENTS = {			RECLONES_REQUIREMENTS = {
	b'generaldelta',			b'generaldelta',
	requirements.SPARSEREVLOG_REQUIREMENT,			requirements.SPARSEREVLOG_REQUIREMENT,
	}			}


	def supportremovedrequirements(repo):
	"""Obtain requirements that can be removed during an upgrade.

	If an upgrade were to create a repository that dropped a requirement,
	the dropped requirement must appear in the returned set for the upgrade
	to be allowed.
	"""
	supported = {
	requirements.SPARSEREVLOG_REQUIREMENT,
	requirements.SIDEDATA_REQUIREMENT,
	requirements.COPIESSDC_REQUIREMENT,
	requirements.NODEMAP_REQUIREMENT,
	}
	for name in compression.compengines:
	engine = compression.compengines[name]
	if engine.available() and engine.revlogheader():
	supported.add(b'exp-compression-%s' % name)
	if engine.name() == b'zstd':
	supported.add(b'revlog-compression-zstd')
	return supported


	def supporteddestrequirements(repo):
	"""Obtain requirements that upgrade supports in the destination.

	If the result of the upgrade would create requirements not in this set,
	the upgrade is disallowed.

	Extensions should monkeypatch this to add their custom requirements.
	"""
	supported = {
	b'dotencode',
	b'fncache',
	b'generaldelta',
	b'revlogv1',
	b'store',
	requirements.SPARSEREVLOG_REQUIREMENT,
	requirements.SIDEDATA_REQUIREMENT,
	requirements.COPIESSDC_REQUIREMENT,
	requirements.NODEMAP_REQUIREMENT,
	requirements.SHARESAFE_REQUIREMENT,
	}
	for name in compression.compengines:
	engine = compression.compengines[name]
	if engine.available() and engine.revlogheader():
	supported.add(b'exp-compression-%s' % name)
	if engine.name() == b'zstd':
	supported.add(b'revlog-compression-zstd')
	return supported


	def allowednewrequirements(repo):
	"""Obtain requirements that can be added to a repository during upgrade.

	This is used to disallow proposed requirements from being added when
	they weren't present before.

	We use a list of allowed requirement additions instead of a list of known
	bad additions because the whitelist approach is safer and will prevent
	future, unknown requirements from accidentally being added.
	"""
	supported = {
	b'dotencode',
	b'fncache',
	b'generaldelta',
	requirements.SPARSEREVLOG_REQUIREMENT,
	requirements.SIDEDATA_REQUIREMENT,
	requirements.COPIESSDC_REQUIREMENT,
	requirements.NODEMAP_REQUIREMENT,
	}
	for name in compression.compengines:
	engine = compression.compengines[name]
	if engine.available() and engine.revlogheader():
	supported.add(b'exp-compression-%s' % name)
	if engine.name() == b'zstd':
	supported.add(b'revlog-compression-zstd')
	return supported


	def preservedrequirements(repo):			def preservedrequirements(repo):
	return set()			return set()


	DEFICIENCY = b'deficiency'			DEFICIENCY = b'deficiency'
	OPTIMISATION = b'optimization'			OPTIMISATION = b'optimization'


	m = _(b'cannot upgrade repository; unsupported source requirement: %s')			m = _(b'cannot upgrade repository; unsupported source requirement: %s')
	blockingreqs = b', '.join(sorted(blockingreqs))			blockingreqs = b', '.join(sorted(blockingreqs))
	raise error.Abort(m % blockingreqs)			raise error.Abort(m % blockingreqs)


	### Verify the validity of the planned requirement changes ####################			### Verify the validity of the planned requirement changes ####################


				def supportremovedrequirements(repo):
				"""Obtain requirements that can be removed during an upgrade.

				If an upgrade were to create a repository that dropped a requirement,
				the dropped requirement must appear in the returned set for the upgrade
				to be allowed.
				"""
				supported = {
				requirements.SPARSEREVLOG_REQUIREMENT,
				requirements.SIDEDATA_REQUIREMENT,
				requirements.COPIESSDC_REQUIREMENT,
				requirements.NODEMAP_REQUIREMENT,
				}
				for name in compression.compengines:
				engine = compression.compengines[name]
				if engine.available() and engine.revlogheader():
				supported.add(b'exp-compression-%s' % name)
				if engine.name() == b'zstd':
				supported.add(b'revlog-compression-zstd')
				return supported


				def supporteddestrequirements(repo):
				"""Obtain requirements that upgrade supports in the destination.

				If the result of the upgrade would create requirements not in this set,
				the upgrade is disallowed.

				Extensions should monkeypatch this to add their custom requirements.
				"""
				supported = {
				b'dotencode',
				b'fncache',
				b'generaldelta',
				b'revlogv1',
				b'store',
				requirements.SPARSEREVLOG_REQUIREMENT,
				requirements.SIDEDATA_REQUIREMENT,
				requirements.COPIESSDC_REQUIREMENT,
				requirements.NODEMAP_REQUIREMENT,
				requirements.SHARESAFE_REQUIREMENT,
				}
				for name in compression.compengines:
				engine = compression.compengines[name]
				if engine.available() and engine.revlogheader():
				supported.add(b'exp-compression-%s' % name)
				if engine.name() == b'zstd':
				supported.add(b'revlog-compression-zstd')
				return supported


				def allowednewrequirements(repo):
				"""Obtain requirements that can be added to a repository during upgrade.

				This is used to disallow proposed requirements from being added when
				they weren't present before.

				We use a list of allowed requirement additions instead of a list of known
				bad additions because the whitelist approach is safer and will prevent
				future, unknown requirements from accidentally being added.
				"""
				supported = {
				b'dotencode',
				b'fncache',
				b'generaldelta',
				requirements.SPARSEREVLOG_REQUIREMENT,
				requirements.SIDEDATA_REQUIREMENT,
				requirements.COPIESSDC_REQUIREMENT,
				requirements.NODEMAP_REQUIREMENT,
				}
				for name in compression.compengines:
				engine = compression.compengines[name]
				if engine.available() and engine.revlogheader():
				supported.add(b'exp-compression-%s' % name)
				if engine.name() == b'zstd':
				supported.add(b'revlog-compression-zstd')
				return supported


	def check_requirements_changes(repo, new_reqs):			def check_requirements_changes(repo, new_reqs):
	old_reqs = repo.requirements			old_reqs = repo.requirements

	support_removal = supportremovedrequirements(repo)			support_removal = supportremovedrequirements(repo)
	no_remove_reqs = old_reqs - new_reqs - support_removal			no_remove_reqs = old_reqs - new_reqs - support_removal
	if no_remove_reqs:			if no_remove_reqs:
	msg = _(b'cannot upgrade repository; requirement would be removed: %s')			msg = _(b'cannot upgrade repository; requirement would be removed: %s')
	no_remove_reqs = b', '.join(sorted(no_remove_reqs))			no_remove_reqs = b', '.join(sorted(no_remove_reqs))

This is an archive of the discontinued Mercurial Phabricator instance.

upgrade: gather code about requirement checking togetherClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 23914

mercurial/upgrade_utils/actions.py

upgrade: gather code about requirement checking together
ClosedPublic

Revision Contents
Changeset List