##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

mq: Fix --qrefresh --short to work with --exclude and --include...
mq: Fix --qrefresh --short to work with --exclude and --include pmezard expects hg qref -s -X b to apply the -X to the list of files in the patch, and thus remove b from the patch. That's how it worked before f7fc5f5ecd62. That change seemed sensible, but it wasn't... mpm says (17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ? (17:22:54) pmezard_: kiilerix1: and --include too (17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar so mpm expects hg qref -s -X b * to apply the -X to the list of files in the working directory, and thus don't include b in the patch This patch tries to make both usecases work by creating a matchfn which uses the include/excludes but not the filelist.
Eric Hopper - - Load All Authors

File last commit:

r6341:63bdfcc3 default
r7177:09ed32b7 default
Show More
test-hgwebdirsym
49 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-hgwebdirsym
History | Annotation | Raw |Copy content |Copy permalink
#!/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