Mercurial > hg
view tests/test-hgweb-diffs @ 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 | ffda19f351fa |
children |
line wrap: on
line source
#!/bin/sh echo % setting up repo hg init test cd test echo a > a echo b > b hg ci -Ama echo % change permissions for git diffs chmod 755 a hg ci -Amb echo % set up hgweb hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log cat hg.pid >> $DAEMON_PIDS echo % revision "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0' echo % raw revision "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0' echo % diff removed file "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a' echo % set up hgweb with git diffs "$TESTDIR/killdaemons.py" hg serve --config 'diff.git=1' -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log cat hg.pid >> $DAEMON_PIDS echo % revision "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0' echo % revision "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0' echo % diff removed file "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a' cd .. echo % test import rev as raw-rev hg clone -r0 test test1 cd test1 hg import -q --exact http://localhost:$HGPORT/rev/1 echo % errors cat ../test/errors.log