Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: also gather effect-flags on experimental.evolution
authorBoris Feld <boris.feld@octobus.net>
Thu, 19 Oct 2017 17:50:20 +0200
changeset 34902 cc977ec0b8b9
parent 34901 ec765a71bd65
child 34903 16d9f0b3e134
config: also gather effect-flags on experimental.evolution Effect-flags config was in flight while the previous evolve config renaming was written. Now that both landed, gather effect-flags in experimental.evolution like the others evolve-related configurations. Differential Revision: https://phab.mercurial-scm.org/D1197
mercurial/configitems.py file | annotate | diff | comparison | revisions
mercurial/obsolete.py file | annotate | diff | comparison | revisions
tests/test-obsmarkers-effectflag.t file | annotate | diff | comparison | revisions 
--- a/mercurial/configitems.py	Thu Oct 19 12:33:53 2017 +0200
+++ b/mercurial/configitems.py	Thu Oct 19 17:50:20 2017 +0200
@@ -369,6 +369,10 @@
 coreconfigitem('experimental', 'evolution.createmarkers',
     default=None,
 )
+coreconfigitem('experimental', 'evolution.effect-flags',
+    default=False,
+    alias=[('experimental', 'effect-flags')]
+)
 coreconfigitem('experimental', 'evolution.exchange',
     default=None,
 )
@@ -387,9 +391,6 @@
 coreconfigitem('experimental', 'nonnormalparanoidcheck',
     default=False,
 )
-coreconfigitem('experimental', 'effect-flags',
-    default=False,
-)
 coreconfigitem('experimental', 'exportableenviron',
     default=list,
 )
--- a/mercurial/obsolete.py	Thu Oct 19 12:33:53 2017 +0200
+++ b/mercurial/obsolete.py	Thu Oct 19 17:50:20 2017 +0200
@@ -1077,7 +1077,7 @@
 
     # Effect flag metadata handling
     saveeffectflag = repo.ui.configbool('experimental',
-                                        'effect-flags')
+                                        'evolution.effect-flags')
 
     tr = repo.transaction('add-obsolescence-marker')
     try:
--- a/tests/test-obsmarkers-effectflag.t	Thu Oct 19 12:33:53 2017 +0200
+++ b/tests/test-obsmarkers-effectflag.t	Thu Oct 19 17:50:20 2017 +0200
@@ -13,7 +13,7 @@
   > rebase =
   > [experimental]
   > evolution = all
-  > effect-flags = 1
+  > evolution.effect-flags = 1
   > EOF
 
   $ hg init $TESTTMP/effect-flags
mercurial