Mercurial > hg
view tests/test-diffstat @ 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.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 11 Nov 2009 18:31:42 +0100 |
parents | 99a2096c3d8d |
children |
line wrap: on
line source
#!/bin/sh hg init repo cd repo i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done hg add a echo '% wide diffstat' hg diff --stat echo '% diffstat width' COLUMNS=24 hg diff --config ui.interactive=true --stat hg ci -m adda cat >> a <<EOF a a a EOF echo '% narrow diffstat' hg diff --stat hg ci -m appenda printf '\0' > b hg add b echo '% binary diffstat' hg diff --stat echo '% binary git diffstat' hg diff --stat --git