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.

hgext/mq.py

@@ -1076,7 +1076,6 b' class queue:'
 
             if opts.get('git'):
                 self.diffopts().git = True
-            matchfn = cmdutil.match(repo, pats, opts)
             tip = repo.changelog.tip()
             if top == tip:
                 # if the top of our patch queue is also the tip, there is an
@@ -1086,7 +1085,7 b' class queue:'
                 # changed to speed up the diff
                 #
                 # in short mode, we only diff the files included in the
-                # patch already
+                # patch already plus specified files
                 #
                 # this should really read:
                 #   mm, dd, aa, aa2 = repo.status(tip, patchparent)[:4]
@@ -1097,10 +1096,13 b' class queue:'
                 changes = repo.changelog.read(tip)
                 man = repo.manifest.read(changes[0])
                 aaa = aa[:]
+                matchfn = cmdutil.match(repo, pats, opts)
                 if opts.get('short'):
-                    # if amending a patch, we always match already-in-patch files
+                    # if amending a patch, we start with existing
+                    # files plus specified files - unfiltered
                     match = cmdutil.matchfiles(repo, mm + aa + dd + matchfn.files())
-                    matchfn = match # FIXME: Why have two matchers if we only need one?
+                    # filter with inc/exl options
+                    matchfn = cmdutil.match(repo, opts=opts)
                 else:
                     match = cmdutil.matchall(repo)
                 m, a, r, d = repo.status(match=match)[:4]

tests/test-mq-qrefresh

@@ -83,28 +83,44 b' cat .hg/patches/mqbase | \\'
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
-echo % qrefresh --short
+echo
+echo % qrefresh --short tests:
 echo 'orphan' > orphanchild
 hg add orphanchild
-hg qrefresh nonexistingfilename
+
+echo % - add 1/base and 2/base one by one
+hg qrefresh nonexistingfilename # clear patch
 hg qrefresh --short 1/base
 hg qrefresh --short 2/base
 
-echo % qdiff
+echo % -- qdiff output
 hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
                -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
-echo % patch file contents
+echo % -- patch file content
 cat .hg/patches/mqbase | \
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
+hg st
 
-echo % diff shows orphan ...
-hg st
+echo % -- diff shows what is not in patch
 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
               -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" \
               -e "s/^\(diff\).*/\1/"
-
+echo % - before starting exclusive tests
+sed -n '/^diff/s/diff -r [^ ]* //p' .hg/patches/mqbase
+echo % - exclude 2/base
+hg qref -s -X 2/base
+sed -n '/^diff/s/diff -r [^ ]* //p' .hg/patches/mqbase
+echo % -- status shows 2/base as dirty
+hg st
+echo % - remove 1/base and add 2/base again but not orphanchild
+hg qref -s -X orphanchild -X 1/base 2/base orphanchild
+sed -n '/^diff/s/diff -r [^ ]* //p' .hg/patches/mqbase
+echo % - add 1/base with include filter - and thus remove 2/base from patch
+hg qref -s -I 1/ o* */*
+sed -n '/^diff/s/diff -r [^ ]* //p' .hg/patches/mqbase
+echo
 cd ..
 
 

tests/test-mq-qrefresh.out

@@ -159,8 +159,10 b' diff -r b55ecdccb5cf 2/base'
 @@ -1,1 +1,1 @@
 -base
 +patched
-% qrefresh --short
-% qdiff
+
+% qrefresh --short tests:
+% - add 1/base and 2/base one by one
+% -- qdiff output
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
@@ -178,7 +180,7 b' diff -r b55ecdccb5cf orphanchild'
 +++ b/orphanchild
 @@ -0,0 +1,1 @@
 +orphan
-% patch file contents
+% -- patch file content
 mqbase
 
 diff -r b55ecdccb5cf 1/base
@@ -193,14 +195,28 b' diff -r b55ecdccb5cf 2/base'
 @@ -1,1 +1,1 @@
 -base
 +patched
-% diff shows orphan ...
 A orphanchild
 ? base
+% -- diff shows what is not in patch
 diff
 --- /dev/null
 +++ b/orphanchild
 @@ -0,0 +1,1 @@
 +orphan
+% - before starting exclusive tests
+1/base
+2/base
+% - exclude 2/base
+1/base
+% -- status shows 2/base as dirty
+M 2/base
+A orphanchild
+? base
+% - remove 1/base and add 2/base again but not orphanchild
+2/base
+% - add 1/base with include filter - and thus remove 2/base from patch
+1/base
+
 % create test repo
 adding a
 % capture changes