view tests/test-progress @ 12252:4481f8a93c7a stable

convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)

Given a commit author or message with non-ASCII characters in a darcs
repo, convert would raise a UnicodeEncodeError when adding changesets
to the hg changelog.

This happened because etree returns back unicode objects for any text
it can't encode into ASCII. convert was passing these objects to
changelog.add(), which would then attempt encoding.fromlocal() on
them.

This patch ensures converter_source.recode() is called on each piece
of commit data returned by etree.

(Also note that darcs is currently encoding agnostic and will print
out whatever is in a patch's metadata byte-for-byte, even in the XML
changelog.)

#!/bin/sh

cat > loop.py <<EOF
from mercurial import commands

def loop(ui, loops, **opts):
    loops = int(loops)
    total = None
    if loops >= 0:
        total = loops
    if opts.get('total', None):
        total = int(opts.get('total'))
    loops = abs(loops)

    for i in range(loops):
        ui.progress('loop', i, 'loop.%d' % i, 'loopnum', total)
    ui.progress('loop', None, 'loop.done', 'loopnum', total)

commands.norepo += " loop"

cmdtable = {
    "loop": (loop, [('', 'total', '', 'override for total')],
             'hg loop LOOPS'),
}
EOF

cat > filtercr.py <<EOF
import sys, re
for line in sys.stdin:
    line = re.sub(r'\r+[^\n]', lambda m: '\n' + m.group()[-1:], line)
    sys.stdout.write(line)
EOF

echo "[extensions]" >> $HGRCPATH
echo "progress=" >> $HGRCPATH
echo "loop=`pwd`/loop.py" >> $HGRCPATH
echo "[progress]" >> $HGRCPATH
echo "assume-tty=1" >> $HGRCPATH

echo '% test default params, display nothing because of delay'
hg -y loop 3 2>&1 | python filtercr.py

echo "delay=0" >> $HGRCPATH
echo "refresh=0" >> $HGRCPATH

echo '% test with delay=0, refresh=0'
hg -y loop 3 2>&1 | python filtercr.py

echo '% test refresh is taken in account'
hg -y --config progress.refresh=100 loop 3 2>&1 | python filtercr.py

echo '% test format options 1'
hg -y --config 'progress.format=number topic item+2' loop 2 2>&1 | python filtercr.py

echo '% test format options 2'
hg -y --config 'progress.format=number item-3 bar' loop 2 2>&1 | python filtercr.py

echo '% test format options and indeterminate progress'
hg -y --config 'progress.format=number item bar' loop -- -2 2>&1 | python filtercr.py

echo "% make sure things don't fall over if count > total"
hg -y loop --total 4 6 2>&1 | python filtercr.py

echo '% test immediate progress completion'
hg -y loop 0 2>&1 | python filtercr.py