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 diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -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, 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')