Mercurial > hg
view tests/test-churn @ 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 | 7d56b6ffef72 |
children | e3237af51def |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "churn=" >> $HGRCPATH COLUMNS=80; export COLUMNS echo % create test repository hg init repo cd repo echo a > a hg ci -Am adda -u user1 -d 6:00 echo b >> a echo b > b hg ci -m changeba -u user2 -d 9:00 a hg ci -Am addb -u user2 -d 9:30 echo c >> a echo c >> b echo c > c hg ci -m changeca -u user3 -d 12:00 a hg ci -m changecb -u user3 -d 12:15 b hg ci -Am addc -u user3 -d 12:30 mkdir -p d/e echo abc > d/e/f1.txt hg ci -Am "add d/e/f1.txt" -u user1 -d 12:45 d/e/f1.txt mkdir -p d/g echo def > d/g/f2.txt hg ci -Am "add d/g/f2.txt" -u user1 -d 13:00 d/g/f2.txt echo % churn separate directories cd d hg churn e echo % churn all hg churn echo % churn up to rev 2 hg churn -r :2 cd .. echo % churn with aliases cat > ../aliases <<EOF user1 alias1 user3 alias3 EOF hg churn --aliases ../aliases echo % churn with .hgchurn mv ../aliases .hgchurn hg churn rm .hgchurn echo % churn with column specifier COLUMNS=40 hg churn echo % churn by hour hg churn -f '%H' -s echo % churn with separated added/removed lines hg rm d/g/f2.txt hg ci -Am "removed d/g/f2.txt" -u user1 -d 14:00 d/g/f2.txt hg churn --diffstat echo % changeset number churn hg churn -c cd .. # issue 833: ZeroDivisionError hg init issue-833 cd issue-833 touch foo hg ci -Am foo # this was failing with a ZeroDivisionError hg churn cd ..