Mercurial > hg
view tests/test-http @ 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 | 1a8df80dfdde |
children |
line wrap: on
line source
#!/bin/sh cp "$TESTDIR"/printenv.py . hg init test cd test echo foo>foo mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg echo foo>foo.d/foo echo bar>foo.d/bAr.hg.d/BaR echo bar>foo.d/baR.d.hg/bAR hg commit -A -m 1 hg serve -p $HGPORT -d --pid-file=../hg1.pid hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid # Test server address cannot be reused hg serve -p $HGPORT1 2>&1 | sed -e "s/abort: cannot start server at ':$HGPORT1':.*/abort: cannot start server at ':\$HGPORT1':/" cd .. cat hg1.pid hg2.pid >> $DAEMON_PIDS echo % clone via stream hg clone --uncompressed http://localhost:$HGPORT/ copy 2>&1 | \ sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/' hg verify -R copy echo % try to clone via stream, should use pull instead hg clone --uncompressed http://localhost:$HGPORT1/ copy2 echo % clone via pull hg clone http://localhost:$HGPORT1/ copy-pull hg verify -R copy-pull cd test echo bar > bar hg commit -A -d '1 0' -m 2 cd .. echo % pull cd copy-pull echo '[hooks]' >> .hg/hgrc echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc hg pull | sed -e "s,:$HGPORT1/,:\$HGPORT1/," cd ..