view tests/test-diff-copy-depth @ 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

for i in aaa zzz; do
    hg init t
    cd t

    echo "-- With $i"

    touch file
    hg add file
    hg ci -m "Add"

    hg cp file $i
    hg ci -m "a -> $i"

    hg cp $i other-file
    echo "different" >> $i
    hg ci -m "$i -> other-file"

    hg cp other-file somename

    echo "Status":
    hg st -C
    echo
    echo "Diff:"
    hg diff -g
    echo

    cd ..
    rm -rf t
done