view tests/test-diff-color @ 9827:4fe9ca519637

mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127)

Previous code was computing hunks then checking if these hunks could be ignored
when taking whitespace/blank-lines options in accounts. This approach is simple
but fails with hunks containing both whitespace and non-whitespace changes, the
whole hunk is emitted while it can be mostly made of whitespace. The new
version normalize the whitespaces before hunk generation, and test for
blank-lines afterwards.

#!/bin/sh

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

hg init repo
cd repo
cat > a <<EOF
c
c
a
a
b
a
a
c
c
EOF
hg ci -Am adda
cat > a <<EOF
c
c
a
a
dd
a
a
c
c
EOF

echo '% default context'
hg diff --nodates --color=always

echo '% --unified=2'
hg diff --nodates -U 2  --color=always

echo '% diffstat'
hg diff --stat --color=always

echo "record=" >> $HGRCPATH
echo "[ui]" >> $HGRCPATH
echo "interactive=true" >> $HGRCPATH
echo "[diff]" >> $HGRCPATH
echo "git=True" >> $HGRCPATH

echo % record
chmod 0755 a
hg record --color=always -m moda a <<EOF
y
y
EOF
echo

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

hg rollback
echo % qrecord
hg qrecord --color=always -m moda patch <<EOF
y
y
EOF
echo