Mercurial > evolve
changeset 4598:2c094d4ee9cd
evolve: don't update progress just before clearing it
_cleanup() will clear the progress, so there's little reason to update
it just before (except for progress.debug=yes).
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 23 Apr 2019 09:35:34 -0700 |
| parents | f3236cd49ab8 |
| children | 93ffedae6ec6 |
| files | hgext3rd/evolve/evolvecmd.py tests/test-evolve-progress.t |
| diffstat | 2 files changed, 0 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Tue Apr 23 09:31:32 2019 -0700 +++ b/hgext3rd/evolve/evolvecmd.py Tue Apr 23 09:35:34 2019 -0700 @@ -1759,7 +1759,6 @@ evolvestate['orphanmerge'] = False seen += 1 - progresscb() _cleanup(ui, repo, startnode, showprogress, shouldupdate) def solveobswdp(ui, repo, opts):
--- a/tests/test-evolve-progress.t Tue Apr 23 09:31:32 2019 -0700 +++ b/tests/test-evolve-progress.t Tue Apr 23 09:35:34 2019 -0700 @@ -78,7 +78,6 @@ updating the branch cache obscache is out of date invalid branchheads cache (served): tip differs - evolve: 4/3 changesets (133.33%) resolving manifests branchmerge: False, force: False, partial: False ancestor: 385376d04062, local: 385376d04062+, remote: fd0a2402f834 @@ -112,7 +111,6 @@ committing changelog updating the branch cache obscache is out of date - evolve: 2/1 changesets (200.00%) resolving manifests branchmerge: False, force: False, partial: False ancestor: df5d742141b0, local: df5d742141b0+, remote: 152c368c622b