view tests/test-subrepo-relative-path @ 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 <[e-mail]>

#!/bin/sh

echo % Preparing the subrepository 'sub'
hg init sub
echo sub > sub/sub
hg add -R sub
hg commit -R sub -m "sub import"

echo % Preparing the 'main' repo which depends on the subrepo 'sub'
hg init main
echo main > main/main
echo "sub = ../sub" > main/.hgsub
hg clone sub main/sub | sed 's/ .*sub/ ...sub/g'
hg add -R main
hg commit -R main -m "main import"

echo % Cleaning both repositories, just as a clone -U
hg up -C -R sub null
hg up -C -R main null
rm -rf main/sub

echo % Serving them both using hgweb
printf '[paths]\n/main = main\nsub = sub\n' > webdir.conf
hg serve --webdir-conf webdir.conf -a localhost -p $HGPORT \
   -A /dev/null -E /dev/null --pid-file hg.pid -d
cat hg.pid >> $DAEMON_PIDS

echo % Clone main from hgweb
hg clone "http://localhost:$HGPORT/main" cloned | sed 's/ .*sub/ ...sub/g' 

echo % Checking cloned repo ids
hg id -R cloned
hg id -R cloned/sub

echo % subrepo debug for 'main' clone
hg debugsub -R cloned

"$TESTDIR/killdaemons.py"

exit 0