Patchwork D1117: config: simplify aliasing commands.update.check

login
register
mail settings
Submitter phabricator
Date Oct. 17, 2017, 12:06 p.m.
Message ID <c70b86b135fd3793fdeb694d5149ee24@localhost.localdomain>
Download mbox | patch
Permalink /patch/25084/
State Not Applicable
Headers show

Comments

phabricator - Oct. 17, 2017, 12:06 p.m.
lothiraldan updated this revision to Diff 2898.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1117?vs=2826&id=2898

REVISION DETAIL
  https://phab.mercurial-scm.org/D1117

AFFECTED FILES
  mercurial/configitems.py
  mercurial/hg.py

CHANGE DETAILS




To: lothiraldan, #hg-reviewers, durin42
Cc: durin42, mercurial-devel

Patch

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,