Patchwork [evolve-ext] evolve: add a config option to persistently set --no-all

login
register
mail settings
Submitter Matt Harbison
Date May 2, 2019, 3:57 a.m.
Message ID <89b24902c60bdcf75068.1556769473@Envy>
Download mbox | patch
Permalink /patch/39919/
State New
Headers show

Comments

Matt Harbison - May 2, 2019, 3:57 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1556769276 14400
#      Wed May 01 23:54:36 2019 -0400
# Node ID 89b24902c60bdcf7506858ba190a0966f94670b8
# Parent  b78707559f1f542a522cba43436a79fef2238e95
evolve: add a config option to persistently set --no-all

I think --all is the correct default choice for most users, but I've forgotten
--no-all enough times already.  There were also questions about opting out of
the new --all behavior on the mailing list.

The command line option takes precedence over the config option.

Patch

diff --git a/hgext3rd/evolve/__init__.py b/hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py
+++ b/hgext3rd/evolve/__init__.py
@@ -364,6 +364,7 @@ 
 eh.configitem('experimental', 'evolutioncommands', [])
 eh.configitem('experimental', 'evolution.allnewcommands', None)
 eh.configitem('experimental', 'prunestrip', False)
+eh.configitem('experimental', 'evolution.evolve.all', True)
 
 # pre hg 4.0 compat
 
diff --git a/hgext3rd/evolve/evolvecmd.py b/hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py
+++ b/hgext3rd/evolve/evolvecmd.py
@@ -1610,7 +1610,7 @@ 
     anyopt = opts['any']
     allopt = opts['all']
     if allopt is None:
-        allopt = True
+        allopt = ui.configbool('experimental', 'evolution.evolve.all')
     startnode = repo['.'].node()
     dryrunopt = opts['dry_run']
     confirmopt = opts['confirm']
diff --git a/tests/test-issue-6028.t b/tests/test-issue-6028.t
--- a/tests/test-issue-6028.t
+++ b/tests/test-issue-6028.t
@@ -112,7 +112,7 @@ 
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 start the evolve
-  $ hg evolve --update --no-all
+  $ hg evolve --update --config 'experimental.evolution.evolve.all=False'
   move:[8] merged aa
   atop:[4] merged b
   working directory is now at c920dd828523