Mercurial > hg
view tests/test-mq-eol @ 11715:4f9dfb54c8b5 stable
qpush --move: move the right patch even with comment lines
88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.
Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.
Original patch contributed by Mads Kiilerich <mads@kiilerich.com>
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Sat, 10 Jul 2010 21:23:00 +0200 |
parents | 9c2c94934f0d |
children |
line wrap: on
line source
#!/bin/sh # Test interactions between mq and patch.eol echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH echo "[diff]" >> $HGRCPATH echo "nodates=1" >> $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