D1117: config: simplify aliasing commands.update.check
lothiraldan (Boris Feld)
phabricator at mercurial-scm.org
Tue Oct 17 08:19:34 EDT 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc4a0480d1951: config: simplify aliasing commands.update.check (authored by lothiraldan, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1117?vs=2898&id=2906
REVISION DETAIL
https://phab.mercurial-scm.org/D1117
AFFECTED FILES
mercurial/configitems.py
mercurial/hg.py
CHANGE DETAILS
diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -758,9 +758,6 @@
"""
if updatecheck is None:
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 not configured, or invalid value configured
updatecheck = 'linear'
diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -181,6 +181,8 @@
)
coreconfigitem('commands', 'update.check',
default=None,
+ # Deprecated, remove after 4.4 release
+ alias=[('experimental', 'updatecheck')]
)
coreconfigitem('commands', 'update.requiredest',
default=False,
@@ -412,10 +414,6 @@
coreconfigitem('experimental', 'treemanifest',
default=False,
)
-# Deprecated, remove after 4.4 release
-coreconfigitem('experimental', 'updatecheck',
- default=None,
-)
coreconfigitem('extensions', '.*',
default=None,
generic=True,
To: lothiraldan, #hg-reviewers, durin42, ryanmce
Cc: ryanmce, durin42, mercurial-devel
More information about the Mercurial-devel
mailing list