changeset 33793:d434a7f0685c

config: rename evolution config into stabilization Use aliases for backward-compatibility. Though I'm not sure how to emit compatibility warnings with aliases. Test configuration are updated in the next patch. The renaming is done according to https://www.mercurial-scm.org/wiki/CEDVocabulary. Differential Revision: https://phab.mercurial-scm.org/D248
author Boris Feld <boris.feld@octobus.net>
date Thu, 03 Aug 2017 11:38:22 +0200
parents 96f43981c1c4
children 6c1a9fd8361b
files mercurial/commands.py mercurial/configitems.py mercurial/obsolete.py
diffstat 3 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Aug 03 05:12:35 2017 +0530
+++ b/mercurial/commands.py	Thu Aug 03 11:38:22 2017 +0200
@@ -1227,7 +1227,7 @@
 
 
     contentopts = {'cg.version': cgversion}
-    if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
+    if repo.ui.configbool('experimental', 'stabilization.bundle-obsmarker'):
         contentopts['obsolescence'] = True
     if repo.ui.configbool('experimental', 'bundle-phases'):
         contentopts['phases'] = True
--- a/mercurial/configitems.py	Thu Aug 03 05:12:35 2017 +0530
+++ b/mercurial/configitems.py	Thu Aug 03 11:38:22 2017 +0200
@@ -181,14 +181,17 @@
 coreconfigitem('experimental', 'editortmpinhg',
     default=False,
 )
-coreconfigitem('experimental', 'evolution',
+coreconfigitem('experimental', 'stabilization',
     default=list,
+    alias=[('experimental', 'evolution')],
 )
-coreconfigitem('experimental', 'evolution.bundle-obsmarker',
+coreconfigitem('experimental', 'stabilization.bundle-obsmarker',
     default=False,
+    alias=[('experimental', 'evolution.bundle-obsmarker')],
 )
-coreconfigitem('experimental', 'evolution.track-operation',
+coreconfigitem('experimental', 'stabilization.track-operation',
     default=False,
+    alias=[('experimental', 'evolution.track-operation')]
 )
 coreconfigitem('experimental', 'exportableenviron',
     default=list,
--- a/mercurial/obsolete.py	Thu Aug 03 05:12:35 2017 +0530
+++ b/mercurial/obsolete.py	Thu Aug 03 11:38:22 2017 +0200
@@ -102,7 +102,7 @@
     """Returns True if the given repository has the given obsolete option
     enabled.
     """
-    result = set(repo.ui.configlist('experimental', 'evolution'))
+    result = set(repo.ui.configlist('experimental', 'stabilization'))
     if 'all' in result:
         return True
 
@@ -1007,7 +1007,7 @@
     if 'user' not in metadata:
         metadata['user'] = repo.ui.username()
     useoperation = repo.ui.configbool('experimental',
-        'evolution.track-operation')
+        'stabilization.track-operation')
     if useoperation and operation:
         metadata['operation'] = operation
     tr = repo.transaction('add-obsolescence-marker')