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

login
register
mail settings
Submitter phabricator
Date Oct. 19, 2017, 7:41 p.m.
Message ID <56c8ba5b9e865124823dc825f1600307@localhost.localdomain>
Download mbox | patch
Permalink /patch/25255/
State Not Applicable
Headers show

Comments

phabricator - Oct. 19, 2017, 7:41 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGcc977ec0b8b9: config: also gather effect-flags on experimental.evolution (authored by lothiraldan, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1197?vs=3038&id=3041

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, krbullock
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
@@ -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,
 )