Mercurial > evolve
comparison tests/test-stablerange.t @ 2232:6b95bcc402fe
debugstablerange: add a --verify flag to the command
This should help us finding bugs.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Fri, 24 Mar 2017 10:22:38 +0100 |
parents | f872738bb5b3 |
children | 7c78b0c482a1 |
comparison
equal
deleted
inserted
replaced
2231:f872738bb5b3 | 2232:6b95bcc402fe |
---|---|
14 ================== | 14 ================== |
15 | 15 |
16 $ hg init repo_linear | 16 $ hg init repo_linear |
17 $ cd repo_linear | 17 $ cd repo_linear |
18 $ hg debugbuilddag '.+6' | 18 $ hg debugbuilddag '.+6' |
19 $ hg debugstablerange --verbose --subranges --rev 1 | 19 $ hg debugstablerange --verify --verbose --subranges --rev 1 |
20 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 20 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
21 1ea73414a91b-0 (0, 1, 1) - | 21 1ea73414a91b-0 (0, 1, 1) [leaf] - |
22 66f7d451a68b-1 (1, 2, 1) - | 22 66f7d451a68b-1 (1, 2, 1) [leaf] - |
23 $ hg debugstablerange --verbose --subranges --rev 1 > 1.range | 23 $ hg debugstablerange --verify --verbose --subranges --rev 1 > 1.range |
24 | 24 |
25 bigger subset reuse most of the previous one | 25 bigger subset reuse most of the previous one |
26 | 26 |
27 $ hg debugstablerange --verbose --subranges --rev 4 | 27 $ hg debugstablerange --verify --verbose --subranges --rev 4 |
28 bebd167eb94d-0 (4, 5, 5) - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) | 28 bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
29 2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 29 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
30 2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 30 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
31 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 31 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
32 01241442b3c2-2 (2, 3, 1) - | 32 01241442b3c2-2 (2, 3, 1) [leaf] - |
33 1ea73414a91b-0 (0, 1, 1) - | 33 1ea73414a91b-0 (0, 1, 1) [leaf] - |
34 2dc09a01254d-3 (3, 4, 1) - | 34 2dc09a01254d-3 (3, 4, 1) [leaf] - |
35 66f7d451a68b-1 (1, 2, 1) - | 35 66f7d451a68b-1 (1, 2, 1) [leaf] - |
36 bebd167eb94d-4 (4, 5, 1) - | 36 bebd167eb94d-4 (4, 5, 1) [leaf] - |
37 $ hg debugstablerange --verbose --subranges --rev 4 > 4.range | 37 $ hg debugstablerange --verify --verbose --subranges --rev 4 > 4.range |
38 $ diff -u 1.range 4.range | 38 $ diff -u 1.range 4.range |
39 --- 1.range * (glob) | 39 --- 1.range * (glob) |
40 +++ 4.range * (glob) | 40 +++ 4.range * (glob) |
41 @@ -1,3 +1,9 @@ | 41 @@ -1,3 +1,9 @@ |
42 +bebd167eb94d-0 (4, 5, 5) - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) | 42 +bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
43 +2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 43 +2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
44 +2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 44 +2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
45 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 45 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
46 +01241442b3c2-2 (2, 3, 1) - | 46 +01241442b3c2-2 (2, 3, 1) [leaf] - |
47 1ea73414a91b-0 (0, 1, 1) - | 47 1ea73414a91b-0 (0, 1, 1) [leaf] - |
48 +2dc09a01254d-3 (3, 4, 1) - | 48 +2dc09a01254d-3 (3, 4, 1) [leaf] - |
49 66f7d451a68b-1 (1, 2, 1) - | 49 66f7d451a68b-1 (1, 2, 1) [leaf] - |
50 +bebd167eb94d-4 (4, 5, 1) - | 50 +bebd167eb94d-4 (4, 5, 1) [leaf] - |
51 [1] | 51 [1] |
52 | 52 |
53 Using a range not ending on 2**N boundary | 53 Using a range not ending on 2**N boundary |
54 we fall back on 2**N as much as possible | 54 we fall back on 2**N as much as possible |
55 | 55 |
56 $ hg debugstablerange --verbose --subranges --rev 5 | 56 $ hg debugstablerange --verify --verbose --subranges --rev 5 |
57 c8d03c1b5e94-0 (5, 6, 6) - 2dc09a01254d-0 (3, 4, 4), c8d03c1b5e94-4 (5, 6, 2) | 57 c8d03c1b5e94-0 (5, 6, 6) [complete] - 2dc09a01254d-0 (3, 4, 4), c8d03c1b5e94-4 (5, 6, 2) |
58 2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 58 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
59 2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 59 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
60 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 60 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
61 c8d03c1b5e94-4 (5, 6, 2) - bebd167eb94d-4 (4, 5, 1), c8d03c1b5e94-5 (5, 6, 1) | 61 c8d03c1b5e94-4 (5, 6, 2) [complete] - bebd167eb94d-4 (4, 5, 1), c8d03c1b5e94-5 (5, 6, 1) |
62 01241442b3c2-2 (2, 3, 1) - | 62 01241442b3c2-2 (2, 3, 1) [leaf] - |
63 1ea73414a91b-0 (0, 1, 1) - | 63 1ea73414a91b-0 (0, 1, 1) [leaf] - |
64 2dc09a01254d-3 (3, 4, 1) - | 64 2dc09a01254d-3 (3, 4, 1) [leaf] - |
65 66f7d451a68b-1 (1, 2, 1) - | 65 66f7d451a68b-1 (1, 2, 1) [leaf] - |
66 bebd167eb94d-4 (4, 5, 1) - | 66 bebd167eb94d-4 (4, 5, 1) [leaf] - |
67 c8d03c1b5e94-5 (5, 6, 1) - | 67 c8d03c1b5e94-5 (5, 6, 1) [leaf] - |
68 $ hg debugstablerange --verbose --subranges --rev 5 > 5.range | 68 $ hg debugstablerange --verify --verbose --subranges --rev 5 > 5.range |
69 $ diff -u 4.range 5.range | 69 $ diff -u 4.range 5.range |
70 --- 4.range * (glob) | 70 --- 4.range * (glob) |
71 +++ 5.range * (glob) | 71 +++ 5.range * (glob) |
72 @@ -1,9 +1,11 @@ | 72 @@ -1,9 +1,11 @@ |
73 -bebd167eb94d-0 (4, 5, 5) - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) | 73 -bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
74 +c8d03c1b5e94-0 (5, 6, 6) - 2dc09a01254d-0 (3, 4, 4), c8d03c1b5e94-4 (5, 6, 2) | 74 +c8d03c1b5e94-0 (5, 6, 6) [complete] - 2dc09a01254d-0 (3, 4, 4), c8d03c1b5e94-4 (5, 6, 2) |
75 2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 75 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
76 2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 76 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
77 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 77 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
78 +c8d03c1b5e94-4 (5, 6, 2) - bebd167eb94d-4 (4, 5, 1), c8d03c1b5e94-5 (5, 6, 1) | 78 +c8d03c1b5e94-4 (5, 6, 2) [complete] - bebd167eb94d-4 (4, 5, 1), c8d03c1b5e94-5 (5, 6, 1) |
79 01241442b3c2-2 (2, 3, 1) - | 79 01241442b3c2-2 (2, 3, 1) [leaf] - |
80 1ea73414a91b-0 (0, 1, 1) - | 80 1ea73414a91b-0 (0, 1, 1) [leaf] - |
81 2dc09a01254d-3 (3, 4, 1) - | 81 2dc09a01254d-3 (3, 4, 1) [leaf] - |
82 66f7d451a68b-1 (1, 2, 1) - | 82 66f7d451a68b-1 (1, 2, 1) [leaf] - |
83 bebd167eb94d-4 (4, 5, 1) - | 83 bebd167eb94d-4 (4, 5, 1) [leaf] - |
84 +c8d03c1b5e94-5 (5, 6, 1) - | 84 +c8d03c1b5e94-5 (5, 6, 1) [leaf] - |
85 [1] | 85 [1] |
86 | 86 |
87 Even two unperfect range overlap a lot | 87 Even two unperfect range overlap a lot |
88 | 88 |
89 $ hg debugstablerange --verbose --subranges --rev tip | 89 $ hg debugstablerange --verify --verbose --subranges --rev tip |
90 f69452c5b1af-0 (6, 7, 7) - 2dc09a01254d-0 (3, 4, 4), f69452c5b1af-4 (6, 7, 3) | 90 f69452c5b1af-0 (6, 7, 7) [complete] - 2dc09a01254d-0 (3, 4, 4), f69452c5b1af-4 (6, 7, 3) |
91 2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 91 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
92 f69452c5b1af-4 (6, 7, 3) - c8d03c1b5e94-4 (5, 6, 2), f69452c5b1af-6 (6, 7, 1) | 92 f69452c5b1af-4 (6, 7, 3) [complete] - c8d03c1b5e94-4 (5, 6, 2), f69452c5b1af-6 (6, 7, 1) |
93 2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 93 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
94 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 94 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
95 c8d03c1b5e94-4 (5, 6, 2) - bebd167eb94d-4 (4, 5, 1), c8d03c1b5e94-5 (5, 6, 1) | 95 c8d03c1b5e94-4 (5, 6, 2) [complete] - bebd167eb94d-4 (4, 5, 1), c8d03c1b5e94-5 (5, 6, 1) |
96 01241442b3c2-2 (2, 3, 1) - | 96 01241442b3c2-2 (2, 3, 1) [leaf] - |
97 1ea73414a91b-0 (0, 1, 1) - | 97 1ea73414a91b-0 (0, 1, 1) [leaf] - |
98 2dc09a01254d-3 (3, 4, 1) - | 98 2dc09a01254d-3 (3, 4, 1) [leaf] - |
99 66f7d451a68b-1 (1, 2, 1) - | 99 66f7d451a68b-1 (1, 2, 1) [leaf] - |
100 bebd167eb94d-4 (4, 5, 1) - | 100 bebd167eb94d-4 (4, 5, 1) [leaf] - |
101 c8d03c1b5e94-5 (5, 6, 1) - | 101 c8d03c1b5e94-5 (5, 6, 1) [leaf] - |
102 f69452c5b1af-6 (6, 7, 1) - | 102 f69452c5b1af-6 (6, 7, 1) [leaf] - |
103 $ hg debugstablerange --verbose --subranges --rev tip > tip.range | 103 $ hg debugstablerange --verify --verbose --subranges --rev tip > tip.range |
104 $ diff -u 5.range tip.range | 104 $ diff -u 5.range tip.range |
105 --- 5.range * (glob) | 105 --- 5.range * (glob) |
106 +++ tip.range * (glob) | 106 +++ tip.range * (glob) |
107 @@ -1,5 +1,6 @@ | 107 @@ -1,5 +1,6 @@ |
108 -c8d03c1b5e94-0 (5, 6, 6) - 2dc09a01254d-0 (3, 4, 4), c8d03c1b5e94-4 (5, 6, 2) | 108 -c8d03c1b5e94-0 (5, 6, 6) [complete] - 2dc09a01254d-0 (3, 4, 4), c8d03c1b5e94-4 (5, 6, 2) |
109 +f69452c5b1af-0 (6, 7, 7) - 2dc09a01254d-0 (3, 4, 4), f69452c5b1af-4 (6, 7, 3) | 109 +f69452c5b1af-0 (6, 7, 7) [complete] - 2dc09a01254d-0 (3, 4, 4), f69452c5b1af-4 (6, 7, 3) |
110 2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 110 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
111 +f69452c5b1af-4 (6, 7, 3) - c8d03c1b5e94-4 (5, 6, 2), f69452c5b1af-6 (6, 7, 1) | 111 +f69452c5b1af-4 (6, 7, 3) [complete] - c8d03c1b5e94-4 (5, 6, 2), f69452c5b1af-6 (6, 7, 1) |
112 2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 112 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
113 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 113 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
114 c8d03c1b5e94-4 (5, 6, 2) - bebd167eb94d-4 (4, 5, 1), c8d03c1b5e94-5 (5, 6, 1) | 114 c8d03c1b5e94-4 (5, 6, 2) [complete] - bebd167eb94d-4 (4, 5, 1), c8d03c1b5e94-5 (5, 6, 1) |
115 @@ -9,3 +10,4 @@ | 115 @@ -9,3 +10,4 @@ |
116 66f7d451a68b-1 (1, 2, 1) - | 116 66f7d451a68b-1 (1, 2, 1) [leaf] - |
117 bebd167eb94d-4 (4, 5, 1) - | 117 bebd167eb94d-4 (4, 5, 1) [leaf] - |
118 c8d03c1b5e94-5 (5, 6, 1) - | 118 c8d03c1b5e94-5 (5, 6, 1) [leaf] - |
119 +f69452c5b1af-6 (6, 7, 1) - | 119 +f69452c5b1af-6 (6, 7, 1) [leaf] - |
120 [1] | 120 [1] |
121 | 121 |
122 $ cd .. | 122 $ cd .. |
123 | 123 |
124 Case with merge | 124 Case with merge |
159 | 159 |
160 Each of the linear branch reuse range internally | 160 Each of the linear branch reuse range internally |
161 | 161 |
162 (left branch) | 162 (left branch) |
163 | 163 |
164 $ hg debugstablerange --verbose --subranges --rev 'left~2' | 164 $ hg debugstablerange --verify --verbose --subranges --rev 'left~2' |
165 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 165 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
166 1ea73414a91b-0 (0, 1, 1) - | 166 1ea73414a91b-0 (0, 1, 1) [leaf] - |
167 66f7d451a68b-1 (1, 2, 1) - | 167 66f7d451a68b-1 (1, 2, 1) [leaf] - |
168 $ hg debugstablerange --verbose --subranges --rev 'left~2' > left-2.range | 168 $ hg debugstablerange --verify --verbose --subranges --rev 'left~2' > left-2.range |
169 $ hg debugstablerange --verbose --subranges --rev left | 169 $ hg debugstablerange --verify --verbose --subranges --rev left |
170 2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 170 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
171 2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 171 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
172 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 172 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
173 01241442b3c2-2 (2, 3, 1) - | 173 01241442b3c2-2 (2, 3, 1) [leaf] - |
174 1ea73414a91b-0 (0, 1, 1) - | 174 1ea73414a91b-0 (0, 1, 1) [leaf] - |
175 2dc09a01254d-3 (3, 4, 1) - | 175 2dc09a01254d-3 (3, 4, 1) [leaf] - |
176 66f7d451a68b-1 (1, 2, 1) - | 176 66f7d451a68b-1 (1, 2, 1) [leaf] - |
177 $ hg debugstablerange --verbose --subranges --rev 'left' > left.range | 177 $ hg debugstablerange --verify --verbose --subranges --rev 'left' > left.range |
178 $ diff -u left-2.range left.range | 178 $ diff -u left-2.range left.range |
179 --- left-2.range * (glob) | 179 --- left-2.range * (glob) |
180 +++ left.range * (glob) | 180 +++ left.range * (glob) |
181 @@ -1,3 +1,7 @@ | 181 @@ -1,3 +1,7 @@ |
182 +2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 182 +2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
183 +2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 183 +2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
184 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 184 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
185 +01241442b3c2-2 (2, 3, 1) - | 185 +01241442b3c2-2 (2, 3, 1) [leaf] - |
186 1ea73414a91b-0 (0, 1, 1) - | 186 1ea73414a91b-0 (0, 1, 1) [leaf] - |
187 +2dc09a01254d-3 (3, 4, 1) - | 187 +2dc09a01254d-3 (3, 4, 1) [leaf] - |
188 66f7d451a68b-1 (1, 2, 1) - | 188 66f7d451a68b-1 (1, 2, 1) [leaf] - |
189 [1] | 189 [1] |
190 | 190 |
191 (right branch) | 191 (right branch) |
192 | 192 |
193 $ hg debugstablerange --verbose --subranges --rev right~2 | 193 $ hg debugstablerange --verify --verbose --subranges --rev right~2 |
194 e7bd5218ca15-0 (4, 2, 2) - 1ea73414a91b-0 (0, 1, 1), e7bd5218ca15-1 (4, 2, 1) | 194 e7bd5218ca15-0 (4, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), e7bd5218ca15-1 (4, 2, 1) |
195 1ea73414a91b-0 (0, 1, 1) - | 195 1ea73414a91b-0 (0, 1, 1) [leaf] - |
196 e7bd5218ca15-1 (4, 2, 1) - | 196 e7bd5218ca15-1 (4, 2, 1) [leaf] - |
197 $ hg debugstablerange --verbose --subranges --rev 'right~2' > right-2.range | 197 $ hg debugstablerange --verify --verbose --subranges --rev 'right~2' > right-2.range |
198 $ hg debugstablerange --verbose --subranges --rev right | 198 $ hg debugstablerange --verify --verbose --subranges --rev right |
199 a2f58e9c1e56-0 (6, 4, 4) - e7bd5218ca15-0 (4, 2, 2), a2f58e9c1e56-2 (6, 4, 2) | 199 a2f58e9c1e56-0 (6, 4, 4) [complete] - e7bd5218ca15-0 (4, 2, 2), a2f58e9c1e56-2 (6, 4, 2) |
200 a2f58e9c1e56-2 (6, 4, 2) - 3a367db1fabc-2 (5, 3, 1), a2f58e9c1e56-3 (6, 4, 1) | 200 a2f58e9c1e56-2 (6, 4, 2) [complete] - 3a367db1fabc-2 (5, 3, 1), a2f58e9c1e56-3 (6, 4, 1) |
201 e7bd5218ca15-0 (4, 2, 2) - 1ea73414a91b-0 (0, 1, 1), e7bd5218ca15-1 (4, 2, 1) | 201 e7bd5218ca15-0 (4, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), e7bd5218ca15-1 (4, 2, 1) |
202 1ea73414a91b-0 (0, 1, 1) - | 202 1ea73414a91b-0 (0, 1, 1) [leaf] - |
203 3a367db1fabc-2 (5, 3, 1) - | 203 3a367db1fabc-2 (5, 3, 1) [leaf] - |
204 a2f58e9c1e56-3 (6, 4, 1) - | 204 a2f58e9c1e56-3 (6, 4, 1) [leaf] - |
205 e7bd5218ca15-1 (4, 2, 1) - | 205 e7bd5218ca15-1 (4, 2, 1) [leaf] - |
206 $ hg debugstablerange --verbose --subranges --rev 'right' > right.range | 206 $ hg debugstablerange --verify --verbose --subranges --rev 'right' > right.range |
207 $ diff -u right-2.range right.range | 207 $ diff -u right-2.range right.range |
208 --- right-2.range * (glob) | 208 --- right-2.range * (glob) |
209 +++ right.range * (glob) | 209 +++ right.range * (glob) |
210 @@ -1,3 +1,7 @@ | 210 @@ -1,3 +1,7 @@ |
211 +a2f58e9c1e56-0 (6, 4, 4) - e7bd5218ca15-0 (4, 2, 2), a2f58e9c1e56-2 (6, 4, 2) | 211 +a2f58e9c1e56-0 (6, 4, 4) [complete] - e7bd5218ca15-0 (4, 2, 2), a2f58e9c1e56-2 (6, 4, 2) |
212 +a2f58e9c1e56-2 (6, 4, 2) - 3a367db1fabc-2 (5, 3, 1), a2f58e9c1e56-3 (6, 4, 1) | 212 +a2f58e9c1e56-2 (6, 4, 2) [complete] - 3a367db1fabc-2 (5, 3, 1), a2f58e9c1e56-3 (6, 4, 1) |
213 e7bd5218ca15-0 (4, 2, 2) - 1ea73414a91b-0 (0, 1, 1), e7bd5218ca15-1 (4, 2, 1) | 213 e7bd5218ca15-0 (4, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), e7bd5218ca15-1 (4, 2, 1) |
214 1ea73414a91b-0 (0, 1, 1) - | 214 1ea73414a91b-0 (0, 1, 1) [leaf] - |
215 +3a367db1fabc-2 (5, 3, 1) - | 215 +3a367db1fabc-2 (5, 3, 1) [leaf] - |
216 +a2f58e9c1e56-3 (6, 4, 1) - | 216 +a2f58e9c1e56-3 (6, 4, 1) [leaf] - |
217 e7bd5218ca15-1 (4, 2, 1) - | 217 e7bd5218ca15-1 (4, 2, 1) [leaf] - |
218 [1] | 218 [1] |
219 | 219 |
220 The merge reuse as much of the slicing created for one of the branch | 220 The merge reuse as much of the slicing created for one of the branch |
221 | 221 |
222 $ hg debugstablerange --verbose --subranges --rev merge | 222 $ hg debugstablerange --verify --verbose --subranges --rev merge |
223 5f18015f9110-0 (7, 8, 8) - 2dc09a01254d-0 (3, 4, 4), 5f18015f9110-4 (7, 8, 4) | 223 5f18015f9110-0 (7, 8, 8) [complete] - 2dc09a01254d-0 (3, 4, 4), 5f18015f9110-4 (7, 8, 4) |
224 2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 224 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
225 5f18015f9110-4 (7, 8, 4) - 3a367db1fabc-1 (5, 3, 2), 5f18015f9110-6 (7, 8, 2) | 225 5f18015f9110-4 (7, 8, 4) [complete] - 3a367db1fabc-1 (5, 3, 2), 5f18015f9110-6 (7, 8, 2) |
226 2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 226 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
227 3a367db1fabc-1 (5, 3, 2) - e7bd5218ca15-1 (4, 2, 1), 3a367db1fabc-2 (5, 3, 1) | 227 3a367db1fabc-1 (5, 3, 2) [complete] - e7bd5218ca15-1 (4, 2, 1), 3a367db1fabc-2 (5, 3, 1) |
228 5f18015f9110-6 (7, 8, 2) - a2f58e9c1e56-3 (6, 4, 1), 5f18015f9110-7 (7, 8, 1) | 228 5f18015f9110-6 (7, 8, 2) [complete] - a2f58e9c1e56-3 (6, 4, 1), 5f18015f9110-7 (7, 8, 1) |
229 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 229 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
230 01241442b3c2-2 (2, 3, 1) - | 230 01241442b3c2-2 (2, 3, 1) [leaf] - |
231 1ea73414a91b-0 (0, 1, 1) - | 231 1ea73414a91b-0 (0, 1, 1) [leaf] - |
232 2dc09a01254d-3 (3, 4, 1) - | 232 2dc09a01254d-3 (3, 4, 1) [leaf] - |
233 3a367db1fabc-2 (5, 3, 1) - | 233 3a367db1fabc-2 (5, 3, 1) [leaf] - |
234 5f18015f9110-7 (7, 8, 1) - | 234 5f18015f9110-7 (7, 8, 1) [leaf] - |
235 66f7d451a68b-1 (1, 2, 1) - | 235 66f7d451a68b-1 (1, 2, 1) [leaf] - |
236 a2f58e9c1e56-3 (6, 4, 1) - | 236 a2f58e9c1e56-3 (6, 4, 1) [leaf] - |
237 e7bd5218ca15-1 (4, 2, 1) - | 237 e7bd5218ca15-1 (4, 2, 1) [leaf] - |
238 $ hg debugstablerange --verbose --subranges --rev 'merge' > merge.range | 238 $ hg debugstablerange --verify --verbose --subranges --rev 'merge' > merge.range |
239 $ diff -u left.range merge.range | 239 $ diff -u left.range merge.range |
240 --- left.range * (glob) | 240 --- left.range * (glob) |
241 +++ merge.range * (glob) | 241 +++ merge.range * (glob) |
242 @@ -1,7 +1,15 @@ | 242 @@ -1,7 +1,15 @@ |
243 +5f18015f9110-0 (7, 8, 8) - 2dc09a01254d-0 (3, 4, 4), 5f18015f9110-4 (7, 8, 4) | 243 +5f18015f9110-0 (7, 8, 8) [complete] - 2dc09a01254d-0 (3, 4, 4), 5f18015f9110-4 (7, 8, 4) |
244 2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 244 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
245 +5f18015f9110-4 (7, 8, 4) - 3a367db1fabc-1 (5, 3, 2), 5f18015f9110-6 (7, 8, 2) | 245 +5f18015f9110-4 (7, 8, 4) [complete] - 3a367db1fabc-1 (5, 3, 2), 5f18015f9110-6 (7, 8, 2) |
246 2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 246 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
247 +3a367db1fabc-1 (5, 3, 2) - e7bd5218ca15-1 (4, 2, 1), 3a367db1fabc-2 (5, 3, 1) | 247 +3a367db1fabc-1 (5, 3, 2) [complete] - e7bd5218ca15-1 (4, 2, 1), 3a367db1fabc-2 (5, 3, 1) |
248 +5f18015f9110-6 (7, 8, 2) - a2f58e9c1e56-3 (6, 4, 1), 5f18015f9110-7 (7, 8, 1) | 248 +5f18015f9110-6 (7, 8, 2) [complete] - a2f58e9c1e56-3 (6, 4, 1), 5f18015f9110-7 (7, 8, 1) |
249 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 249 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
250 01241442b3c2-2 (2, 3, 1) - | 250 01241442b3c2-2 (2, 3, 1) [leaf] - |
251 1ea73414a91b-0 (0, 1, 1) - | 251 1ea73414a91b-0 (0, 1, 1) [leaf] - |
252 2dc09a01254d-3 (3, 4, 1) - | 252 2dc09a01254d-3 (3, 4, 1) [leaf] - |
253 +3a367db1fabc-2 (5, 3, 1) - | 253 +3a367db1fabc-2 (5, 3, 1) [leaf] - |
254 +5f18015f9110-7 (7, 8, 1) - | 254 +5f18015f9110-7 (7, 8, 1) [leaf] - |
255 66f7d451a68b-1 (1, 2, 1) - | 255 66f7d451a68b-1 (1, 2, 1) [leaf] - |
256 +a2f58e9c1e56-3 (6, 4, 1) - | 256 +a2f58e9c1e56-3 (6, 4, 1) [leaf] - |
257 +e7bd5218ca15-1 (4, 2, 1) - | 257 +e7bd5218ca15-1 (4, 2, 1) [leaf] - |
258 [1] | 258 [1] |
259 $ diff -u right.range merge.range | 259 $ diff -u right.range merge.range |
260 --- right.range * (glob) | 260 --- right.range * (glob) |
261 +++ merge.range * (glob) | 261 +++ merge.range * (glob) |
262 @@ -1,7 +1,15 @@ | 262 @@ -1,7 +1,15 @@ |
263 -a2f58e9c1e56-0 (6, 4, 4) - e7bd5218ca15-0 (4, 2, 2), a2f58e9c1e56-2 (6, 4, 2) | 263 -a2f58e9c1e56-0 (6, 4, 4) [complete] - e7bd5218ca15-0 (4, 2, 2), a2f58e9c1e56-2 (6, 4, 2) |
264 -a2f58e9c1e56-2 (6, 4, 2) - 3a367db1fabc-2 (5, 3, 1), a2f58e9c1e56-3 (6, 4, 1) | 264 -a2f58e9c1e56-2 (6, 4, 2) [complete] - 3a367db1fabc-2 (5, 3, 1), a2f58e9c1e56-3 (6, 4, 1) |
265 -e7bd5218ca15-0 (4, 2, 2) - 1ea73414a91b-0 (0, 1, 1), e7bd5218ca15-1 (4, 2, 1) | 265 -e7bd5218ca15-0 (4, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), e7bd5218ca15-1 (4, 2, 1) |
266 +5f18015f9110-0 (7, 8, 8) - 2dc09a01254d-0 (3, 4, 4), 5f18015f9110-4 (7, 8, 4) | 266 +5f18015f9110-0 (7, 8, 8) [complete] - 2dc09a01254d-0 (3, 4, 4), 5f18015f9110-4 (7, 8, 4) |
267 +2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 267 +2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
268 +5f18015f9110-4 (7, 8, 4) - 3a367db1fabc-1 (5, 3, 2), 5f18015f9110-6 (7, 8, 2) | 268 +5f18015f9110-4 (7, 8, 4) [complete] - 3a367db1fabc-1 (5, 3, 2), 5f18015f9110-6 (7, 8, 2) |
269 +2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 269 +2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
270 +3a367db1fabc-1 (5, 3, 2) - e7bd5218ca15-1 (4, 2, 1), 3a367db1fabc-2 (5, 3, 1) | 270 +3a367db1fabc-1 (5, 3, 2) [complete] - e7bd5218ca15-1 (4, 2, 1), 3a367db1fabc-2 (5, 3, 1) |
271 +5f18015f9110-6 (7, 8, 2) - a2f58e9c1e56-3 (6, 4, 1), 5f18015f9110-7 (7, 8, 1) | 271 +5f18015f9110-6 (7, 8, 2) [complete] - a2f58e9c1e56-3 (6, 4, 1), 5f18015f9110-7 (7, 8, 1) |
272 +66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 272 +66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
273 +01241442b3c2-2 (2, 3, 1) - | 273 +01241442b3c2-2 (2, 3, 1) [leaf] - |
274 1ea73414a91b-0 (0, 1, 1) - | 274 1ea73414a91b-0 (0, 1, 1) [leaf] - |
275 +2dc09a01254d-3 (3, 4, 1) - | 275 +2dc09a01254d-3 (3, 4, 1) [leaf] - |
276 3a367db1fabc-2 (5, 3, 1) - | 276 3a367db1fabc-2 (5, 3, 1) [leaf] - |
277 +5f18015f9110-7 (7, 8, 1) - | 277 +5f18015f9110-7 (7, 8, 1) [leaf] - |
278 +66f7d451a68b-1 (1, 2, 1) - | 278 +66f7d451a68b-1 (1, 2, 1) [leaf] - |
279 a2f58e9c1e56-3 (6, 4, 1) - | 279 a2f58e9c1e56-3 (6, 4, 1) [leaf] - |
280 e7bd5218ca15-1 (4, 2, 1) - | 280 e7bd5218ca15-1 (4, 2, 1) [leaf] - |
281 [1] | 281 [1] |
282 $ cd .. | 282 $ cd .. |
283 | 283 |
284 slice create multiple heads | 284 slice create multiple heads |
285 --------------------------- | 285 --------------------------- |
330 | 330 |
331 Each of the linear branch reuse range internally | 331 Each of the linear branch reuse range internally |
332 | 332 |
333 (left branch) | 333 (left branch) |
334 | 334 |
335 $ hg debugstablerange --verbose --subranges --rev 'left~2' | 335 $ hg debugstablerange --verify --verbose --subranges --rev 'left~2' |
336 01241442b3c2-0 (2, 3, 3) - 66f7d451a68b-0 (1, 2, 2), 01241442b3c2-2 (2, 3, 1) | 336 01241442b3c2-0 (2, 3, 3) [complete] - 66f7d451a68b-0 (1, 2, 2), 01241442b3c2-2 (2, 3, 1) |
337 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 337 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
338 01241442b3c2-2 (2, 3, 1) - | 338 01241442b3c2-2 (2, 3, 1) [leaf] - |
339 1ea73414a91b-0 (0, 1, 1) - | 339 1ea73414a91b-0 (0, 1, 1) [leaf] - |
340 66f7d451a68b-1 (1, 2, 1) - | 340 66f7d451a68b-1 (1, 2, 1) [leaf] - |
341 $ hg debugstablerange --verbose --subranges --rev 'left~2' > left-2.range | 341 $ hg debugstablerange --verify --verbose --subranges --rev 'left~2' > left-2.range |
342 $ hg debugstablerange --verbose --subranges --rev left | 342 $ hg debugstablerange --verify --verbose --subranges --rev left |
343 bebd167eb94d-0 (4, 5, 5) - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) | 343 bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
344 2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 344 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
345 2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 345 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
346 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 346 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
347 01241442b3c2-2 (2, 3, 1) - | 347 01241442b3c2-2 (2, 3, 1) [leaf] - |
348 1ea73414a91b-0 (0, 1, 1) - | 348 1ea73414a91b-0 (0, 1, 1) [leaf] - |
349 2dc09a01254d-3 (3, 4, 1) - | 349 2dc09a01254d-3 (3, 4, 1) [leaf] - |
350 66f7d451a68b-1 (1, 2, 1) - | 350 66f7d451a68b-1 (1, 2, 1) [leaf] - |
351 bebd167eb94d-4 (4, 5, 1) - | 351 bebd167eb94d-4 (4, 5, 1) [leaf] - |
352 $ hg debugstablerange --verbose --subranges --rev 'left' > left.range | 352 $ hg debugstablerange --verify --verbose --subranges --rev 'left' > left.range |
353 $ diff -u left-2.range left.range | 353 $ diff -u left-2.range left.range |
354 --- left-2.range * (glob) | 354 --- left-2.range * (glob) |
355 +++ left.range * (glob) | 355 +++ left.range * (glob) |
356 @@ -1,5 +1,9 @@ | 356 @@ -1,5 +1,9 @@ |
357 -01241442b3c2-0 (2, 3, 3) - 66f7d451a68b-0 (1, 2, 2), 01241442b3c2-2 (2, 3, 1) | 357 -01241442b3c2-0 (2, 3, 3) [complete] - 66f7d451a68b-0 (1, 2, 2), 01241442b3c2-2 (2, 3, 1) |
358 +bebd167eb94d-0 (4, 5, 5) - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) | 358 +bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
359 +2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 359 +2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
360 +2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 360 +2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
361 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 361 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
362 01241442b3c2-2 (2, 3, 1) - | 362 01241442b3c2-2 (2, 3, 1) [leaf] - |
363 1ea73414a91b-0 (0, 1, 1) - | 363 1ea73414a91b-0 (0, 1, 1) [leaf] - |
364 +2dc09a01254d-3 (3, 4, 1) - | 364 +2dc09a01254d-3 (3, 4, 1) [leaf] - |
365 66f7d451a68b-1 (1, 2, 1) - | 365 66f7d451a68b-1 (1, 2, 1) [leaf] - |
366 +bebd167eb94d-4 (4, 5, 1) - | 366 +bebd167eb94d-4 (4, 5, 1) [leaf] - |
367 [1] | 367 [1] |
368 | 368 |
369 (right branch) | 369 (right branch) |
370 | 370 |
371 $ hg debugstablerange --verbose --subranges --rev right~2 | 371 $ hg debugstablerange --verify --verbose --subranges --rev right~2 |
372 42b07e8da27d-0 (7, 4, 4) - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) | 372 42b07e8da27d-0 (7, 4, 4) [complete] - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) |
373 42b07e8da27d-2 (7, 4, 2) - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) | 373 42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
374 de561312eff4-0 (5, 2, 2) - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) | 374 de561312eff4-0 (5, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) |
375 1ea73414a91b-0 (0, 1, 1) - | 375 1ea73414a91b-0 (0, 1, 1) [leaf] - |
376 42b07e8da27d-3 (7, 4, 1) - | 376 42b07e8da27d-3 (7, 4, 1) [leaf] - |
377 b9bc20507e0b-2 (6, 3, 1) - | 377 b9bc20507e0b-2 (6, 3, 1) [leaf] - |
378 de561312eff4-1 (5, 2, 1) - | 378 de561312eff4-1 (5, 2, 1) [leaf] - |
379 $ hg debugstablerange --verbose --subranges --rev 'right~2' > right-2.range | 379 $ hg debugstablerange --verify --verbose --subranges --rev 'right~2' > right-2.range |
380 $ hg debugstablerange --verbose --subranges --rev right | 380 $ hg debugstablerange --verify --verbose --subranges --rev right |
381 f4b7da68b467-0 (9, 6, 6) - 42b07e8da27d-0 (7, 4, 4), f4b7da68b467-4 (9, 6, 2) | 381 f4b7da68b467-0 (9, 6, 6) [complete] - 42b07e8da27d-0 (7, 4, 4), f4b7da68b467-4 (9, 6, 2) |
382 42b07e8da27d-0 (7, 4, 4) - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) | 382 42b07e8da27d-0 (7, 4, 4) [complete] - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) |
383 42b07e8da27d-2 (7, 4, 2) - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) | 383 42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
384 de561312eff4-0 (5, 2, 2) - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) | 384 de561312eff4-0 (5, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) |
385 f4b7da68b467-4 (9, 6, 2) - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) | 385 f4b7da68b467-4 (9, 6, 2) [complete] - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) |
386 1ea73414a91b-0 (0, 1, 1) - | 386 1ea73414a91b-0 (0, 1, 1) [leaf] - |
387 42b07e8da27d-3 (7, 4, 1) - | 387 42b07e8da27d-3 (7, 4, 1) [leaf] - |
388 857477a9aebb-4 (8, 5, 1) - | 388 857477a9aebb-4 (8, 5, 1) [leaf] - |
389 b9bc20507e0b-2 (6, 3, 1) - | 389 b9bc20507e0b-2 (6, 3, 1) [leaf] - |
390 de561312eff4-1 (5, 2, 1) - | 390 de561312eff4-1 (5, 2, 1) [leaf] - |
391 f4b7da68b467-5 (9, 6, 1) - | 391 f4b7da68b467-5 (9, 6, 1) [leaf] - |
392 $ hg debugstablerange --verbose --subranges --rev 'right' > right.range | 392 $ hg debugstablerange --verify --verbose --subranges --rev 'right' > right.range |
393 $ diff -u right-2.range right.range | 393 $ diff -u right-2.range right.range |
394 --- right-2.range * (glob) | 394 --- right-2.range * (glob) |
395 +++ right.range * (glob) | 395 +++ right.range * (glob) |
396 @@ -1,7 +1,11 @@ | 396 @@ -1,7 +1,11 @@ |
397 +f4b7da68b467-0 (9, 6, 6) - 42b07e8da27d-0 (7, 4, 4), f4b7da68b467-4 (9, 6, 2) | 397 +f4b7da68b467-0 (9, 6, 6) [complete] - 42b07e8da27d-0 (7, 4, 4), f4b7da68b467-4 (9, 6, 2) |
398 42b07e8da27d-0 (7, 4, 4) - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) | 398 42b07e8da27d-0 (7, 4, 4) [complete] - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) |
399 42b07e8da27d-2 (7, 4, 2) - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) | 399 42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
400 de561312eff4-0 (5, 2, 2) - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) | 400 de561312eff4-0 (5, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) |
401 +f4b7da68b467-4 (9, 6, 2) - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) | 401 +f4b7da68b467-4 (9, 6, 2) [complete] - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) |
402 1ea73414a91b-0 (0, 1, 1) - | 402 1ea73414a91b-0 (0, 1, 1) [leaf] - |
403 42b07e8da27d-3 (7, 4, 1) - | 403 42b07e8da27d-3 (7, 4, 1) [leaf] - |
404 +857477a9aebb-4 (8, 5, 1) - | 404 +857477a9aebb-4 (8, 5, 1) [leaf] - |
405 b9bc20507e0b-2 (6, 3, 1) - | 405 b9bc20507e0b-2 (6, 3, 1) [leaf] - |
406 de561312eff4-1 (5, 2, 1) - | 406 de561312eff4-1 (5, 2, 1) [leaf] - |
407 +f4b7da68b467-5 (9, 6, 1) - | 407 +f4b7da68b467-5 (9, 6, 1) [leaf] - |
408 [1] | 408 [1] |
409 | 409 |
410 In this case, the bottom of the split will have multiple heads, | 410 In this case, the bottom of the split will have multiple heads, |
411 | 411 |
412 So we'll create more than 1 subrange out of it. | 412 So we'll create more than 1 subrange out of it. |
413 | 413 |
414 We are still able to reuse one of the branch however | 414 We are still able to reuse one of the branch however |
415 | 415 |
416 $ hg debugstablerange --verbose --subranges --rev merge | 416 $ hg debugstablerange --verify --verbose --subranges --rev merge |
417 8aca7f8c9bd2-0 (10, 11, 11) - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-0 (7, 4, 4), 8aca7f8c9bd2-8 (10, 11, 3) | 417 8aca7f8c9bd2-0 (10, 11, 11) [complete] - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-0 (7, 4, 4), 8aca7f8c9bd2-8 (10, 11, 3) |
418 bebd167eb94d-0 (4, 5, 5) - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) | 418 bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
419 2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 419 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
420 42b07e8da27d-0 (7, 4, 4) - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) | 420 42b07e8da27d-0 (7, 4, 4) [complete] - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) |
421 8aca7f8c9bd2-8 (10, 11, 3) - f4b7da68b467-4 (9, 6, 2), 8aca7f8c9bd2-10 (10, 11, 1) | 421 8aca7f8c9bd2-8 (10, 11, 3) [complete] - f4b7da68b467-4 (9, 6, 2), 8aca7f8c9bd2-10 (10, 11, 1) |
422 2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 422 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
423 42b07e8da27d-2 (7, 4, 2) - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) | 423 42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
424 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 424 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
425 de561312eff4-0 (5, 2, 2) - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) | 425 de561312eff4-0 (5, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) |
426 f4b7da68b467-4 (9, 6, 2) - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) | 426 f4b7da68b467-4 (9, 6, 2) [complete] - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) |
427 01241442b3c2-2 (2, 3, 1) - | 427 01241442b3c2-2 (2, 3, 1) [leaf] - |
428 1ea73414a91b-0 (0, 1, 1) - | 428 1ea73414a91b-0 (0, 1, 1) [leaf] - |
429 2dc09a01254d-3 (3, 4, 1) - | 429 2dc09a01254d-3 (3, 4, 1) [leaf] - |
430 42b07e8da27d-3 (7, 4, 1) - | 430 42b07e8da27d-3 (7, 4, 1) [leaf] - |
431 66f7d451a68b-1 (1, 2, 1) - | 431 66f7d451a68b-1 (1, 2, 1) [leaf] - |
432 857477a9aebb-4 (8, 5, 1) - | 432 857477a9aebb-4 (8, 5, 1) [leaf] - |
433 8aca7f8c9bd2-10 (10, 11, 1) - | 433 8aca7f8c9bd2-10 (10, 11, 1) [leaf] - |
434 b9bc20507e0b-2 (6, 3, 1) - | 434 b9bc20507e0b-2 (6, 3, 1) [leaf] - |
435 bebd167eb94d-4 (4, 5, 1) - | 435 bebd167eb94d-4 (4, 5, 1) [leaf] - |
436 de561312eff4-1 (5, 2, 1) - | 436 de561312eff4-1 (5, 2, 1) [leaf] - |
437 f4b7da68b467-5 (9, 6, 1) - | 437 f4b7da68b467-5 (9, 6, 1) [leaf] - |
438 $ hg debugstablerange --verbose --subranges --rev 'merge' > merge.range | 438 $ hg debugstablerange --verify --verbose --subranges --rev 'merge' > merge.range |
439 $ diff -u left.range merge.range | 439 $ diff -u left.range merge.range |
440 --- left.range * (glob) | 440 --- left.range * (glob) |
441 +++ merge.range * (glob) | 441 +++ merge.range * (glob) |
442 @@ -1,9 +1,21 @@ | 442 @@ -1,9 +1,21 @@ |
443 +8aca7f8c9bd2-0 (10, 11, 11) - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-0 (7, 4, 4), 8aca7f8c9bd2-8 (10, 11, 3) | 443 +8aca7f8c9bd2-0 (10, 11, 11) [complete] - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-0 (7, 4, 4), 8aca7f8c9bd2-8 (10, 11, 3) |
444 bebd167eb94d-0 (4, 5, 5) - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) | 444 bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
445 2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 445 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
446 +42b07e8da27d-0 (7, 4, 4) - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) | 446 +42b07e8da27d-0 (7, 4, 4) [complete] - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) |
447 +8aca7f8c9bd2-8 (10, 11, 3) - f4b7da68b467-4 (9, 6, 2), 8aca7f8c9bd2-10 (10, 11, 1) | 447 +8aca7f8c9bd2-8 (10, 11, 3) [complete] - f4b7da68b467-4 (9, 6, 2), 8aca7f8c9bd2-10 (10, 11, 1) |
448 2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 448 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
449 +42b07e8da27d-2 (7, 4, 2) - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) | 449 +42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
450 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 450 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
451 +de561312eff4-0 (5, 2, 2) - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) | 451 +de561312eff4-0 (5, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) |
452 +f4b7da68b467-4 (9, 6, 2) - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) | 452 +f4b7da68b467-4 (9, 6, 2) [complete] - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) |
453 01241442b3c2-2 (2, 3, 1) - | 453 01241442b3c2-2 (2, 3, 1) [leaf] - |
454 1ea73414a91b-0 (0, 1, 1) - | 454 1ea73414a91b-0 (0, 1, 1) [leaf] - |
455 2dc09a01254d-3 (3, 4, 1) - | 455 2dc09a01254d-3 (3, 4, 1) [leaf] - |
456 +42b07e8da27d-3 (7, 4, 1) - | 456 +42b07e8da27d-3 (7, 4, 1) [leaf] - |
457 66f7d451a68b-1 (1, 2, 1) - | 457 66f7d451a68b-1 (1, 2, 1) [leaf] - |
458 +857477a9aebb-4 (8, 5, 1) - | 458 +857477a9aebb-4 (8, 5, 1) [leaf] - |
459 +8aca7f8c9bd2-10 (10, 11, 1) - | 459 +8aca7f8c9bd2-10 (10, 11, 1) [leaf] - |
460 +b9bc20507e0b-2 (6, 3, 1) - | 460 +b9bc20507e0b-2 (6, 3, 1) [leaf] - |
461 bebd167eb94d-4 (4, 5, 1) - | 461 bebd167eb94d-4 (4, 5, 1) [leaf] - |
462 +de561312eff4-1 (5, 2, 1) - | 462 +de561312eff4-1 (5, 2, 1) [leaf] - |
463 +f4b7da68b467-5 (9, 6, 1) - | 463 +f4b7da68b467-5 (9, 6, 1) [leaf] - |
464 [1] | 464 [1] |
465 $ diff -u right.range merge.range | 465 $ diff -u right.range merge.range |
466 --- right.range * (glob) | 466 --- right.range * (glob) |
467 +++ merge.range * (glob) | 467 +++ merge.range * (glob) |
468 @@ -1,11 +1,21 @@ | 468 @@ -1,11 +1,21 @@ |
469 -f4b7da68b467-0 (9, 6, 6) - 42b07e8da27d-0 (7, 4, 4), f4b7da68b467-4 (9, 6, 2) | 469 -f4b7da68b467-0 (9, 6, 6) [complete] - 42b07e8da27d-0 (7, 4, 4), f4b7da68b467-4 (9, 6, 2) |
470 +8aca7f8c9bd2-0 (10, 11, 11) - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-0 (7, 4, 4), 8aca7f8c9bd2-8 (10, 11, 3) | 470 +8aca7f8c9bd2-0 (10, 11, 11) [complete] - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-0 (7, 4, 4), 8aca7f8c9bd2-8 (10, 11, 3) |
471 +bebd167eb94d-0 (4, 5, 5) - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) | 471 +bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
472 +2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 472 +2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
473 42b07e8da27d-0 (7, 4, 4) - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) | 473 42b07e8da27d-0 (7, 4, 4) [complete] - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) |
474 +8aca7f8c9bd2-8 (10, 11, 3) - f4b7da68b467-4 (9, 6, 2), 8aca7f8c9bd2-10 (10, 11, 1) | 474 +8aca7f8c9bd2-8 (10, 11, 3) [complete] - f4b7da68b467-4 (9, 6, 2), 8aca7f8c9bd2-10 (10, 11, 1) |
475 +2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 475 +2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
476 42b07e8da27d-2 (7, 4, 2) - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) | 476 42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
477 +66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 477 +66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
478 de561312eff4-0 (5, 2, 2) - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) | 478 de561312eff4-0 (5, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) |
479 f4b7da68b467-4 (9, 6, 2) - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) | 479 f4b7da68b467-4 (9, 6, 2) [complete] - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) |
480 +01241442b3c2-2 (2, 3, 1) - | 480 +01241442b3c2-2 (2, 3, 1) [leaf] - |
481 1ea73414a91b-0 (0, 1, 1) - | 481 1ea73414a91b-0 (0, 1, 1) [leaf] - |
482 +2dc09a01254d-3 (3, 4, 1) - | 482 +2dc09a01254d-3 (3, 4, 1) [leaf] - |
483 42b07e8da27d-3 (7, 4, 1) - | 483 42b07e8da27d-3 (7, 4, 1) [leaf] - |
484 +66f7d451a68b-1 (1, 2, 1) - | 484 +66f7d451a68b-1 (1, 2, 1) [leaf] - |
485 857477a9aebb-4 (8, 5, 1) - | 485 857477a9aebb-4 (8, 5, 1) [leaf] - |
486 +8aca7f8c9bd2-10 (10, 11, 1) - | 486 +8aca7f8c9bd2-10 (10, 11, 1) [leaf] - |
487 b9bc20507e0b-2 (6, 3, 1) - | 487 b9bc20507e0b-2 (6, 3, 1) [leaf] - |
488 +bebd167eb94d-4 (4, 5, 1) - | 488 +bebd167eb94d-4 (4, 5, 1) [leaf] - |
489 de561312eff4-1 (5, 2, 1) - | 489 de561312eff4-1 (5, 2, 1) [leaf] - |
490 f4b7da68b467-5 (9, 6, 1) - | 490 f4b7da68b467-5 (9, 6, 1) [leaf] - |
491 [1] | 491 [1] |
492 | 492 |
493 Range above the merge, reuse subrange from the merge | 493 Range above the merge, reuse subrange from the merge |
494 | 494 |
495 $ hg debugstablerange --verbose --subranges --rev tip | 495 $ hg debugstablerange --verify --verbose --subranges --rev tip |
496 e6b8d5b46647-0 (12, 13, 13) - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-0 (7, 4, 4), e6b8d5b46647-8 (12, 13, 5) | 496 e6b8d5b46647-0 (12, 13, 13) [complete] - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-0 (7, 4, 4), e6b8d5b46647-8 (12, 13, 5) |
497 bebd167eb94d-0 (4, 5, 5) - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) | 497 bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
498 e6b8d5b46647-8 (12, 13, 5) - 485383494a89-8 (11, 12, 4), e6b8d5b46647-12 (12, 13, 1) | 498 e6b8d5b46647-8 (12, 13, 5) [complete] - 485383494a89-8 (11, 12, 4), e6b8d5b46647-12 (12, 13, 1) |
499 2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 499 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
500 42b07e8da27d-0 (7, 4, 4) - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) | 500 42b07e8da27d-0 (7, 4, 4) [complete] - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) |
501 485383494a89-8 (11, 12, 4) - f4b7da68b467-4 (9, 6, 2), 485383494a89-10 (11, 12, 2) | 501 485383494a89-8 (11, 12, 4) [complete] - f4b7da68b467-4 (9, 6, 2), 485383494a89-10 (11, 12, 2) |
502 2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 502 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
503 42b07e8da27d-2 (7, 4, 2) - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) | 503 42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
504 485383494a89-10 (11, 12, 2) - 8aca7f8c9bd2-10 (10, 11, 1), 485383494a89-11 (11, 12, 1) | 504 485383494a89-10 (11, 12, 2) [complete] - 8aca7f8c9bd2-10 (10, 11, 1), 485383494a89-11 (11, 12, 1) |
505 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 505 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
506 de561312eff4-0 (5, 2, 2) - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) | 506 de561312eff4-0 (5, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) |
507 f4b7da68b467-4 (9, 6, 2) - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) | 507 f4b7da68b467-4 (9, 6, 2) [complete] - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) |
508 01241442b3c2-2 (2, 3, 1) - | 508 01241442b3c2-2 (2, 3, 1) [leaf] - |
509 1ea73414a91b-0 (0, 1, 1) - | 509 1ea73414a91b-0 (0, 1, 1) [leaf] - |
510 2dc09a01254d-3 (3, 4, 1) - | 510 2dc09a01254d-3 (3, 4, 1) [leaf] - |
511 42b07e8da27d-3 (7, 4, 1) - | 511 42b07e8da27d-3 (7, 4, 1) [leaf] - |
512 485383494a89-11 (11, 12, 1) - | 512 485383494a89-11 (11, 12, 1) [leaf] - |
513 66f7d451a68b-1 (1, 2, 1) - | 513 66f7d451a68b-1 (1, 2, 1) [leaf] - |
514 857477a9aebb-4 (8, 5, 1) - | 514 857477a9aebb-4 (8, 5, 1) [leaf] - |
515 8aca7f8c9bd2-10 (10, 11, 1) - | 515 8aca7f8c9bd2-10 (10, 11, 1) [leaf] - |
516 b9bc20507e0b-2 (6, 3, 1) - | 516 b9bc20507e0b-2 (6, 3, 1) [leaf] - |
517 bebd167eb94d-4 (4, 5, 1) - | 517 bebd167eb94d-4 (4, 5, 1) [leaf] - |
518 de561312eff4-1 (5, 2, 1) - | 518 de561312eff4-1 (5, 2, 1) [leaf] - |
519 e6b8d5b46647-12 (12, 13, 1) - | 519 e6b8d5b46647-12 (12, 13, 1) [leaf] - |
520 f4b7da68b467-5 (9, 6, 1) - | 520 f4b7da68b467-5 (9, 6, 1) [leaf] - |
521 $ hg debugstablerange --verbose --subranges --rev 'tip' > tip.range | 521 $ hg debugstablerange --verify --verbose --subranges --rev 'tip' > tip.range |
522 $ diff -u merge.range tip.range | 522 $ diff -u merge.range tip.range |
523 --- merge.range * (glob) | 523 --- merge.range * (glob) |
524 +++ tip.range * (glob) | 524 +++ tip.range * (glob) |
525 @@ -1,10 +1,12 @@ | 525 @@ -1,10 +1,12 @@ |
526 -8aca7f8c9bd2-0 (10, 11, 11) - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-0 (7, 4, 4), 8aca7f8c9bd2-8 (10, 11, 3) | 526 -8aca7f8c9bd2-0 (10, 11, 11) [complete] - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-0 (7, 4, 4), 8aca7f8c9bd2-8 (10, 11, 3) |
527 +e6b8d5b46647-0 (12, 13, 13) - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-0 (7, 4, 4), e6b8d5b46647-8 (12, 13, 5) | 527 +e6b8d5b46647-0 (12, 13, 13) [complete] - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-0 (7, 4, 4), e6b8d5b46647-8 (12, 13, 5) |
528 bebd167eb94d-0 (4, 5, 5) - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) | 528 bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
529 +e6b8d5b46647-8 (12, 13, 5) - 485383494a89-8 (11, 12, 4), e6b8d5b46647-12 (12, 13, 1) | 529 +e6b8d5b46647-8 (12, 13, 5) [complete] - 485383494a89-8 (11, 12, 4), e6b8d5b46647-12 (12, 13, 1) |
530 2dc09a01254d-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) | 530 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
531 42b07e8da27d-0 (7, 4, 4) - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) | 531 42b07e8da27d-0 (7, 4, 4) [complete] - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) |
532 -8aca7f8c9bd2-8 (10, 11, 3) - f4b7da68b467-4 (9, 6, 2), 8aca7f8c9bd2-10 (10, 11, 1) | 532 -8aca7f8c9bd2-8 (10, 11, 3) [complete] - f4b7da68b467-4 (9, 6, 2), 8aca7f8c9bd2-10 (10, 11, 1) |
533 +485383494a89-8 (11, 12, 4) - f4b7da68b467-4 (9, 6, 2), 485383494a89-10 (11, 12, 2) | 533 +485383494a89-8 (11, 12, 4) [complete] - f4b7da68b467-4 (9, 6, 2), 485383494a89-10 (11, 12, 2) |
534 2dc09a01254d-2 (3, 4, 2) - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) | 534 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
535 42b07e8da27d-2 (7, 4, 2) - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) | 535 42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
536 +485383494a89-10 (11, 12, 2) - 8aca7f8c9bd2-10 (10, 11, 1), 485383494a89-11 (11, 12, 1) | 536 +485383494a89-10 (11, 12, 2) [complete] - 8aca7f8c9bd2-10 (10, 11, 1), 485383494a89-11 (11, 12, 1) |
537 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 537 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
538 de561312eff4-0 (5, 2, 2) - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) | 538 de561312eff4-0 (5, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) |
539 f4b7da68b467-4 (9, 6, 2) - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) | 539 f4b7da68b467-4 (9, 6, 2) [complete] - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) |
540 @@ -12,10 +14,12 @@ | 540 @@ -12,10 +14,12 @@ |
541 1ea73414a91b-0 (0, 1, 1) - | 541 1ea73414a91b-0 (0, 1, 1) [leaf] - |
542 2dc09a01254d-3 (3, 4, 1) - | 542 2dc09a01254d-3 (3, 4, 1) [leaf] - |
543 42b07e8da27d-3 (7, 4, 1) - | 543 42b07e8da27d-3 (7, 4, 1) [leaf] - |
544 +485383494a89-11 (11, 12, 1) - | 544 +485383494a89-11 (11, 12, 1) [leaf] - |
545 66f7d451a68b-1 (1, 2, 1) - | 545 66f7d451a68b-1 (1, 2, 1) [leaf] - |
546 857477a9aebb-4 (8, 5, 1) - | 546 857477a9aebb-4 (8, 5, 1) [leaf] - |
547 8aca7f8c9bd2-10 (10, 11, 1) - | 547 8aca7f8c9bd2-10 (10, 11, 1) [leaf] - |
548 b9bc20507e0b-2 (6, 3, 1) - | 548 b9bc20507e0b-2 (6, 3, 1) [leaf] - |
549 bebd167eb94d-4 (4, 5, 1) - | 549 bebd167eb94d-4 (4, 5, 1) [leaf] - |
550 de561312eff4-1 (5, 2, 1) - | 550 de561312eff4-1 (5, 2, 1) [leaf] - |
551 +e6b8d5b46647-12 (12, 13, 1) - | 551 +e6b8d5b46647-12 (12, 13, 1) [leaf] - |
552 f4b7da68b467-5 (9, 6, 1) - | 552 f4b7da68b467-5 (9, 6, 1) [leaf] - |
553 [1] | 553 [1] |
554 | 554 |
555 $ cd .. | 555 $ cd .. |
556 | 556 |
557 Tests range with criss cross merge in the graph | 557 Tests range with criss cross merge in the graph |
603 | | | 603 | | |
604 | o 1 66f7d451a68b r1 g | 604 | o 1 66f7d451a68b r1 g |
605 |/ | 605 |/ |
606 o 0 1ea73414a91b r0 | 606 o 0 1ea73414a91b r0 |
607 | 607 |
608 $ hg debugstablerange --verbose --subranges --rev 'head()' | 608 $ hg debugstablerange --verify --verbose --subranges --rev 'head()' |
609 1d8d22637c2d-0 (15, 8, 8) - 2b6d669947cd-0 (3, 4, 4), 1d8d22637c2d-4 (15, 8, 4) | 609 1d8d22637c2d-0 (15, 8, 8) [complete] - 2b6d669947cd-0 (3, 4, 4), 1d8d22637c2d-4 (15, 8, 4) |
610 dcbb326fdec2-0 (9, 7, 7) - 2b6d669947cd-0 (3, 4, 4), dcbb326fdec2-4 (9, 7, 3) | 610 dcbb326fdec2-0 (9, 7, 7) [complete] - 2b6d669947cd-0 (3, 4, 4), dcbb326fdec2-4 (9, 7, 3) |
611 ff43616e5d0f-0 (10, 7, 7) - 2b6d669947cd-0 (3, 4, 4), ff43616e5d0f-4 (10, 7, 3) | 611 ff43616e5d0f-0 (10, 7, 7) [complete] - 2b6d669947cd-0 (3, 4, 4), ff43616e5d0f-4 (10, 7, 3) |
612 b4594d867745-0 (13, 6, 6) - 2b6d669947cd-0 (3, 4, 4), b4594d867745-4 (13, 6, 2) | 612 b4594d867745-0 (13, 6, 6) [complete] - 2b6d669947cd-0 (3, 4, 4), b4594d867745-4 (13, 6, 2) |
613 e46a4836065c-0 (12, 6, 6) - 2b6d669947cd-0 (3, 4, 4), e46a4836065c-4 (12, 6, 2) | 613 e46a4836065c-0 (12, 6, 6) [complete] - 2b6d669947cd-0 (3, 4, 4), e46a4836065c-4 (12, 6, 2) |
614 2702dd0c91e7-0 (6, 5, 5) - f0f3ef9a6cd5-0 (5, 4, 4), 2702dd0c91e7-4 (6, 5, 1) | 614 2702dd0c91e7-0 (6, 5, 5) [complete] - f0f3ef9a6cd5-0 (5, 4, 4), 2702dd0c91e7-4 (6, 5, 1) |
615 1d8d22637c2d-4 (15, 8, 4) - 4c748ffd1a46-2 (4, 3, 1), 43227190fef8-4 (14, 5, 1), 1d8d22637c2d-6 (15, 8, 2) | 615 1d8d22637c2d-4 (15, 8, 4) [complete] - 4c748ffd1a46-2 (4, 3, 1), 43227190fef8-4 (14, 5, 1), 1d8d22637c2d-6 (15, 8, 2) |
616 2b6d669947cd-0 (3, 4, 4) - 66f7d451a68b-0 (1, 2, 2), 2b6d669947cd-2 (3, 4, 2) | 616 2b6d669947cd-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2b6d669947cd-2 (3, 4, 2) |
617 f0f3ef9a6cd5-0 (5, 4, 4) - fa942426a6fd-0 (2, 2, 2), f0f3ef9a6cd5-2 (5, 4, 2) | 617 f0f3ef9a6cd5-0 (5, 4, 4) [complete] - fa942426a6fd-0 (2, 2, 2), f0f3ef9a6cd5-2 (5, 4, 2) |
618 dcbb326fdec2-4 (9, 7, 3) - d62d843c9a01-4 (8, 6, 2), dcbb326fdec2-6 (9, 7, 1) | 618 dcbb326fdec2-4 (9, 7, 3) [complete] - d62d843c9a01-4 (8, 6, 2), dcbb326fdec2-6 (9, 7, 1) |
619 ff43616e5d0f-4 (10, 7, 3) - d62d843c9a01-4 (8, 6, 2), ff43616e5d0f-6 (10, 7, 1) | 619 ff43616e5d0f-4 (10, 7, 3) [complete] - d62d843c9a01-4 (8, 6, 2), ff43616e5d0f-6 (10, 7, 1) |
620 1d8d22637c2d-6 (15, 8, 2) - f0f3ef9a6cd5-3 (5, 4, 1), 1d8d22637c2d-7 (15, 8, 1) | 620 1d8d22637c2d-6 (15, 8, 2) [complete] - f0f3ef9a6cd5-3 (5, 4, 1), 1d8d22637c2d-7 (15, 8, 1) |
621 2b6d669947cd-2 (3, 4, 2) - fa942426a6fd-1 (2, 2, 1), 2b6d669947cd-3 (3, 4, 1) | 621 2b6d669947cd-2 (3, 4, 2) [complete] - fa942426a6fd-1 (2, 2, 1), 2b6d669947cd-3 (3, 4, 1) |
622 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 622 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
623 b4594d867745-4 (13, 6, 2) - bab5d5bf48bd-4 (11, 5, 1), b4594d867745-5 (13, 6, 1) | 623 b4594d867745-4 (13, 6, 2) [complete] - bab5d5bf48bd-4 (11, 5, 1), b4594d867745-5 (13, 6, 1) |
624 d62d843c9a01-4 (8, 6, 2) - e7d9710d9fc6-4 (7, 5, 1), d62d843c9a01-5 (8, 6, 1) | 624 d62d843c9a01-4 (8, 6, 2) [complete] - e7d9710d9fc6-4 (7, 5, 1), d62d843c9a01-5 (8, 6, 1) |
625 e46a4836065c-4 (12, 6, 2) - bab5d5bf48bd-4 (11, 5, 1), e46a4836065c-5 (12, 6, 1) | 625 e46a4836065c-4 (12, 6, 2) [complete] - bab5d5bf48bd-4 (11, 5, 1), e46a4836065c-5 (12, 6, 1) |
626 f0f3ef9a6cd5-2 (5, 4, 2) - 4c748ffd1a46-2 (4, 3, 1), f0f3ef9a6cd5-3 (5, 4, 1) | 626 f0f3ef9a6cd5-2 (5, 4, 2) [complete] - 4c748ffd1a46-2 (4, 3, 1), f0f3ef9a6cd5-3 (5, 4, 1) |
627 fa942426a6fd-0 (2, 2, 2) - 1ea73414a91b-0 (0, 1, 1), fa942426a6fd-1 (2, 2, 1) | 627 fa942426a6fd-0 (2, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), fa942426a6fd-1 (2, 2, 1) |
628 1d8d22637c2d-7 (15, 8, 1) - | 628 1d8d22637c2d-7 (15, 8, 1) [leaf] - |
629 1ea73414a91b-0 (0, 1, 1) - | 629 1ea73414a91b-0 (0, 1, 1) [leaf] - |
630 2702dd0c91e7-4 (6, 5, 1) - | 630 2702dd0c91e7-4 (6, 5, 1) [leaf] - |
631 2b6d669947cd-3 (3, 4, 1) - | 631 2b6d669947cd-3 (3, 4, 1) [leaf] - |
632 43227190fef8-4 (14, 5, 1) - | 632 43227190fef8-4 (14, 5, 1) [leaf] - |
633 4c748ffd1a46-2 (4, 3, 1) - | 633 4c748ffd1a46-2 (4, 3, 1) [leaf] - |
634 66f7d451a68b-1 (1, 2, 1) - | 634 66f7d451a68b-1 (1, 2, 1) [leaf] - |
635 b4594d867745-5 (13, 6, 1) - | 635 b4594d867745-5 (13, 6, 1) [leaf] - |
636 bab5d5bf48bd-4 (11, 5, 1) - | 636 bab5d5bf48bd-4 (11, 5, 1) [leaf] - |
637 d62d843c9a01-5 (8, 6, 1) - | 637 d62d843c9a01-5 (8, 6, 1) [leaf] - |
638 dcbb326fdec2-6 (9, 7, 1) - | 638 dcbb326fdec2-6 (9, 7, 1) [leaf] - |
639 e46a4836065c-5 (12, 6, 1) - | 639 e46a4836065c-5 (12, 6, 1) [leaf] - |
640 e7d9710d9fc6-4 (7, 5, 1) - | 640 e7d9710d9fc6-4 (7, 5, 1) [leaf] - |
641 f0f3ef9a6cd5-3 (5, 4, 1) - | 641 f0f3ef9a6cd5-3 (5, 4, 1) [leaf] - |
642 fa942426a6fd-1 (2, 2, 1) - | 642 fa942426a6fd-1 (2, 2, 1) [leaf] - |
643 ff43616e5d0f-6 (10, 7, 1) - | 643 ff43616e5d0f-6 (10, 7, 1) [leaf] - |
644 $ cd .. | 644 $ cd .. |
645 | 645 |
646 Tests range where a toprange is rooted on a merge | 646 Tests range where a toprange is rooted on a merge |
647 ================================================= | 647 ================================================= |
648 | 648 |
662 | | | 662 | | |
663 o | 1 66f7d451a68b r1 a | 663 o | 1 66f7d451a68b r1 a |
664 |/ | 664 |/ |
665 o 0 1ea73414a91b r0 | 665 o 0 1ea73414a91b r0 |
666 | 666 |
667 $ hg debugstablerange --verbose --subranges --rev 'head()' | 667 $ hg debugstablerange --verify --verbose --subranges --rev 'head()' |
668 f37e476fba9a-0 (4, 5, 5) - 66f7d451a68b-0 (1, 2, 2), 36315563e2fa-0 (3, 3, 3), f37e476fba9a-4 (4, 5, 1) | 668 f37e476fba9a-0 (4, 5, 5) [complete] - 66f7d451a68b-0 (1, 2, 2), 36315563e2fa-0 (3, 3, 3), f37e476fba9a-4 (4, 5, 1) |
669 36315563e2fa-0 (3, 3, 3) - fa942426a6fd-0 (2, 2, 2), 36315563e2fa-2 (3, 3, 1) | 669 36315563e2fa-0 (3, 3, 3) [complete] - fa942426a6fd-0 (2, 2, 2), 36315563e2fa-2 (3, 3, 1) |
670 66f7d451a68b-0 (1, 2, 2) - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) | 670 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
671 fa942426a6fd-0 (2, 2, 2) - 1ea73414a91b-0 (0, 1, 1), fa942426a6fd-1 (2, 2, 1) | 671 fa942426a6fd-0 (2, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), fa942426a6fd-1 (2, 2, 1) |
672 1ea73414a91b-0 (0, 1, 1) - | 672 1ea73414a91b-0 (0, 1, 1) [leaf] - |
673 36315563e2fa-2 (3, 3, 1) - | 673 36315563e2fa-2 (3, 3, 1) [leaf] - |
674 66f7d451a68b-1 (1, 2, 1) - | 674 66f7d451a68b-1 (1, 2, 1) [leaf] - |
675 f37e476fba9a-4 (4, 5, 1) - | 675 f37e476fba9a-4 (4, 5, 1) [leaf] - |
676 fa942426a6fd-1 (2, 2, 1) - | 676 fa942426a6fd-1 (2, 2, 1) [leaf] - |
677 | 677 |