This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	23910		Dec 1 2020, 5:11 PM	★	★
Diff 2	24033		Dec 4 2020, 6:47 PM	★	★
Diff 3	24058	rHGf4f956342cf137d5b2ce7af1a72171a1f28ea5c7	Dec 1 2020, 9:45 AM	★	★

Commit	Parents	Author	Summary	Date
965f10114770	0768bb48cce4	Pierre-Yves David		Dec 1 2020, 9:45 AM

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 23910

mercurial/upgrade.py

	if enabled:			if enabled:
	revlogs.add(upgrade)			revlogs.add(upgrade)
	else:			else:
	# none are enabled			# none are enabled
	for upgrade, __ in specified:			for upgrade, __ in specified:
	revlogs.discard(upgrade)			revlogs.discard(upgrade)

	# Ensure the repository can be upgraded.			# Ensure the repository can be upgraded.
	missingreqs = (			upgrade_actions.check_source_requirements(repo)
	upgrade_actions.requiredsourcerequirements(repo) - repo.requirements
	)
	if missingreqs:
	raise error.Abort(
	_(b'cannot upgrade repository; requirement missing: %s')
	% _(b', ').join(sorted(missingreqs))
	)

	blockedreqs = (
	upgrade_actions.blocksourcerequirements(repo) & repo.requirements
	)
	if blockedreqs:
	raise error.Abort(
	_(
	b'cannot upgrade repository; unsupported source '
	b'requirement: %s'
	)
	% _(b', ').join(sorted(blockedreqs))
	)

	# FUTURE there is potentially a need to control the wanted requirements via			# FUTURE there is potentially a need to control the wanted requirements via
	# command arguments or via an extension hook point.			# command arguments or via an extension hook point.
	newreqs = localrepo.newreporequirements(			newreqs = localrepo.newreporequirements(
	repo.ui, localrepo.defaultcreateopts(repo.ui)			repo.ui, localrepo.defaultcreateopts(repo.ui)
	)			)
	newreqs.update(upgrade_actions.preservedrequirements(repo))			newreqs.update(upgrade_actions.preservedrequirements(repo))

mercurial/upgrade_utils/actions.py

	# upgrade.py - functions for in place upgrade of Mercurial repository			# upgrade.py - functions for in place upgrade of Mercurial repository
	#			#
	# Copyright (c) 2016-present, Gregory Szorc			# Copyright (c) 2016-present, Gregory Szorc
	#			#
	# 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

	from ..i18n import _			from ..i18n import _
	from .. import (			from .. import (
				error,
	localrepo,			localrepo,
	requirements,			requirements,
	util,			util,
	)			)

	from ..utils import compression			from ..utils import compression

	# 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
	continue			continue

	newactions.append(d)			newactions.append(d)

	# FUTURE consider adding some optimizations here for certain transitions.			# FUTURE consider adding some optimizations here for certain transitions.
	# e.g. adding generaldelta could schedule parent redeltas.			# e.g. adding generaldelta could schedule parent redeltas.

	return newactions			return newactions


				def check_source_requirements(repo):
				"""Ensure that no existing requirements prevent the repository upgrade"""

				required = requiredsourcerequirements(repo)
				missingreqs = required - repo.requirements
				if missingreqs:
				msg = _(b'cannot upgrade repository; requirement missing: %s')
				missingreqs = b', '.join(sorted(missingreqs))
				raise error.Abort(msg % missingreqs)

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

This is an archive of the discontinued Mercurial Phabricator instance.

upgrade: move requirements checking in a dedicated functionClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 23910

mercurial/upgrade.py

mercurial/upgrade_utils/actions.py

upgrade: move requirements checking in a dedicated function
ClosedPublic

Revision Contents
Changeset List