Mercurial > hg
view tests/test-mq-eol @ 10092:f1bf64abcb1b stable
doc/Makefile: Fix rst2html detection
Displaying the output from the failing call to "which" didn't prevent
make from doing stupid things later. We now only search for "rst2html"
and fallback to "rst2html.py". If neither name is found, make will
eventually abort when we try to use $(RST2HTML).
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 16 Dec 2009 23:59:50 +0100 |
parents | 8b35b08724eb |
children | ea7c392f2b08 |
line wrap: on
line source
#!/bin/sh # Test interactions between mq and patch.eol echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH cat > makepatch.py <<EOF f = file('eol.diff', 'wb') w = f.write w('test message\n') w('diff --git a/a b/a\n') w('--- a/a\n') w('+++ b/a\n') w('@@ -1,5 +1,5 @@\n') w(' a\n') w('-b\r\n') w('+y\r\n') w(' c\r\n') w(' d\n') w('-e\n') w('\ No newline at end of file\n') w('+z\r\n') w('\ No newline at end of file\r\n') EOF cat > cateol.py <<EOF import sys for line in file(sys.argv[1], 'rb'): line = line.replace('\r', '<CR>') line = line.replace('\n', '<LF>') print line EOF hg init repo cd repo echo '\.diff' > .hgignore echo '\.rej' >> .hgignore # Test different --eol values python -c 'file("a", "wb").write("a\nb\nc\nd\ne")' hg ci -Am adda python ../makepatch.py hg qimport eol.diff echo % should fail in strict mode hg qpush hg qpop echo % invalid eol hg --config patch.eol='LFCR' qpush hg qpop echo % force LF hg --config patch.eol='CRLF' qpush hg qrefresh python ../cateol.py .hg/patches/eol.diff python ../cateol.py a hg qpop echo % push again forcing LF and compare revisions hg --config patch.eol='CRLF' qpush python ../cateol.py a hg qpop echo % push again without LF and compare revisions hg qpush python ../cateol.py a hg qpop