Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: report evolve as origin for config
authortimeless@gmail.com
Fri, 08 Apr 2016 18:45:58 +0000
changeset 1636 13f830540a14
parent 1635 91ba7e0daff6
child 1637 078e6777ac15
config: report evolve as origin for config
hgext/evolve.py file | annotate | diff | comparison | revisions 
--- 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)
evolve