tests: renamed helper to avoid clash with stdlib repr module

tests/test-hgweb-commands

@@ -1,63 +1,63 b''
 #!/bin/sh
 # An attempt at more fully testing the hgweb web interface.
 # The following things are tested elsewhere and are therefore omitted:
 # - archive, tested in test-archive
 # - unbundle, tested in test-push-http
 # - changegroupsubset, tested in test-pull
 
 echo % Set up the repo
 hg init test
 cd test
 mkdir da
 echo foo > da/foo
 echo foo > foo
 hg ci -Ambase
 hg tag 1.0
 echo another > foo
 hg branch stable
 hg ci -Ambranch
 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
 cat hg.pid >> $DAEMON_PIDS
 
 echo % Logs and changes
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/log/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/log/1/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/log/1/foo/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/shortlog/'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/rev/0/'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/rev/1/?style=raw'
 
 echo % File-related
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/foo/?style=raw'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/annotate/1/foo/?style=raw'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/?style=raw'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/foo'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/filediff/1/foo/?style=raw'
 
 echo % Overviews
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/tags/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/branches/?style=gitweb' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/summary/?style=gitweb'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/graph/?style=gitweb'
 
 echo % capabilities
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=capabilities'
 echo % heads
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=heads'
 echo % lookup
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=lookup&node=1'
 echo % branches
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=branches'
 echo % changegroup
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=changegroup' \
-    | $TESTDIR/repr.py
+    | $TESTDIR/printrepr.py
 echo % stream_out
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=stream_out'
 echo % failing unbundle, requires POST request
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=unbundle'
 
 echo % Static files
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/static/style.css'
 
 echo % ERRORS ENCOUNTERED
 cat errors.log

tests/test-simplemerge-cmd

@@ -1,61 +1,61 b''
 #!/bin/sh
 
 cp "$TESTDIR"/../contrib/simplemerge .
 
 echo base > base
 
 echo local > local
 cat base >> local
 cp local orig
 
 cat base > other
 echo other >> other
 
 echo '% changing local directly'
 python simplemerge local base other && echo "merge succeeded"
 cat local
 cp orig local
 
 echo '% printing to stdout'
 python simplemerge -p local base other
 echo ' local:'
 cat local
 
 echo '% conflicts'
 cp base conflict-local
 cp other conflict-other
 echo not other >> conflict-local
 echo end >> conflict-local
 echo end >> conflict-other
 python simplemerge -p conflict-local base conflict-other || echo "merge failed"
 
 echo '% --no-minimal'
 python simplemerge -p --no-minimal conflict-local base conflict-other
 
 echo '% 1 label'
 python simplemerge -p -L foo conflict-local base conflict-other
 
 echo '% 2 labels'
 python simplemerge -p -L foo -L bar conflict-local base conflict-other
 
 echo '% too many labels'
 python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other
 
 echo '% binary file'
 python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()"
 cat orig >> binary-local
 python simplemerge -p binary-local base other
 
 echo '% binary file --text'
-python simplemerge -a -p binary-local base other 2>&1 | $TESTDIR/repr.py
+python simplemerge -a -p binary-local base other 2>&1 | $TESTDIR/printrepr.py
 
 echo '% help'
 python simplemerge --help
 
 echo '% wrong number of arguments'
 python simplemerge
 
 echo '% bad option'
 python simplemerge --foo -p local base other
 
 exit 0