tests/test-extdiff
author Stefano Tortarolo <stefano.tortarolo@gmail.com>
Thu, 26 Mar 2009 16:58:50 +0200
changeset 7955 c3d4ff03ec72
parent 7758 e81e6c996e99
child 8065 66d0a03d3afc
permissions -rwxr-xr-x
rebase: keep original mq patch format (Issue1574) Rebase now doesn't make assumptions about which format has been used for a mq patch (git or normal). Before finalizing a patch it keeps track of the original format, by reading its header, and then restores the format when reimporting it. This way it also allows for having mixed styles. Note: this version corrects a failure in the test

#!/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