changeset 34805:c4a0480d1951

config: simplify aliasing commands.update.check 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. Differential Revision: https://phab.mercurial-scm.org/D1117
author Boris Feld <boris.feld@octobus.net>
date Mon, 16 Oct 2017 18:58:16 +0200
parents 149109c96904
children afd7fd950f6e
files mercurial/configitems.py mercurial/hg.py
diffstat 2 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/configitems.py	Wed Oct 04 18:51:21 2017 -0700
+++ b/mercurial/configitems.py	Mon Oct 16 18:58:16 2017 +0200
@@ -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,
--- a/mercurial/hg.py	Wed Oct 04 18:51:21 2017 -0700
+++ b/mercurial/hg.py	Mon Oct 16 18:58:16 2017 +0200
@@ -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'