Mercurial > evolve
diff hgext/evolve.py @ 1636:13f830540a14
config: report evolve as origin for config
| author | timeless@gmail.com |
|---|---|
| date | Fri, 08 Apr 2016 18:45:58 +0000 |
| parents | 91ba7e0daff6 |
| children | 078e6777ac15 |
line wrap: on
line diff
--- 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)