view tests/test-convert-svn-tags.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/branches
Adding         projA/tags
Adding         projA/trunk
Adding         projA/unrelated
Committed revision 1.
% update svn repository
A    A/trunk
A    A/unrelated
A    A/branches
A    A/tags
Checked out revision 1.
A         trunk/a
Adding         trunk/a
Transmitting file data .
Committed revision 2.
Sending        trunk/a
Transmitting file data .
Committed revision 3.
Sending        trunk/a
Transmitting file data .
Committed revision 4.
A         unrelated/dummy
Adding         unrelated/dummy
Transmitting file data .
Committed revision 5.
% tag current revision
At revision 5.
A         tags/trunk.v1
A         tags/trunk.badtag
Adding         tags/trunk.badtag
Adding         tags/trunk.v1

Committed revision 6.
Sending        trunk/a
Transmitting file data .
Committed revision 7.
% fix the bad tag
At revision 7.
A         tags/trunk.goodtag
D         tags/trunk.badtag/a
D         tags/trunk.badtag
Deleting       tags/trunk.badtag
Adding         tags/trunk.goodtag

Committed revision 8.
% convert
initializing destination A-hg repository
scanning source...
sorting...
converting...
4 init projA
3 adda
2 changea
1 changea2
0 changea3
updating tags
o  5 update tags tags: tip
|
o  4 changea3 tags:
|
o  3 changea2 tags: trunk.v1 trunk.goodtag
|
o  2 changea tags:
|
o  1 adda tags:
|
o  0 init projA tags:

tip
trunk.v1
trunk.goodtag
% convert without tags
initializing destination A-notags-hg repository
scanning source...
sorting...
converting...
4 init projA
3 adda
2 changea
1 changea2
0 changea3
tip