Mercurial > hg
view tests/test-mactext @ 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 | 6c82beaaa11a |
children |
line wrap: on
line source
#!/bin/sh cat > unix2mac.py <<EOF import sys for path in sys.argv[1:]: data = file(path, 'rb').read() data = data.replace('\n', '\r') file(path, 'wb').write(data) EOF cat > print.py <<EOF import sys print(sys.stdin.read().replace('\n', '<LF>').replace('\r', '<CR>').replace('\0', '<NUL>')) EOF hg init echo '[hooks]' >> .hg/hgrc echo 'pretxncommit.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc echo 'pretxnchangegroup.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc cat .hg/hgrc echo echo hello > f hg add f hg ci -m 1 echo python unix2mac.py f hg ci -m 2 hg cat f | python print.py cat f | python print.py