view tests/test-rebase-collapse.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.

@  7: H
|
| o  6: G
|/|
o |  5: F
| |
| o  4: E
|/
| o  3: D
| |
| o  2: C
| |
| o  1: B
|/
o  0: A

% Rebasing
3 files updated, 0 files merged, 2 files removed, 0 files unresolved
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 5 changesets with 6 changes to 6 files (+1 heads)
rebase completed
@  5: Collapsed revision
|  * B
|  * C
|  * D
o  4: H
|
| o  3: G
|/|
o |  2: F
| |
| o  1: E
|/
o  0: A

% Rebasing
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
rebase completed
@  6: Collapsed revision
|  * E
|  * G
o  5: H
|
o  4: F
|
| o  3: D
| |
| o  2: C
| |
| o  1: B
|/
o  0: A

@  7: H
|
| o    6: G
| |\
| | o  5: F
| | |
| | o  4: E
| | |
| o |  3: D
| |\|
| o |  2: C
|/ /
| o  1: B
|/
o  0: A


% Rebase and collapse - more than one external (fail)
abort: unable to collapse, there is more than one external parent

% Rebase and collapse
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 3 changes to 3 files
rebase completed
@    5: Collapsed revision
|\   * E
| |  * F
| |  * G
| o  4: H
| |
o |    3: D
|\ \
| o |  2: C
| |/
o /  1: B
|/
o  0: A