Mercurial > hg
view tests/test-walk @ 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 | cfb4a51da7d5 |
children |
line wrap: on
line source
#!/bin/sh debugwalk() { echo "hg debugwalk $@" hg debugwalk "$@" echo } chdir() { echo "cd $@" cd "$@" echo } mkdir t cd t hg init mkdir -p beans for b in kidney navy turtle borlotti black pinto; do echo $b > beans/$b done mkdir -p mammals/Procyonidae for m in cacomistle coatimundi raccoon; do echo $m > mammals/Procyonidae/$m done echo skunk > mammals/skunk echo fennel > fennel echo fenugreek > fenugreek echo fiddlehead > fiddlehead echo glob:glob > glob:glob hg addremove hg commit -m "commit #0" -d "1000000 0" debugwalk debugwalk -I. chdir mammals debugwalk debugwalk -X ../beans debugwalk -I '*k' debugwalk -I 'glob:*k' debugwalk -I 'relglob:*k' debugwalk -I 'relglob:*k' . debugwalk -I 're:.*k$' debugwalk -I 'relre:.*k$' debugwalk -I 'path:beans' debugwalk -I 'relpath:../beans' debugwalk . debugwalk -I. debugwalk Procyonidae chdir Procyonidae debugwalk . debugwalk .. chdir .. debugwalk ../beans debugwalk . debugwalk .hg debugwalk ../.hg chdir .. debugwalk -Ibeans debugwalk -I '{*,{b,m}*/*}k' debugwalk 'glob:mammals/../beans/b*' debugwalk '-X*/Procyonidae' mammals debugwalk path:mammals debugwalk .. debugwalk beans/../.. debugwalk .hg debugwalk beans/../.hg debugwalk beans/../.hg/data debugwalk beans/.hg # Don't know how to test absolute paths without always getting a false # error. #debugwalk `pwd`/beans #debugwalk `pwd`/.. debugwalk glob:\* debugwalk 'glob:**e' debugwalk 're:.*[kb]$' debugwalk path:beans/black debugwalk path:beans//black debugwalk relglob:Procyonidae debugwalk 'relglob:Procyonidae/**' debugwalk 'relglob:Procyonidae/**' fennel debugwalk beans 'glob:beans/*' debugwalk 'glob:mamm**' debugwalk 'glob:mamm**' fennel debugwalk 'glob:j*' debugwalk NOEXIST mkfifo fifo debugwalk fifo rm fenugreek debugwalk fenugreek hg rm fenugreek debugwalk fenugreek touch new debugwalk new mkdir ignored touch ignored/file echo '^ignored$' > .hgignore debugwalk ignored debugwalk ignored/file chdir .. debugwalk -R t t/mammals/skunk mkdir t2 chdir t2 debugwalk -R ../t ../t/mammals/skunk debugwalk --cwd ../t mammals/skunk