##// 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.
Patrick Mezard - - Load All Authors

File last commit:

r6479:31abcae3 default
r7177:09ed32b7 default
Show More
test-hgignore
71 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-hgignore
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init
# Test issue 562: .hgignore requires newline at end
touch foo
touch bar
touch baz
cat > makeignore.py <<EOF
f = open(".hgignore", "w")
f.write("ignore\n")
f.write("foo\n")
# No EOL here
f.write("bar")
f.close()
EOF
python makeignore.py
echo % should display baz only
hg status
rm foo bar baz .hgignore makeignore.py
touch a.o
touch a.c
touch syntax
mkdir dir
touch dir/a.o
touch dir/b.o
touch dir/c.o
hg add dir/a.o
hg commit -m 0
hg add dir/b.o
echo "--" ; hg status
echo "*.o" > .hgignore
echo "--" ; hg status 2>&1 | sed -e 's/abort: .*\.hgignore:/abort: .hgignore:/'
echo ".*\.o" > .hgignore
echo "--" ; hg status
# Check it does not ignore the current directory '.'
echo "^\." > .hgignore
echo "--" ; hg status
echo "glob:**.o" > .hgignore
echo "--" ; hg status
echo "glob:*.o" > .hgignore
echo "--" ; hg status
echo "syntax: glob" > .hgignore
echo "re:.*\.o" >> .hgignore
echo "--" ; hg status
echo "syntax: invalid" > .hgignore
echo "--" ; hg status 2>&1 | sed -e 's/.*\.hgignore:/.hgignore:/'
echo "syntax: glob" > .hgignore
echo "*.o" >> .hgignore
echo "--" ; hg status
echo "relglob:syntax*" > .hgignore
echo "--" ; hg status
echo "relglob:*" > .hgignore
echo "--" ; hg status
cd dir
echo "--" ; hg status .