Mercurial > hg
view tests/test-mq-qrefresh-replace-log-message @ 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 | 448eb46d4d84 |
children |
line wrap: on
line source
#!/bin/sh # Environement setup for MQ echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH #Repo init hg init hg qinit echo ======================= echo "Should fail if no patches applied" hg qrefresh hg qrefresh -e hg qnew -m "First commit message" first-patch echo aaaa > file hg add file hg qrefresh echo ======================= echo "Should display 'First commit message'" hg log -l1 -v | sed -n '/description/,$p' echo # Testing changing message with -m echo bbbb > file hg qrefresh -m "Second commit message" echo ======================= echo "Should display 'Second commit message'" hg log -l1 -v | sed -n '/description/,$p' echo # Testing changing message with -l echo "Third commit message" > logfile echo " This is the 3rd log message" >> logfile echo bbbb > file hg qrefresh -l logfile echo ======================= printf "Should display 'Third commit message\\\n This is the 3rd log message'\n" hg log -l1 -v | sed -n '/description/,$p' echo # Testing changing message with -l- hg qnew -m "First commit message" second-patch echo aaaa > file2 hg add file2 echo bbbb > file2 (echo "Fifth commit message" echo " This is the 5th log message" >> logfile) |\ hg qrefresh -l- echo ======================= printf "Should display 'Fifth commit message\\\n This is the 5th log message'\n" hg log -l1 -v | sed -n '/description/,$p' echo