changeset 34863:b1e3f609bf45

config: invert evolution-related configuration aliases We want to split the evolution-related configuration and back-out the renaming from evolution.* to stabilization.*. First invert the configuration and aliases, so next changesets will be cleaner. Differential Revision: https://phab.mercurial-scm.org/D1146
author Boris Feld <boris.feld@octobus.net>
date Mon, 16 Oct 2017 17:14:32 +0200
parents d92dc725223b
children fec79a3f250f
files mercurial/commands.py mercurial/configitems.py mercurial/obsolete.py
diffstat 3 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Oct 16 14:53:57 2017 -0400
+++ b/mercurial/commands.py	Mon Oct 16 17:14:32 2017 +0200
@@ -1239,7 +1239,7 @@
 
 
     contentopts = {'cg.version': cgversion}
-    if repo.ui.configbool('experimental', 'stabilization.bundle-obsmarker'):
+    if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
         contentopts['obsolescence'] = True
     if repo.ui.configbool('experimental', 'bundle-phases'):
         contentopts['phases'] = True
--- a/mercurial/configitems.py	Mon Oct 16 14:53:57 2017 -0400
+++ b/mercurial/configitems.py	Mon Oct 16 17:14:32 2017 +0200
@@ -345,6 +345,18 @@
 coreconfigitem('experimental', 'editortmpinhg',
     default=False,
 )
+coreconfigitem('experimental', 'evolution',
+    default=list,
+    alias=[('experimental', 'stabilization')],
+)
+coreconfigitem('experimental', 'evolution.bundle-obsmarker',
+    default=False,
+    alias=[('experimental', 'stabilization.bundle-obsmarker')],
+)
+coreconfigitem('experimental', 'evolution.track-operation',
+    default=True,
+    alias=[('experimental', 'stabilization.track-operation')]
+)
 coreconfigitem('experimental', 'maxdeltachainspan',
     default=-1,
 )
@@ -357,18 +369,6 @@
 coreconfigitem('experimental', 'effect-flags',
     default=False,
 )
-coreconfigitem('experimental', 'stabilization',
-    default=list,
-    alias=[('experimental', 'evolution')],
-)
-coreconfigitem('experimental', 'stabilization.bundle-obsmarker',
-    default=False,
-    alias=[('experimental', 'evolution.bundle-obsmarker')],
-)
-coreconfigitem('experimental', 'stabilization.track-operation',
-    default=True,
-    alias=[('experimental', 'evolution.track-operation')]
-)
 coreconfigitem('experimental', 'exportableenviron',
     default=list,
 )
--- a/mercurial/obsolete.py	Mon Oct 16 14:53:57 2017 -0400
+++ b/mercurial/obsolete.py	Mon Oct 16 17:14:32 2017 +0200
@@ -102,7 +102,7 @@
     """Returns True if the given repository has the given obsolete option
     enabled.
     """
-    result = set(repo.ui.configlist('experimental', 'stabilization'))
+    result = set(repo.ui.configlist('experimental', 'evolution'))
     if 'all' in result:
         return True
 
@@ -1043,7 +1043,7 @@
 
     # Operation metadata handling
     useoperation = repo.ui.configbool('experimental',
-        'stabilization.track-operation')
+        'evolution.track-operation')
     if useoperation and operation:
         metadata['operation'] = operation