view tests/test-hardlinks-safety @ 7177:09ed32b79656

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.
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 19 Oct 2008 16:31:24 +0200
parents 7e5e13bee8f4
children
line wrap: on
line source

#!/bin/sh

# some implementations of cp can't create hardlinks
cat > cp.py <<EOF
from mercurial import util
import sys
util.copyfiles(sys.argv[1], sys.argv[2], hardlink=True)
EOF

# test hardlinking outside hg
mkdir x
echo foo > x/a

python cp.py x y
echo bar >> y/a
echo % no diff if hardlink
diff x/a y/a

# test mq hardlinking
echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH

echo % init
hg init a
cd a

hg qimport -n foo - << EOF
# HG changeset patch
# Date 1 0
diff -r 2588a8b53d66 a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/a	Wed Jul 23 15:54:29 2008 +0200
@@ -0,0 +1,1 @@
+a
EOF

hg qpush

cd ..
python cp.py a b
cd b

hg qimport -n bar - << EOF
# HG changeset patch
# Date 2 0
diff -r 2588a8b53d66 a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/b	Wed Jul 23 15:54:29 2008 +0200
@@ -0,0 +1,1 @@
+b
EOF

hg qpush

cat .hg/patches/status
echo %
cat .hg/patches/series
echo %%%
cat ../a/.hg/patches/status
echo %
cat ../a/.hg/patches/series

# test tags hardlinking
hg qdel -r qbase:qtip

hg tag -l lfoo
hg tag foo

cd ..
python cp.py b c
cd c

hg tag -l -r 0 lbar
hg tag -r 0 bar
echo %%%
cat .hgtags
echo %
cat .hg/localtags
echo %%%
cat ../b/.hgtags
echo %
cat ../b/.hg/localtags