##// 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:

r3619:8c4fd0de default
r7177:09ed32b7 default
Show More
test-unrelated-pull.out
23 lines | 558 B | text/plain | TextLexer
/ tests / test-unrelated-pull.out
pulling from ../a
searching for changes
abort: repository is unrelated
pulling from ../a
searching for changes
warning: repository is unrelated
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
changeset: 1:bdcee5d51fa6
tag: tip
parent: -1:000000000000
user: a
date: Mon Jan 12 13:46:40 1970 +0000
summary: a
changeset: 0:f155ba1aa5ba
user: b
date: Mon Jan 12 13:46:40 1970 +0000
summary: b