Patchwork D1197: config: also gather effect-flags on experimental.evolution

login
register
mail settings
Submitter phabricator
Date Oct. 19, 2017, 4:10 p.m.
Message ID <differential-rev-PHID-DREV-iu7amlrljyw2yooc6xhn-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/25250/
State Superseded
Headers show

Comments

phabricator - Oct. 19, 2017, 4:10 p.m.
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  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.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/configitems.py
  mercurial/obsolete.py
  tests/test-obsmarkers-effectflag.t

CHANGE DETAILS




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

Patch

diff --git a/tests/test-obsmarkers-effectflag.t b/tests/test-obsmarkers-effectflag.t
--- a/tests/test-obsmarkers-effectflag.t
+++ b/tests/test-obsmarkers-effectflag.t
@@ -13,7 +13,7 @@ 
   > rebase =
   > [experimental]
   > evolution = all
-  > effect-flags = 1
+  > evolution.effect-flags = 1
   > EOF
 
   $ hg init $TESTTMP/effect-flags
diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py
--- a/mercurial/obsolete.py
+++ b/mercurial/obsolete.py
@@ -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:
diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -372,6 +372,10 @@ 
 coreconfigitem('experimental', 'evolution.createmarkers',
     default=None,
 )
+coreconfigitem('experimental', 'evolution.effect-flags',
+    default=False,
+    alias=[('experimental', 'effect-flags')]
+)
 coreconfigitem('experimental', 'evolution.exchange',
     default=None,
 )
@@ -390,9 +394,6 @@ 
 coreconfigitem('experimental', 'nonnormalparanoidcheck',
     default=False,
 )
-coreconfigitem('experimental', 'effect-flags',
-    default=False,
-)
 coreconfigitem('experimental', 'exportableenviron',
     default=list,
 )