tests/test-extdiff
author Mads Kiilerich <mads@kiilerich.com>
Fri, 27 Feb 2009 19:10:38 +0100
changeset 7813 076401cf2b63
parent 7758 e81e6c996e99
child 8065 66d0a03d3afc
permissions -rwxr-xr-x
run-tests.py: avoid using popen2.Popen4 - use subprocess instead Use subprocess to emulate Popen4 if available - similar to how it is done in util.py. Using popen2 under python 2.6 gives DeprecationWarning: The popen2 module is deprecated. Use the subprocess module.

#!/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 merge 1
# should diff cloned file against wc file
hg falabala > out
# cleanup the output since the wc is a tmp directory
sed  's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out
# test --change option
hg ci -d '2 0' -mtest3
hg falabala -c 1
# check diff are made from the first parent
hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code"
#hg log