Mercurial > hg
view tests/test-mq-eol @ 9110:561ff8d9e4f0
mq: qpop now tells which patches are popped
When navigating through a patch series by qpushing and qpopping it was easy to
get lost because qpop was silent. I found myself often running qnext after qpop
to see which patch I just dropped - especially if I was about to qrm it. This
patch makes qpop more symmetric to qpush by showing which patches are
applied/"unapplied".
I think it is a good change even though it changes output by adding a new line
of output.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 09 Jul 2009 23:59:03 +0200 |
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