D248: config: rename evolution config into stabilization
lothiraldan (Boris Feld)
phabricator at mercurial-scm.org
Mon Aug 7 10:09:42 UTC 2017
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
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.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D248
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', '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')
diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -175,14 +175,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,
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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
To: lothiraldan, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list