D1146: config: invert evolution-related configuration aliases
lothiraldan (Boris Feld)
phabricator at mercurial-scm.org
Wed Oct 18 16:08:57 UTC 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb1e3f609bf45: config: invert evolution-related configuration aliases (authored by lothiraldan, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D1146?vs=2919&id=2980#toc
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1146?vs=2919&id=2980
REVISION DETAIL
https://phab.mercurial-scm.org/D1146
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
@@ -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
diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -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,
)
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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
To: lothiraldan, #hg-reviewers, indygreg
Cc: indygreg, mercurial-devel
More information about the Mercurial-devel
mailing list