This is an archive of the discontinued Mercurial Phabricator instance.

config: simplify aliasing commands.update.check
ClosedPublic

Authored by lothiraldan on Oct 16 2017, 1:13 PM.

Download Raw Diff

Details

Reviewers

durin42
ryanmce

Group Reviewers

hg-reviewers

Commits

rHGc4a0480d1951: config: simplify aliasing commands.update.check

Summary

experimental.updatecheck was renamed into commands.update.check, use the
config system to provides the fallback on the old config name instead of
adding more code.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

lothiraldan created this revision.Oct 16 2017, 1:13 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 16 2017, 1:13 PM

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

durin42 requested changes to this revision.Oct 16 2017, 9:01 PM

durin42 added a subscriber: durin42.

durin42 added inline comments.

mercurial/configitems.py
184	Please add the comment that this alias should be discarded post-4.4?

This revision now requires changes to proceed.Oct 16 2017, 9:01 PM

lothiraldan updated this revision to Diff 2898.Oct 17 2017, 8:06 AM

I've added the comment, but I think we should keep the alias until we have a way to warn people they use deprecated config aliases.

I agree with @lothiraldan that there's no pressing need to remove aliases, and we should have a mechanism to work before we do this for sure.

This seems like exactly one of the reasons the config registration system was built in the first place -- to permanently (or semi-permanently at least) forward old configs to new ones, to allow smooth config upgrade paths.

I'll queue this as-is but I think we should not necessarily drop this in the future.

queued

Closed by commit rHGc4a0480d1951: config: simplify aliasing commands.update.check (authored by lothiraldan). · Explain WhyOct 17 2017, 8:19 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/configitems.py (5 lines)
M			mercurial/hg.py (3 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2826		Oct 16 2017, 1:13 PM	★	★
Diff 2	2898		Oct 17 2017, 8:06 AM	★	★
Diff 3	2906	rHGc4a0480d1951f26ffd6066021b075f2788aa4f22	Oct 16 2017, 12:58 PM	★	★

Diff 2826

mercurial/configitems.py

	coreconfigitem('commands', 'status.skipstates',			coreconfigitem('commands', 'status.skipstates',
	default=[],			default=[],
	)			)
	coreconfigitem('commands', 'status.verbose',			coreconfigitem('commands', 'status.verbose',
	default=False,			default=False,
	)			)
	coreconfigitem('commands', 'update.check',			coreconfigitem('commands', 'update.check',
	default=None,			default=None,
				alias=[('experimental', 'updatecheck')]
				durin42Unsubmitted Done Please add the comment that this alias should be discarded post-4.4? durin42: Please add the comment that this alias should be discarded post-4.4?
	)			)
	coreconfigitem('commands', 'update.requiredest',			coreconfigitem('commands', 'update.requiredest',
	default=False,			default=False,
	)			)
	coreconfigitem('committemplate', '.*',			coreconfigitem('committemplate', '.*',
	default=None,			default=None,
	generic=True,			generic=True,
	)			)
	default=None,			default=None,
	)			)
	coreconfigitem('experimental', 'spacemovesdown',			coreconfigitem('experimental', 'spacemovesdown',
	default=False,			default=False,
	)			)
	coreconfigitem('experimental', 'treemanifest',			coreconfigitem('experimental', 'treemanifest',
	default=False,			default=False,
	)			)
	# Deprecated, remove after 4.4 release
	coreconfigitem('experimental', 'updatecheck',
	default=None,
	)
	coreconfigitem('extensions', '.*',			coreconfigitem('extensions', '.*',
	default=None,			default=None,
	generic=True,			generic=True,
	)			)
	coreconfigitem('extdata', '.*',			coreconfigitem('extdata', '.*',
	default=None,			default=None,
	generic=True,			generic=True,
	)			)

mercurial/hg.py

	* linear: check that update is linear before merging working directory			* linear: check that update is linear before merging working directory
	changes into destination			changes into destination
	* noconflict: check that the update does not result in file merges			* noconflict: check that the update does not result in file merges

	This returns whether conflict is detected at updating or not.			This returns whether conflict is detected at updating or not.
	"""			"""
	if updatecheck is None:			if updatecheck is None:
	updatecheck = ui.config('commands', 'update.check')			updatecheck = ui.config('commands', 'update.check')
	if updatecheck is None:
	# pre-4.4 compat on the old spelling of this config item
	updatecheck = ui.config('experimental', 'updatecheck')
	if updatecheck not in ('abort', 'none', 'linear', 'noconflict'):			if updatecheck not in ('abort', 'none', 'linear', 'noconflict'):
	# If not configured, or invalid value configured			# If not configured, or invalid value configured
	updatecheck = 'linear'			updatecheck = 'linear'
	with repo.wlock():			with repo.wlock():
	movemarkfrom = None			movemarkfrom = None
	warndest = False			warndest = False
	if checkout is None:			if checkout is None:
	updata = destutil.destupdate(repo, clean=clean)			updata = destutil.destupdate(repo, clean=clean)