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: stop passing no-op "progresscb" into continueevolve()
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 23 Apr 2019 10:52:33 -0700
changeset 4600 ef899ea7456d
parent 4599 93ffedae6ec6
child 4601 e5aa1e23d146
evolve: stop passing no-op "progresscb" into continueevolve() The "progresscb" doesn't do anything in the --continue case, so there's no need to pass it into continueevolve(). This lets us remove the --no-all that was added to the test as a workaround.
hgext3rd/evolve/evolvecmd.py file | annotate | diff | comparison | revisions
tests/test-evolve-progress.t file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/evolvecmd.py	Tue Apr 23 09:45:45 2019 -0700
+++ b/hgext3rd/evolve/evolvecmd.py	Tue Apr 23 10:52:33 2019 -0700
@@ -1661,7 +1661,7 @@
         if not evolvestate:
             raise error.Abort(_('no interrupted evolve to continue'))
         evolvestate.load()
-        continueevolve(ui, repo, evolvestate, progresscb)
+        continueevolve(ui, repo, evolvestate, None)
         if evolvestate['command'] != 'evolve':
             evolvestate.delete()
             return
--- a/tests/test-evolve-progress.t	Tue Apr 23 09:45:45 2019 -0700
+++ b/tests/test-evolve-progress.t	Tue Apr 23 10:52:33 2019 -0700
@@ -145,7 +145,7 @@
   $ hg resolve -m a
   (no more unresolved files)
   continue: hg evolve --continue
-  $ hg evolve --continue --config progress.debug=yes --debug --no-all
+  $ hg evolve --continue --config progress.debug=yes --debug
   evolving 9:df5d742141b0 "second"
   committing files:
   a
evolve