Mercurial > evolve
changeset 4600:ef899ea7456d
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.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 23 Apr 2019 10:52:33 -0700 |
| parents | 93ffedae6ec6 |
| children | e5aa1e23d146 |
| files | hgext3rd/evolve/evolvecmd.py tests/test-evolve-progress.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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