Patchwork [2,of,7,evolve-ext] config: report evolve as origin for config

login
register
mail settings
Submitter timeless@gcc2-power8.osuosl.org
Date April 14, 2016, 3:05 p.m.
Message ID <13f830540a1471ee8daa.1460646317@gcc2-power8.osuosl.org>
Download mbox | patch
Permalink /patch/14609/
State Accepted
Headers show

Comments

timeless@gcc2-power8.osuosl.org - April 14, 2016, 3:05 p.m.
# HG changeset patch
# User timeless@gmail.com
# Date 1460141158 0
#      Fri Apr 08 18:45:58 2016 +0000
# Node ID 13f830540a1471ee8daa4f8de34b830561079369
# Parent  91ba7e0daff6809b60a08278be95091ba95290b7
# Available At https://bitbucket.org/timeless/mutable-history/
#              hg pull https://bitbucket.org/timeless/mutable-history/ -r 13f830540a14
config: report evolve as origin for config

Patch

diff -r 91ba7e0daff6 -r 13f830540a14 hgext/evolve.py
--- a/hgext/evolve.py	Fri Apr 08 18:45:45 2016 +0000
+++ b/hgext/evolve.py	Fri Apr 08 18:45:58 2016 +0000
@@ -2155,7 +2155,7 @@ 
     tr = repo.currenttransaction()
     assert tr is not None
     try:
-        repo.ui.setconfig('ui', 'allowemptycommit', True)
+        repo.ui.setconfig('ui', 'allowemptycommit', True, 'evolve')
         repo.dirstate.beginparentchange()
         repo.dirstate.setparents(divergent.node(), node.nullid)
         repo.dirstate.endparentchange()
@@ -3862,7 +3862,7 @@ 
     backup = repo.ui.backupconfig('phases', 'new-commit')
     try:
         targetphase = max(orig.phase(), phases.draft)
-        repo.ui.setconfig('phases', 'new-commit', targetphase, 'rebase')
+        repo.ui.setconfig('phases', 'new-commit', targetphase, 'evolve')
         # Commit might fail if unresolved files exist
         nodenew = repo.commit(text=commitmsg, user=orig.user(),
                               date=orig.date(), extra=extra)