tests/test-extdiff
author Matt Mackall <mpm@selenic.com>
Fri, 11 Jul 2008 18:46:02 -0500
changeset 6770 854b907527e5
parent 5143 d4fa6bafc43a
child 7758 e81e6c996e99
permissions -rwxr-xr-x
status: various cleanups - rename lookup to cmp for formatting reasons - reduce nesting level of fixup code - sort fixup results - group comparison cases in a separate clause - make list initialization simpler - delay flag lookup for working directory - sort removed list in comparison - avoid sorting already sorted lists

#!/bin/sh

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

hg init a
cd a
echo a > a
echo b > b
hg add
# should diff cloned directories
hg extdiff -o -r $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

# should diff cloned files directly
hg falabala -r 0:1

# test diff during merge
hg update 0
echo c >> c
hg add c
hg ci -m "new branch" -d '1 0'
hg update -C 1
hg merge tip
# should diff cloned file against wc file
hg falabala > out || echo "diff-like tools yield a non-zero exit code"
# cleanup the output since the wc is a tmp directory
sed  's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out