tests/test-extdiff
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 01 Dec 2006 14:46:05 +0100
changeset 3747 b5c4d749f37f
parent 3328 49966b5ab16f
child 3751 797c6e70092b
permissions -rwxr-xr-x
Fix test-notify for systems without or with a different version of diffstat. Some diffstat versions say "1 file changed", others "1 files changed".

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "extdiff=" >> $HGRCPATH

hg init a
cd a
echo a > a
hg add
diff -N /dev/null /dev/null 2> /dev/null
if [ $? -ne 0 ]; then
	opt="-p gdiff"
fi
hg extdiff -o -Nr $opt

echo "[extdiff]" >> $HGRCPATH
echo "cmd.falabala=echo" >> $HGRCPATH
echo "opts.falabala=diffing" >> $HGRCPATH

hg falabala

hg help falabala

hg ci -d '0 0' -mtest1

echo b >> a
hg ci -d '1 0' -mtest2

hg falabala -r 0:1

# test diff during merge
hg update 0
echo b >> b
hg add b
hg ci -m "new branch" -d '1 0'
hg update -C 1
hg merge tip
hg falabala || echo "diff-like tools yield a non-zero exit code"