Mercurial > evolve
changeset 4599:93ffedae6ec6
evolve: _solveunstable() update progress only once
There's no need to draw it, then possibly write text over it (with
--verbose), and then draw it again.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 23 Apr 2019 09:45:45 -0700 |
| parents | 2c094d4ee9cd |
| children | ef899ea7456d |
| files | hgext3rd/evolve/evolvecmd.py tests/test-evolve-progress.t |
| diffstat | 2 files changed, 2 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Tue Apr 23 09:35:34 2019 -0700 +++ b/hgext3rd/evolve/evolvecmd.py Tue Apr 23 09:45:45 2019 -0700 @@ -168,10 +168,10 @@ displayer.show(target) if confirm and ui.prompt('perform evolve? [Ny]', 'n') != 'y': raise error.Abort(_('evolve aborted by user')) - if progresscb: - progresscb() todo = 'hg rebase -r %s -d %s\n' % (orig, target) if dryrun: + if progresscb: + progresscb() repo.ui.write(todo) return (False, ".") else:
--- a/tests/test-evolve-progress.t Tue Apr 23 09:35:34 2019 -0700 +++ b/tests/test-evolve-progress.t Tue Apr 23 09:45:45 2019 -0700 @@ -26,7 +26,6 @@ evolve: 1/3 changesets (33.33%) move:[1] second atop:[4] first v2 - evolve: 1/3 changesets (33.33%) hg rebase -r 4f60c78b6d58 -d fd0a2402f834 evolve: 1/3 changesets (33.33%) resolving manifests @@ -43,7 +42,6 @@ obscache is out of date evolve: 2/3 changesets (66.67%) move:[2] third - evolve: 2/3 changesets (66.67%) hg rebase -r 769574b07a96 -d 5f16d91ecde0 evolve: 2/3 changesets (66.67%) unmatched files in other: @@ -62,7 +60,6 @@ obscache is out of date evolve: 3/3 changesets (100.00%) move:[3] fourth - evolve: 3/3 changesets (100.00%) hg rebase -r 22782fddc0ab -d 53c0008d98a0 evolve: 3/3 changesets (100.00%) resolving manifests @@ -96,7 +93,6 @@ evolve: 1/1 changesets (100.00%) move:[5] second atop:[8] first v3 - evolve: 1/1 changesets (100.00%) hg rebase -r 5f16d91ecde0 -d 152c368c622b evolve: 1/1 changesets (100.00%) resolving manifests @@ -127,7 +123,6 @@ evolve: 1/3 changesets (33.33%) move:[9] second atop:[10] first v4 - evolve: 1/3 changesets (33.33%) hg rebase -r df5d742141b0 -d f8d7d38c0a88 evolve: 1/3 changesets (33.33%) resolving manifests