Mercurial > hg
view tests/test-committer @ 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 | c5b3d3e30de7 |
children |
line wrap: on
line source
#!/bin/sh unset HGUSER EMAIL="My Name <myname@example.com>" export EMAIL hg init test cd test touch asdf hg add asdf hg commit -d '1000000 0' -m commit-1 hg tip unset EMAIL echo 1234 > asdf hg commit -d '1000000 0' -u "foo@bar.com" -m commit-1 hg tip echo "[ui]" >> .hg/hgrc echo "username = foobar <foo@bar.com>" >> .hg/hgrc echo 12 > asdf hg commit -d '1000000 0' -m commit-1 hg tip echo 1 > asdf hg commit -d '1000000 0' -u "foo@bar.com" -m commit-1 hg tip echo 123 > asdf echo "[ui]" > .hg/hgrc echo "username = " >> .hg/hgrc hg commit -d '1000000 0' -m commit-1 rm .hg/hgrc hg commit -d '1000000 0' -m commit-1 2>&1 | sed -e "s/'[^']*'/user@host/" echo space > asdf hg commit -d '1000000 0' -u ' ' -m commit-1 true