Mercurial > evolve
changeset 4565:393a58d71b30 stable
evolve: fix progress display with hg<4.7
Since d1aab9d82f5b (evolve: adapt for deprecated ui.progress(),
2019-01-14), the "item", "units" and "total" are all set to default
values. The last one is especially bad since it results in a "spinner"
instead of a progress bar.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 22 Apr 2019 22:14:26 -0700 |
| parents | a1072c2910c2 |
| children | 1e31e225942c 05c9dcf5512e |
| files | CHANGELOG hgext3rd/evolve/compat.py |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Sat Apr 20 05:21:14 2019 +0200 +++ b/CHANGELOG Mon Apr 22 22:14:26 2019 -0700 @@ -7,6 +7,7 @@ * evolve: make sure we use upstream merge code with 5.0, * evolve: restore compatibility with 4.4 (This regress the narrow compatibility) + * evolve: fix progress display with hg <= 4.6 * topic: compatibility with mercurial-5.0, * topic: improve extensions isolation (issue6121).
--- a/hgext3rd/evolve/compat.py Sat Apr 20 05:21:14 2019 +0200 +++ b/hgext3rd/evolve/compat.py Mon Apr 22 22:14:26 2019 -0700 @@ -67,7 +67,7 @@ progress.complete() else: def progress(ui, topic, pos, item="", unit="", total=None): - ui.progress(topic, pos, item="", unit="", total=None) + ui.progress(topic, pos, item, unit, total) # XXX: Better detection of property cache if 'predecessors' not in dir(obsolete.obsstore):