##// END OF EJS Templates
changegroup: move file matcher from narrow extension...
changegroup: move file matcher from narrow extension Sparse changegroup generation requires the use of a matcher to filter which files are relevant. This commit moves the file matcher from the narrow extension to core and updates the narrow extension to use it. I'm not sure why the narrow extension was storing the matcher as a callable that resolved to a matcher. So I changed it to be a simple matcher instance. In addition, code from narrow to intersect the matcher with the local narrow spec is now performed automatically when the changegroup packer is created. If a matcher is not passed into getbundler() an alwaysmatcher() is assumed. This ensures that a matcher is always defined for all operations. Differential Revision: https://phab.mercurial-scm.org/D4011

File last commit:

r34868:7f183c64 default
r38818:9c057acb default
Show More
test-rebase-brute-force.t
56 lines | 1.1 KiB | text/troff | Tads3Lexer
/ tests / test-rebase-brute-force.t
Jun Wu
test-rebase: add a brute force test...
r33674 $ cat >> $HGRCPATH <<EOF
> [extensions]
> drawdag=$TESTDIR/drawdag.py
> bruterebase=$TESTDIR/bruterebase.py
> [experimental]
Boris Feld
config: use 'experimental.evolution.create-markers'...
r34867 > evolution.createmarkers=True
Boris Feld
config: use 'experimental.evolution.allowunstable'...
r34868 > evolution.allowunstable=True
Jun Wu
test-rebase: add a brute force test...
r33674 > EOF
$ init() {
> N=`expr ${N:-0} + 1`
> cd $TESTTMP && hg init repo$N && cd repo$N
> hg debugdrawdag
> }
Source looks like "N"
$ init <<'EOS'
> C D
> |\|
> A B Z
> EOS
$ hg debugbruterebase 'all()-Z' Z
A: A':Z
B: B':Z
AB: A':Z B':Z
Jun Wu
rebase: change "result would have 3 parent" error message (BC)...
r33786 C: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents
Jun Wu
test-rebase: add a brute force test...
r33674 AC: A':Z C':A'B
BC: B':Z C':B'A
ABC: A':Z B':Z C':A'B'
D: D':Z
AD: A':Z D':Z
BD: B':Z D':B'
ABD: A':Z B':Z D':B'
Jun Wu
rebase: change "result would have 3 parent" error message (BC)...
r33786 CD: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents
Jun Wu
rebase: rewrite core algorithm (issue5578) (issue5630)...
r33783 ACD: A':Z C':A'B D':Z
Jun Wu
test-rebase: add a brute force test...
r33674 BCD: B':Z C':B'A D':B'
ABCD: A':Z B':Z C':A'B' D':B'
Moving backwards
$ init <<'EOS'
> C
> |\
> A B
> |
> Z
> EOS
$ hg debugbruterebase 'all()-Z' Z
B: B':Z
A:
BA: B':Z
Jun Wu
rebase: change "result would have 3 parent" error message (BC)...
r33786 C: ABORT: cannot rebase 3:b8d7149b562b without moving at least one of its parents
Jun Wu
test-rebase: add a brute force test...
r33674 BC: B':Z C':B'A
AC:
Jun Wu
rebase: rewrite core algorithm (issue5578) (issue5630)...
r33783 BAC: B':Z C':B'A