view tests/test-convert-svn-startrev.out @ 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.

% initial svn import
Adding         projA/trunk
Adding         projA/branches
Adding         projA/tags

Committed revision 1.
% update svn repository
A    A/trunk
A    A/branches
A    A/tags
Checked out revision 1.
A         trunk/a
A         trunk/b
Adding         trunk/a
Adding         trunk/b
Transmitting file data ..
Committed revision 2.
D         trunk/b
Deleting       trunk/b

Committed revision 3.
At revision 3.
Sending        trunk/a
Transmitting file data .
Committed revision 4.
% branch
At revision 4.
A         branches/branch1
Adding         branches/branch1
Sending        branches/branch1/a
Transmitting file data .
Committed revision 5.
A         branches/branch1/c
Sending        branches/branch1/a
Adding         branches/branch1/c
Transmitting file data ..
Committed revision 6.
At revision 6.
% convert before branching point
initializing destination A-r3-hg repository
scanning source...
sorting...
converting...
3 removeb
2 changeaa
1 branch, changeaaa
0 addc,changeaaaa
o  3 addc,changeaaaa files: a c
|
o  2 branch, changeaaa files: a
|
o  1 changeaa files: a
|
o  0 removeb files: a


% convert before branching point
initializing destination A-r4-hg repository
scanning source...
sorting...
converting...
2 changeaa
1 branch, changeaaa
0 addc,changeaaaa
o  2 addc,changeaaaa files: a c
|
o  1 branch, changeaaa files: a
|
o  0 changeaa files: a


% convert at branching point
initializing destination A-r5-hg repository
scanning source...
sorting...
converting...
1 branch, changeaaa
0 addc,changeaaaa
o  1 addc,changeaaaa files: a c
|
o  0 branch, changeaaa files: a


% convert last revision only
initializing destination A-r6-hg repository
scanning source...
sorting...
converting...
0 addc,changeaaaa
o  0 addc,changeaaaa files: a c