| hg-reviewers |
This makes the test pass on Python 3.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/python3-whitelist (1 line) | |||
| M | tests/test-progress.t (14 lines) |
| test-patchbomb.t | test-patchbomb.t | ||||
| test-pathconflicts-merge.t | test-pathconflicts-merge.t | ||||
| test-pathconflicts-update.t | test-pathconflicts-update.t | ||||
| test-pathencode.py | test-pathencode.py | ||||
| test-pending.t | test-pending.t | ||||
| test-permissions.t | test-permissions.t | ||||
| test-phases-exchange.t | test-phases-exchange.t | ||||
| test-phases.t | test-phases.t | ||||
| test-progress.t | |||||
| test-pull-branch.t | test-pull-branch.t | ||||
| test-pull-http.t | test-pull-http.t | ||||
| test-pull-permission.t | test-pull-permission.t | ||||
| test-pull-pull-corruption.t | test-pull-pull-corruption.t | ||||
| test-pull-r.t | test-pull-r.t | ||||
| test-pull-update.t | test-pull-update.t | ||||
| test-pull.t | test-pull.t | ||||
| test-purge.t | test-purge.t | ||||
| > total = loops | > total = loops | ||||
| > if opts.get('total', None): | > if opts.get('total', None): | ||||
| > total = int(opts.get('total')) | > total = int(opts.get('total')) | ||||
| > nested = False | > nested = False | ||||
| > if opts.get('nested', None): | > if opts.get('nested', None): | ||||
| > nested = True | > nested = True | ||||
| > loops = abs(loops) | > loops = abs(loops) | ||||
| > | > | ||||
| > progress = ui.makeprogress(topiclabel, unit='loopnum', total=total) | > progress = ui.makeprogress(topiclabel, unit=b'loopnum', total=total) | ||||
| > other = ui.makeprogress('other', unit='othernum', total=total) | > other = ui.makeprogress(b'other', unit=b'othernum', total=total) | ||||
| > for i in range(loops): | > for i in range(loops): | ||||
| > progress.update(i, item=getloopitem(i)) | > progress.update(i, item=getloopitem(i)) | ||||
| > if opts.get('parallel'): | > if opts.get('parallel'): | ||||
| > other.update(i, item='other.%d' % i) | > other.update(i, item=b'other.%d' % i) | ||||
| > if nested: | > if nested: | ||||
| > nested_steps = 2 | > nested_steps = 2 | ||||
| > if i and i % 4 == 0: | > if i and i % 4 == 0: | ||||
| > nested_steps = 5 | > nested_steps = 5 | ||||
| > nested = ui.makeprogress('nested', unit='nestnum', | > nested = ui.makeprogress(b'nested', unit=b'nestnum', | ||||
| > total=nested_steps) | > total=nested_steps) | ||||
| > for j in range(nested_steps): | > for j in range(nested_steps): | ||||
| > nested.update(j, item='nested.%d' % j) | > nested.update(j, item=b'nested.%d' % j) | ||||
| > nested.complete() | > nested.complete() | ||||
| > progress.complete() | > progress.complete() | ||||
| > | > | ||||
| > topiclabel = 'loop' | > topiclabel = b'loop' | ||||
| > def getloopitem(i): | > def getloopitem(i): | ||||
| > return 'loop.%d' % i | > return b'loop.%d' % i | ||||
| > | > | ||||
| > EOF | > EOF | ||||
| $ cp $HGRCPATH $HGRCPATH.orig | $ cp $HGRCPATH $HGRCPATH.orig | ||||
| $ echo "[extensions]" >> $HGRCPATH | $ echo "[extensions]" >> $HGRCPATH | ||||
| $ echo "progress=" >> $HGRCPATH | $ echo "progress=" >> $HGRCPATH | ||||
| $ echo "loop=`pwd`/loop.py" >> $HGRCPATH | $ echo "loop=`pwd`/loop.py" >> $HGRCPATH | ||||
| $ echo "[progress]" >> $HGRCPATH | $ echo "[progress]" >> $HGRCPATH | ||||