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.
evolve: increment progress *after* a whole merge commit is done
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 19 Apr 2019 10:03:39 -0700
changeset 4595 3a3be1378634
parent 4594 fed1435757ba
child 4596 78d60913ea9f
evolve: increment progress *after* a whole merge commit is done The "re-stabilize" step was using the progress that was supposed to be for the next revision.
hgext3rd/evolve/evolvecmd.py file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/evolvecmd.py	Fri Apr 19 11:02:35 2019 -0700
+++ b/hgext3rd/evolve/evolvecmd.py	Fri Apr 19 10:03:39 2019 -0700
@@ -1738,7 +1738,6 @@
             ret = _solveone(ui, repo, curctx, evolvestate, dryrunopt,
                             confirmopt, progresscb, targetcat,
                             lastsolved=lastsolved, stacktmplt=stacktmplt)
-            seen += 1
             if ret[0]:
                 evolvestate['replacements'][curctx.node()] = ret[1]
                 lastsolved = ret[1]
@@ -1758,6 +1757,7 @@
                     evolvestate['skippedrevs'].append(curctx.node())
 
                 evolvestate['orphanmerge'] = False
+            seen += 1
 
     progresscb()
     _cleanup(ui, repo, startnode, showprogress, shouldupdate)
evolve