# HG changeset patch # User Martin von Zweigbergk # Date 1556041953 25200 # Node ID ef899ea7456d1579581e1244b44ad1c80439a66f # Parent 93ffedae6ec69261cfef22c1aba7ae81d4edc9be 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. diff -r 93ffedae6ec6 -r ef899ea7456d hgext3rd/evolve/evolvecmd.py --- 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 diff -r 93ffedae6ec6 -r ef899ea7456d tests/test-evolve-progress.t --- 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