annotate tests/test-pull-http @ 7785:660c8dd44060

test-merge-tool: Make sure no hgmerge can be found in $PATH

The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.

#!/bin/sh

cp "$TESTDIR"/printenv.py .

hg init test
cd test
echo a > a
hg ci -Ama -d '0 0'

cd ..
hg clone test test2
cd test2
echo a >> a
hg ci -mb -d '0 0'

echo % expect error, cloning not allowed
echo '[web]' > .hg/hgrc
echo 'allowpull = false' >> .hg/hgrc
hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
cat hg.pid >> $DAEMON_PIDS
hg clone http://localhost:$HGPORT/ test3 | sed -e 's,:[0-9][0-9]*/,/,'
"$TESTDIR/killdaemons.py"
echo % serve errors
cat errors.log

req() {
	hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
	cat hg.pid >> $DAEMON_PIDS
	hg --cwd ../test pull http://localhost:$HGPORT/ | sed -e 's,:[0-9][0-9]*/,/,'
	kill `cat hg.pid`
	echo % serve errors
	cat errors.log
}

echo % expect error, pulling not allowed
req