test-extdiff
38 lines
| 617 B
| text/plain
|
TextLexer
/ tests / test-extdiff
Vadim Gelfer
|
r2906 | #!/bin/sh | ||
Thomas Arendsen Hein
|
r2990 | echo "[extensions]" >> $HGRCPATH | ||
echo "extdiff=" >> $HGRCPATH | ||||
Vadim Gelfer
|
r2906 | |||
hg init a | ||||
cd a | ||||
echo a > a | ||||
hg add | ||||
Danek Duvall
|
r2932 | diff -N /dev/null /dev/null 2> /dev/null | ||
if [ $? -ne 0 ]; then | ||||
opt="-p gdiff" | ||||
fi | ||||
hg extdiff -o -Nr $opt | ||||
Vadim Gelfer
|
r2906 | |||
Thomas Arendsen Hein
|
r2990 | echo "[extdiff]" >> $HGRCPATH | ||
echo "cmd.falabala=echo" >> $HGRCPATH | ||||
echo "opts.falabala=diffing" >> $HGRCPATH | ||||
Vadim Gelfer
|
r2906 | |||
hg falabala | ||||
hg help falabala | ||||
hg ci -d '0 0' -mtest1 | ||||
echo b >> a | ||||
hg ci -d '1 0' -mtest2 | ||||
Benoit Boissinot
|
r3330 | 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" | ||||