view tests/test-convert-svn-source.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.

# now tests that it works with trunk/tags layout, but no branches yet

% initial svn import
Adding         projB/trunk
Adding         projB/tags

Committed revision 1.
% update svn repository
Checked out revision 1.
A         letter .txt
Adding         letter .txt
Transmitting file data .
Committed revision 2.
Sending        letter .txt
Transmitting file data .
Committed revision 3.

Committed revision 4.
Sending        letter .txt
Transmitting file data .
Committed revision 5.
% convert to hg once
initializing destination B-hg repository
scanning source...
sorting...
converting...
3 init projB
2 hello
1 world
0 nice day
updating tags
% update svn repository again
A         letter2.txt
Sending        letter .txt
Adding         letter2.txt
Transmitting file data ..
Committed revision 6.

Committed revision 7.
Sending        letter2.txt
Transmitting file data .
Committed revision 8.
% test incremental conversion
scanning source...
sorting...
converting...
1 second letter
0 work in progress
updating tags
o  7 update tags files: .hgtags
|
o  6 work in progress files: letter2.txt
|
o  5 second letter files: letter .txt letter2.txt
|
o  4 update tags files: .hgtags
|
o  3 nice day files: letter .txt
|
o  2 world files: letter .txt
|
o  1 hello files: letter .txt
|
o  0 init projB files:

tip
v0.2
v0.1
% test filemap
initializing destination fmap repository
scanning source...
sorting...
converting...
5 init projB
4 hello
3 world
2 nice day
1 second letter
0 work in progress
o  1 work in progress files: letter2.txt
|
o  0 second letter files: letter2.txt

% test stop revision
initializing destination stoprev repository
scanning source...
sorting...
converting...
0 init projB
extra:       branch=
extra:       convert_revision=