##// END OF EJS Templates
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.

File last commit:

r6873:39b4db2e default
r7177:09ed32b7 default
Show More
test-convert-mtn.out
68 lines | 2.2 KiB | text/plain | TextLexer
/ tests / test-convert-mtn.out
% tedious monotone keys configuration
% create monotone repository
mtn: adding a to workspace manifest
mtn: adding bin to workspace manifest
mtn: adding c to workspace manifest
mtn: adding dir to workspace manifest
mtn: adding dir/b to workspace manifest
mtn: beginning commit on branch 'com.selenic.test'
mtn: committed revision 803ef0bf815e35b951dbd4310acd1e45e675016e
% update monotone working directory
mtn: skipping dir, already accounted for in workspace
mtn: renaming a to dir/a in workspace manifest
mtn: dropping c from workspace manifest
mtn: beginning commit on branch 'com.selenic.test'
mtn: committed revision 4daf60753d6fe21a06ce5f716303fe55fd6d3a56
% convert once
assuming destination repo.mtn-hg
initializing destination repo.mtn-hg repository
scanning source...
sorting...
converting...
1 initialize
0 update1
mtn: adding e to workspace manifest
mtn: dropping dir/b from workspace manifest
mtn: renaming bin to bin2 in workspace manifest
mtn: beginning commit on branch 'com.selenic.test'
mtn: committed revision 6c6977a6ef609ec80e40779f89dbd2772c96de62
mtn: renaming dir to dir2 in workspace manifest
mtn: beginning commit on branch 'com.selenic.test'
mtn: committed revision 5de5abe7c15eae70cf3acdda23c9c319ea50c1af
mtn: beginning commit on branch 'com.selenic.test'
mtn: committed revision 27a423be1e406595cc57f50f42a8790fa0a93d8e
mtn: dropping dir2/dir/subdir/f from workspace manifest
mtn: dropping dir2/dir/subdir from workspace manifest
mtn: dropping dir2/dir/emptydir from workspace manifest
mtn: dropping dir2/dir from workspace manifest
mtn: beginning commit on branch 'com.selenic.test'
mtn: committed revision ba57ba5ac63178529d37fa8a2a1a012fc0e42047
% convert incrementally
assuming destination repo.mtn-hg
scanning source...
sorting...
converting...
3 update2 "with" quotes
2 movedir
1 emptydir
0 dropdirectory
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ 5 "dropdirectory" files: dir2/dir/subdir/f
|
o 4 "emptydir" files: dir2/dir/subdir/f
|
o 3 "movedir" files: dir/a dir2/a
|
o 2 "update2 "with" quotes" files: bin bin2 dir/b e
|
o 1 "update1" files: a bin c dir/a dir/b
|
o 0 "initialize" files: a bin c dir/b
% manifest
bin2
dir2/a
e
% contents
a
a