view tests/test-hgwebdirsym @ 10505:b3311e26f94f stable

merge: fix --preview to show all nodes that will be merged (issue2043).

Formerly, it omitted nodes that were not descendants of the least
common ancestor of the two merge parents, even though those nodes
contribute to the merge.  The new algorithm uses revlog.findmissing()
instead of ancestor() + nodesbetween().

#!/bin/sh
# Tests whether or not hgwebdir properly handles various symlink topologies.

"$TESTDIR/hghave" symlink || exit 80

hg init a
echo a > a/a
hg --cwd a ci -Ama -d'1 0'

mkdir webdir
cd webdir

hg init b
echo b > b/b
hg --cwd b ci -Amb -d'2 0'

hg init c
echo c > c/c
hg --cwd c ci -Amc -d'3 0'

ln -s ../a al
ln -s ../webdir circle

root=`pwd`

cd ..

cat > collections.conf <<EOF
[collections]
$root=$root
EOF

hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \
    -A access-collections.log -E error-collections.log
cat hg.pid >> $DAEMON_PIDS

echo % should succeed
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?style=raw'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/al/file/tip/a?style=raw'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/b/file/tip/b?style=raw'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/c/file/tip/c?style=raw'

echo % should fail
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/circle/al/file/tip/a?style=raw'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/circle/b/file/tip/a?style=raw'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/circle/c/file/tip/a?style=raw'

echo % collections errors
cat error-collections.log