D762: config: backout rename evolution config into stabilization

lothiraldan (Boris Feld) phabricator at mercurial-scm.org
Thu Sep 21 10:53:10 UTC 2017


lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The renaming of the evolution related config was a mistake, revert
  https://phab.mercurial-scm.org/rHGd434a7f0685c372643a9ae2dda59e65495de95b2 to restore original evolution related config keys.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/commands.py
  mercurial/configitems.py
  mercurial/obsolete.py

CHANGE DETAILS

diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py
--- a/mercurial/obsolete.py
+++ b/mercurial/obsolete.py
@@ -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
 
@@ -1030,7 +1030,7 @@
     if 'user' not in metadata:
         metadata['user'] = repo.ui.username()
     useoperation = repo.ui.configbool('experimental',
-        'stabilization.track-operation')
+        'evolution.track-operation')
     if useoperation and operation:
         metadata['operation'] = operation
     tr = repo.transaction('add-obsolescence-marker')
diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -182,17 +182,14 @@
 coreconfigitem('experimental', 'editortmpinhg',
     default=False,
 )
-coreconfigitem('experimental', 'stabilization',
+coreconfigitem('experimental', 'evolution',
     default=list,
-    alias=[('experimental', 'evolution')],
 )
-coreconfigitem('experimental', 'stabilization.bundle-obsmarker',
+coreconfigitem('experimental', 'evolution.bundle-obsmarker',
     default=False,
-    alias=[('experimental', 'evolution.bundle-obsmarker')],
 )
-coreconfigitem('experimental', 'stabilization.track-operation',
+coreconfigitem('experimental', 'evolution.track-operation',
     default=True,
-    alias=[('experimental', 'evolution.track-operation')]
 )
 coreconfigitem('experimental', 'exportableenviron',
     default=list,
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1235,7 +1235,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



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


More information about the Mercurial-devel mailing list