Show More
@@ -1,1118 +1,1120 b'' | |||||
1 |
|
1 | |||
2 | Function to test discovery between two repos in both directions, using both the local shortcut |
|
2 | Function to test discovery between two repos in both directions, using both the local shortcut | |
3 | (which is currently not activated by default) and the full remotable protocol: |
|
3 | (which is currently not activated by default) and the full remotable protocol: | |
4 |
|
4 | |||
5 | $ testdesc() { # revs_a, revs_b, dagdesc |
|
5 | $ testdesc() { # revs_a, revs_b, dagdesc | |
6 | > if [ -d foo ]; then rm -rf foo; fi |
|
6 | > if [ -d foo ]; then rm -rf foo; fi | |
7 | > hg init foo |
|
7 | > hg init foo | |
8 | > cd foo |
|
8 | > cd foo | |
9 | > hg debugbuilddag "$3" |
|
9 | > hg debugbuilddag "$3" | |
10 | > hg clone . a $1 --quiet |
|
10 | > hg clone . a $1 --quiet | |
11 | > hg clone . b $2 --quiet |
|
11 | > hg clone . b $2 --quiet | |
12 | > echo |
|
12 | > echo | |
13 | > echo "% -- a -> b tree" |
|
13 | > echo "% -- a -> b tree" | |
14 | > hg -R a debugdiscovery b --verbose --old |
|
14 | > hg -R a debugdiscovery b --verbose --old | |
15 | > echo |
|
15 | > echo | |
16 | > echo "% -- a -> b set" |
|
16 | > echo "% -- a -> b set" | |
17 | > hg -R a debugdiscovery b --verbose --debug --config progress.debug=true |
|
17 | > hg -R a debugdiscovery b --verbose --debug --config progress.debug=true | |
18 | > echo |
|
18 | > echo | |
19 | > echo "% -- a -> b set (tip only)" |
|
19 | > echo "% -- a -> b set (tip only)" | |
20 | > hg -R a debugdiscovery b --verbose --debug --config progress.debug=true --rev tip |
|
20 | > hg -R a debugdiscovery b --verbose --debug --config progress.debug=true --rev tip | |
21 | > echo |
|
21 | > echo | |
22 | > echo "% -- b -> a tree" |
|
22 | > echo "% -- b -> a tree" | |
23 | > hg -R b debugdiscovery a --verbose --old |
|
23 | > hg -R b debugdiscovery a --verbose --old | |
24 | > echo |
|
24 | > echo | |
25 | > echo "% -- b -> a set" |
|
25 | > echo "% -- b -> a set" | |
26 | > hg -R b debugdiscovery a --verbose --debug --config progress.debug=true |
|
26 | > hg -R b debugdiscovery a --verbose --debug --config progress.debug=true | |
27 | > echo |
|
27 | > echo | |
28 | > echo "% -- b -> a set (tip only)" |
|
28 | > echo "% -- b -> a set (tip only)" | |
29 | > hg -R b debugdiscovery a --verbose --debug --config progress.debug=true --rev tip |
|
29 | > hg -R b debugdiscovery a --verbose --debug --config progress.debug=true --rev tip | |
30 | > cd .. |
|
30 | > cd .. | |
31 | > } |
|
31 | > } | |
32 |
|
32 | |||
33 |
|
33 | |||
34 | Small superset: |
|
34 | Small superset: | |
35 |
|
35 | |||
36 | $ testdesc '-ra1 -ra2' '-rb1 -rb2 -rb3' ' |
|
36 | $ testdesc '-ra1 -ra2' '-rb1 -rb2 -rb3' ' | |
37 | > +2:f +1:a1:b1 |
|
37 | > +2:f +1:a1:b1 | |
38 | > <f +4 :a2 |
|
38 | > <f +4 :a2 | |
39 | > +5 :b2 |
|
39 | > +5 :b2 | |
40 | > <f +3 :b3' |
|
40 | > <f +3 :b3' | |
41 |
|
41 | |||
42 | % -- a -> b tree |
|
42 | % -- a -> b tree | |
43 | comparing with b |
|
43 | comparing with b | |
44 | searching for changes |
|
44 | searching for changes | |
45 | unpruned common: 01241442b3c2 66f7d451a68b b5714e113bc0 |
|
45 | unpruned common: 01241442b3c2 66f7d451a68b b5714e113bc0 | |
46 | elapsed time: * seconds (glob) |
|
46 | elapsed time: * seconds (glob) | |
47 | heads summary: |
|
47 | heads summary: | |
48 | total common heads: 2 |
|
48 | total common heads: 2 | |
49 | also local heads: 2 |
|
49 | also local heads: 2 | |
50 | also remote heads: 1 |
|
50 | also remote heads: 1 | |
51 | both: 1 |
|
51 | both: 1 | |
52 | local heads: 2 |
|
52 | local heads: 2 | |
53 | common: 2 |
|
53 | common: 2 | |
54 | missing: 0 |
|
54 | missing: 0 | |
55 | remote heads: 3 |
|
55 | remote heads: 3 | |
56 | common: 1 |
|
56 | common: 1 | |
57 | unknown: 2 |
|
57 | unknown: 2 | |
58 | local changesets: 7 |
|
58 | local changesets: 7 | |
59 | common: 7 |
|
59 | common: 7 | |
60 | missing: 0 |
|
60 | missing: 0 | |
61 | common heads: 01241442b3c2 b5714e113bc0 |
|
61 | common heads: 01241442b3c2 b5714e113bc0 | |
62 |
|
62 | |||
63 | % -- a -> b set |
|
63 | % -- a -> b set | |
64 | comparing with b |
|
64 | comparing with b | |
65 | query 1; heads |
|
65 | query 1; heads | |
66 | searching for changes |
|
66 | searching for changes | |
67 | all local heads known remotely |
|
67 | all local heads known remotely | |
68 | elapsed time: * seconds (glob) |
|
68 | elapsed time: * seconds (glob) | |
69 | heads summary: |
|
69 | heads summary: | |
70 | total common heads: 2 |
|
70 | total common heads: 2 | |
71 | also local heads: 2 |
|
71 | also local heads: 2 | |
72 | also remote heads: 1 |
|
72 | also remote heads: 1 | |
73 | both: 1 |
|
73 | both: 1 | |
74 | local heads: 2 |
|
74 | local heads: 2 | |
75 | common: 2 |
|
75 | common: 2 | |
76 | missing: 0 |
|
76 | missing: 0 | |
77 | remote heads: 3 |
|
77 | remote heads: 3 | |
78 | common: 1 |
|
78 | common: 1 | |
79 | unknown: 2 |
|
79 | unknown: 2 | |
80 | local changesets: 7 |
|
80 | local changesets: 7 | |
81 | common: 7 |
|
81 | common: 7 | |
82 | missing: 0 |
|
82 | missing: 0 | |
83 | common heads: 01241442b3c2 b5714e113bc0 |
|
83 | common heads: 01241442b3c2 b5714e113bc0 | |
84 |
|
84 | |||
85 | % -- a -> b set (tip only) |
|
85 | % -- a -> b set (tip only) | |
86 | comparing with b |
|
86 | comparing with b | |
87 | query 1; heads |
|
87 | query 1; heads | |
88 | searching for changes |
|
88 | searching for changes | |
89 | all local heads known remotely |
|
89 | all local heads known remotely | |
90 | elapsed time: * seconds (glob) |
|
90 | elapsed time: * seconds (glob) | |
91 | heads summary: |
|
91 | heads summary: | |
92 | total common heads: 1 |
|
92 | total common heads: 1 | |
93 | also local heads: 1 |
|
93 | also local heads: 1 | |
94 | also remote heads: 0 |
|
94 | also remote heads: 0 | |
95 | both: 0 |
|
95 | both: 0 | |
96 | local heads: 2 |
|
96 | local heads: 2 | |
97 | common: 1 |
|
97 | common: 1 | |
98 | missing: 1 |
|
98 | missing: 1 | |
99 | remote heads: 3 |
|
99 | remote heads: 3 | |
100 | common: 0 |
|
100 | common: 0 | |
101 | unknown: 3 |
|
101 | unknown: 3 | |
102 | local changesets: 7 |
|
102 | local changesets: 7 | |
103 | common: 6 |
|
103 | common: 6 | |
104 | missing: 1 |
|
104 | missing: 1 | |
105 | common heads: b5714e113bc0 |
|
105 | common heads: b5714e113bc0 | |
106 |
|
106 | |||
107 | % -- b -> a tree |
|
107 | % -- b -> a tree | |
108 | comparing with a |
|
108 | comparing with a | |
109 | searching for changes |
|
109 | searching for changes | |
110 | unpruned common: 01241442b3c2 b5714e113bc0 |
|
110 | unpruned common: 01241442b3c2 b5714e113bc0 | |
111 | elapsed time: * seconds (glob) |
|
111 | elapsed time: * seconds (glob) | |
112 | heads summary: |
|
112 | heads summary: | |
113 | total common heads: 2 |
|
113 | total common heads: 2 | |
114 | also local heads: 1 |
|
114 | also local heads: 1 | |
115 | also remote heads: 2 |
|
115 | also remote heads: 2 | |
116 | both: 1 |
|
116 | both: 1 | |
117 | local heads: 3 |
|
117 | local heads: 3 | |
118 | common: 1 |
|
118 | common: 1 | |
119 | missing: 2 |
|
119 | missing: 2 | |
120 | remote heads: 2 |
|
120 | remote heads: 2 | |
121 | common: 2 |
|
121 | common: 2 | |
122 | unknown: 0 |
|
122 | unknown: 0 | |
123 | local changesets: 15 |
|
123 | local changesets: 15 | |
124 | common: 7 |
|
124 | common: 7 | |
125 | missing: 8 |
|
125 | missing: 8 | |
126 | common heads: 01241442b3c2 b5714e113bc0 |
|
126 | common heads: 01241442b3c2 b5714e113bc0 | |
127 |
|
127 | |||
128 | % -- b -> a set |
|
128 | % -- b -> a set | |
129 | comparing with a |
|
129 | comparing with a | |
130 | query 1; heads |
|
130 | query 1; heads | |
131 | searching for changes |
|
131 | searching for changes | |
132 | all remote heads known locally |
|
132 | all remote heads known locally | |
133 | elapsed time: * seconds (glob) |
|
133 | elapsed time: * seconds (glob) | |
134 | heads summary: |
|
134 | heads summary: | |
135 | total common heads: 2 |
|
135 | total common heads: 2 | |
136 | also local heads: 1 |
|
136 | also local heads: 1 | |
137 | also remote heads: 2 |
|
137 | also remote heads: 2 | |
138 | both: 1 |
|
138 | both: 1 | |
139 | local heads: 3 |
|
139 | local heads: 3 | |
140 | common: 1 |
|
140 | common: 1 | |
141 | missing: 2 |
|
141 | missing: 2 | |
142 | remote heads: 2 |
|
142 | remote heads: 2 | |
143 | common: 2 |
|
143 | common: 2 | |
144 | unknown: 0 |
|
144 | unknown: 0 | |
145 | local changesets: 15 |
|
145 | local changesets: 15 | |
146 | common: 7 |
|
146 | common: 7 | |
147 | missing: 8 |
|
147 | missing: 8 | |
148 | common heads: 01241442b3c2 b5714e113bc0 |
|
148 | common heads: 01241442b3c2 b5714e113bc0 | |
149 |
|
149 | |||
150 | % -- b -> a set (tip only) |
|
150 | % -- b -> a set (tip only) | |
151 | comparing with a |
|
151 | comparing with a | |
152 | query 1; heads |
|
152 | query 1; heads | |
153 | searching for changes |
|
153 | searching for changes | |
154 | all remote heads known locally |
|
154 | all remote heads known locally | |
155 | elapsed time: * seconds (glob) |
|
155 | elapsed time: * seconds (glob) | |
156 | heads summary: |
|
156 | heads summary: | |
157 | total common heads: 2 |
|
157 | total common heads: 2 | |
158 | also local heads: 1 |
|
158 | also local heads: 1 | |
159 | also remote heads: 2 |
|
159 | also remote heads: 2 | |
160 | both: 1 |
|
160 | both: 1 | |
161 | local heads: 3 |
|
161 | local heads: 3 | |
162 | common: 1 |
|
162 | common: 1 | |
163 | missing: 2 |
|
163 | missing: 2 | |
164 | remote heads: 2 |
|
164 | remote heads: 2 | |
165 | common: 2 |
|
165 | common: 2 | |
166 | unknown: 0 |
|
166 | unknown: 0 | |
167 | local changesets: 15 |
|
167 | local changesets: 15 | |
168 | common: 7 |
|
168 | common: 7 | |
169 | missing: 8 |
|
169 | missing: 8 | |
170 | common heads: 01241442b3c2 b5714e113bc0 |
|
170 | common heads: 01241442b3c2 b5714e113bc0 | |
171 |
|
171 | |||
172 |
|
172 | |||
173 | Many new: |
|
173 | Many new: | |
174 |
|
174 | |||
175 | $ testdesc '-ra1 -ra2' '-rb' ' |
|
175 | $ testdesc '-ra1 -ra2' '-rb' ' | |
176 | > +2:f +3:a1 +3:b |
|
176 | > +2:f +3:a1 +3:b | |
177 | > <f +30 :a2' |
|
177 | > <f +30 :a2' | |
178 |
|
178 | |||
179 | % -- a -> b tree |
|
179 | % -- a -> b tree | |
180 | comparing with b |
|
180 | comparing with b | |
181 | searching for changes |
|
181 | searching for changes | |
182 | unpruned common: bebd167eb94d |
|
182 | unpruned common: bebd167eb94d | |
183 | elapsed time: * seconds (glob) |
|
183 | elapsed time: * seconds (glob) | |
184 | heads summary: |
|
184 | heads summary: | |
185 | total common heads: 1 |
|
185 | total common heads: 1 | |
186 | also local heads: 1 |
|
186 | also local heads: 1 | |
187 | also remote heads: 0 |
|
187 | also remote heads: 0 | |
188 | both: 0 |
|
188 | both: 0 | |
189 | local heads: 2 |
|
189 | local heads: 2 | |
190 | common: 1 |
|
190 | common: 1 | |
191 | missing: 1 |
|
191 | missing: 1 | |
192 | remote heads: 1 |
|
192 | remote heads: 1 | |
193 | common: 0 |
|
193 | common: 0 | |
194 | unknown: 1 |
|
194 | unknown: 1 | |
195 | local changesets: 35 |
|
195 | local changesets: 35 | |
196 | common: 5 |
|
196 | common: 5 | |
197 | missing: 30 |
|
197 | missing: 30 | |
198 | common heads: bebd167eb94d |
|
198 | common heads: bebd167eb94d | |
199 |
|
199 | |||
200 | % -- a -> b set |
|
200 | % -- a -> b set | |
201 | comparing with b |
|
201 | comparing with b | |
202 | query 1; heads |
|
202 | query 1; heads | |
203 | searching for changes |
|
203 | searching for changes | |
204 | taking initial sample |
|
204 | taking initial sample | |
205 | searching: 2 queries |
|
205 | searching: 2 queries | |
206 | query 2; still undecided: 29, sample size is: 29 |
|
206 | query 2; still undecided: 29, sample size is: 29 | |
207 | 2 total queries in *.????s (glob) |
|
207 | 2 total queries in *.????s (glob) | |
208 | elapsed time: * seconds (glob) |
|
208 | elapsed time: * seconds (glob) | |
209 | heads summary: |
|
209 | heads summary: | |
210 | total common heads: 1 |
|
210 | total common heads: 1 | |
211 | also local heads: 1 |
|
211 | also local heads: 1 | |
212 | also remote heads: 0 |
|
212 | also remote heads: 0 | |
213 | both: 0 |
|
213 | both: 0 | |
214 | local heads: 2 |
|
214 | local heads: 2 | |
215 | common: 1 |
|
215 | common: 1 | |
216 | missing: 1 |
|
216 | missing: 1 | |
217 | remote heads: 1 |
|
217 | remote heads: 1 | |
218 | common: 0 |
|
218 | common: 0 | |
219 | unknown: 1 |
|
219 | unknown: 1 | |
220 | local changesets: 35 |
|
220 | local changesets: 35 | |
221 | common: 5 |
|
221 | common: 5 | |
222 | missing: 30 |
|
222 | missing: 30 | |
223 | common heads: bebd167eb94d |
|
223 | common heads: bebd167eb94d | |
224 |
|
224 | |||
225 | % -- a -> b set (tip only) |
|
225 | % -- a -> b set (tip only) | |
226 | comparing with b |
|
226 | comparing with b | |
227 | query 1; heads |
|
227 | query 1; heads | |
228 | searching for changes |
|
228 | searching for changes | |
229 | taking quick initial sample |
|
229 | taking quick initial sample | |
230 | searching: 2 queries |
|
230 | searching: 2 queries | |
231 | query 2; still undecided: 31, sample size is: 31 |
|
231 | query 2; still undecided: 31, sample size is: 31 | |
232 | 2 total queries in *.????s (glob) |
|
232 | 2 total queries in *.????s (glob) | |
233 | elapsed time: * seconds (glob) |
|
233 | elapsed time: * seconds (glob) | |
234 | heads summary: |
|
234 | heads summary: | |
235 | total common heads: 1 |
|
235 | total common heads: 1 | |
236 | also local heads: 0 |
|
236 | also local heads: 0 | |
237 | also remote heads: 0 |
|
237 | also remote heads: 0 | |
238 | both: 0 |
|
238 | both: 0 | |
239 | local heads: 2 |
|
239 | local heads: 2 | |
240 | common: 0 |
|
240 | common: 0 | |
241 | missing: 2 |
|
241 | missing: 2 | |
242 | remote heads: 1 |
|
242 | remote heads: 1 | |
243 | common: 0 |
|
243 | common: 0 | |
244 | unknown: 1 |
|
244 | unknown: 1 | |
245 | local changesets: 35 |
|
245 | local changesets: 35 | |
246 | common: 2 |
|
246 | common: 2 | |
247 | missing: 33 |
|
247 | missing: 33 | |
248 | common heads: 66f7d451a68b |
|
248 | common heads: 66f7d451a68b | |
249 |
|
249 | |||
250 | % -- b -> a tree |
|
250 | % -- b -> a tree | |
251 | comparing with a |
|
251 | comparing with a | |
252 | searching for changes |
|
252 | searching for changes | |
253 | unpruned common: 66f7d451a68b bebd167eb94d |
|
253 | unpruned common: 66f7d451a68b bebd167eb94d | |
254 | elapsed time: * seconds (glob) |
|
254 | elapsed time: * seconds (glob) | |
255 | heads summary: |
|
255 | heads summary: | |
256 | total common heads: 1 |
|
256 | total common heads: 1 | |
257 | also local heads: 0 |
|
257 | also local heads: 0 | |
258 | also remote heads: 1 |
|
258 | also remote heads: 1 | |
259 | both: 0 |
|
259 | both: 0 | |
260 | local heads: 1 |
|
260 | local heads: 1 | |
261 | common: 0 |
|
261 | common: 0 | |
262 | missing: 1 |
|
262 | missing: 1 | |
263 | remote heads: 2 |
|
263 | remote heads: 2 | |
264 | common: 1 |
|
264 | common: 1 | |
265 | unknown: 1 |
|
265 | unknown: 1 | |
266 | local changesets: 8 |
|
266 | local changesets: 8 | |
267 | common: 5 |
|
267 | common: 5 | |
268 | missing: 3 |
|
268 | missing: 3 | |
269 | common heads: bebd167eb94d |
|
269 | common heads: bebd167eb94d | |
270 |
|
270 | |||
271 | % -- b -> a set |
|
271 | % -- b -> a set | |
272 | comparing with a |
|
272 | comparing with a | |
273 | query 1; heads |
|
273 | query 1; heads | |
274 | searching for changes |
|
274 | searching for changes | |
275 | taking initial sample |
|
275 | taking initial sample | |
276 | searching: 2 queries |
|
276 | searching: 2 queries | |
277 | query 2; still undecided: 2, sample size is: 2 |
|
277 | query 2; still undecided: 2, sample size is: 2 | |
278 | 2 total queries in *.????s (glob) |
|
278 | 2 total queries in *.????s (glob) | |
279 | elapsed time: * seconds (glob) |
|
279 | elapsed time: * seconds (glob) | |
280 | heads summary: |
|
280 | heads summary: | |
281 | total common heads: 1 |
|
281 | total common heads: 1 | |
282 | also local heads: 0 |
|
282 | also local heads: 0 | |
283 | also remote heads: 1 |
|
283 | also remote heads: 1 | |
284 | both: 0 |
|
284 | both: 0 | |
285 | local heads: 1 |
|
285 | local heads: 1 | |
286 | common: 0 |
|
286 | common: 0 | |
287 | missing: 1 |
|
287 | missing: 1 | |
288 | remote heads: 2 |
|
288 | remote heads: 2 | |
289 | common: 1 |
|
289 | common: 1 | |
290 | unknown: 1 |
|
290 | unknown: 1 | |
291 | local changesets: 8 |
|
291 | local changesets: 8 | |
292 | common: 5 |
|
292 | common: 5 | |
293 | missing: 3 |
|
293 | missing: 3 | |
294 | common heads: bebd167eb94d |
|
294 | common heads: bebd167eb94d | |
295 |
|
295 | |||
296 | % -- b -> a set (tip only) |
|
296 | % -- b -> a set (tip only) | |
297 | comparing with a |
|
297 | comparing with a | |
298 | query 1; heads |
|
298 | query 1; heads | |
299 | searching for changes |
|
299 | searching for changes | |
300 | taking initial sample |
|
300 | taking initial sample | |
301 | searching: 2 queries |
|
301 | searching: 2 queries | |
302 | query 2; still undecided: 2, sample size is: 2 |
|
302 | query 2; still undecided: 2, sample size is: 2 | |
303 | 2 total queries in *.????s (glob) |
|
303 | 2 total queries in *.????s (glob) | |
304 | elapsed time: * seconds (glob) |
|
304 | elapsed time: * seconds (glob) | |
305 | heads summary: |
|
305 | heads summary: | |
306 | total common heads: 1 |
|
306 | total common heads: 1 | |
307 | also local heads: 0 |
|
307 | also local heads: 0 | |
308 | also remote heads: 1 |
|
308 | also remote heads: 1 | |
309 | both: 0 |
|
309 | both: 0 | |
310 | local heads: 1 |
|
310 | local heads: 1 | |
311 | common: 0 |
|
311 | common: 0 | |
312 | missing: 1 |
|
312 | missing: 1 | |
313 | remote heads: 2 |
|
313 | remote heads: 2 | |
314 | common: 1 |
|
314 | common: 1 | |
315 | unknown: 1 |
|
315 | unknown: 1 | |
316 | local changesets: 8 |
|
316 | local changesets: 8 | |
317 | common: 5 |
|
317 | common: 5 | |
318 | missing: 3 |
|
318 | missing: 3 | |
319 | common heads: bebd167eb94d |
|
319 | common heads: bebd167eb94d | |
320 |
|
320 | |||
321 | Both sides many new with stub: |
|
321 | Both sides many new with stub: | |
322 |
|
322 | |||
323 | $ testdesc '-ra1 -ra2' '-rb' ' |
|
323 | $ testdesc '-ra1 -ra2' '-rb' ' | |
324 | > +2:f +2:a1 +30 :b |
|
324 | > +2:f +2:a1 +30 :b | |
325 | > <f +30 :a2' |
|
325 | > <f +30 :a2' | |
326 |
|
326 | |||
327 | % -- a -> b tree |
|
327 | % -- a -> b tree | |
328 | comparing with b |
|
328 | comparing with b | |
329 | searching for changes |
|
329 | searching for changes | |
330 | unpruned common: 2dc09a01254d |
|
330 | unpruned common: 2dc09a01254d | |
331 | elapsed time: * seconds (glob) |
|
331 | elapsed time: * seconds (glob) | |
332 | heads summary: |
|
332 | heads summary: | |
333 | total common heads: 1 |
|
333 | total common heads: 1 | |
334 | also local heads: 1 |
|
334 | also local heads: 1 | |
335 | also remote heads: 0 |
|
335 | also remote heads: 0 | |
336 | both: 0 |
|
336 | both: 0 | |
337 | local heads: 2 |
|
337 | local heads: 2 | |
338 | common: 1 |
|
338 | common: 1 | |
339 | missing: 1 |
|
339 | missing: 1 | |
340 | remote heads: 1 |
|
340 | remote heads: 1 | |
341 | common: 0 |
|
341 | common: 0 | |
342 | unknown: 1 |
|
342 | unknown: 1 | |
343 | local changesets: 34 |
|
343 | local changesets: 34 | |
344 | common: 4 |
|
344 | common: 4 | |
345 | missing: 30 |
|
345 | missing: 30 | |
346 | common heads: 2dc09a01254d |
|
346 | common heads: 2dc09a01254d | |
347 |
|
347 | |||
348 | % -- a -> b set |
|
348 | % -- a -> b set | |
349 | comparing with b |
|
349 | comparing with b | |
350 | query 1; heads |
|
350 | query 1; heads | |
351 | searching for changes |
|
351 | searching for changes | |
352 | taking initial sample |
|
352 | taking initial sample | |
353 | searching: 2 queries |
|
353 | searching: 2 queries | |
354 | query 2; still undecided: 29, sample size is: 29 |
|
354 | query 2; still undecided: 29, sample size is: 29 | |
355 | 2 total queries in *.????s (glob) |
|
355 | 2 total queries in *.????s (glob) | |
356 | elapsed time: * seconds (glob) |
|
356 | elapsed time: * seconds (glob) | |
357 | heads summary: |
|
357 | heads summary: | |
358 | total common heads: 1 |
|
358 | total common heads: 1 | |
359 | also local heads: 1 |
|
359 | also local heads: 1 | |
360 | also remote heads: 0 |
|
360 | also remote heads: 0 | |
361 | both: 0 |
|
361 | both: 0 | |
362 | local heads: 2 |
|
362 | local heads: 2 | |
363 | common: 1 |
|
363 | common: 1 | |
364 | missing: 1 |
|
364 | missing: 1 | |
365 | remote heads: 1 |
|
365 | remote heads: 1 | |
366 | common: 0 |
|
366 | common: 0 | |
367 | unknown: 1 |
|
367 | unknown: 1 | |
368 | local changesets: 34 |
|
368 | local changesets: 34 | |
369 | common: 4 |
|
369 | common: 4 | |
370 | missing: 30 |
|
370 | missing: 30 | |
371 | common heads: 2dc09a01254d |
|
371 | common heads: 2dc09a01254d | |
372 |
|
372 | |||
373 | % -- a -> b set (tip only) |
|
373 | % -- a -> b set (tip only) | |
374 | comparing with b |
|
374 | comparing with b | |
375 | query 1; heads |
|
375 | query 1; heads | |
376 | searching for changes |
|
376 | searching for changes | |
377 | taking quick initial sample |
|
377 | taking quick initial sample | |
378 | searching: 2 queries |
|
378 | searching: 2 queries | |
379 | query 2; still undecided: 31, sample size is: 31 |
|
379 | query 2; still undecided: 31, sample size is: 31 | |
380 | 2 total queries in *.????s (glob) |
|
380 | 2 total queries in *.????s (glob) | |
381 | elapsed time: * seconds (glob) |
|
381 | elapsed time: * seconds (glob) | |
382 | heads summary: |
|
382 | heads summary: | |
383 | total common heads: 1 |
|
383 | total common heads: 1 | |
384 | also local heads: 0 |
|
384 | also local heads: 0 | |
385 | also remote heads: 0 |
|
385 | also remote heads: 0 | |
386 | both: 0 |
|
386 | both: 0 | |
387 | local heads: 2 |
|
387 | local heads: 2 | |
388 | common: 0 |
|
388 | common: 0 | |
389 | missing: 2 |
|
389 | missing: 2 | |
390 | remote heads: 1 |
|
390 | remote heads: 1 | |
391 | common: 0 |
|
391 | common: 0 | |
392 | unknown: 1 |
|
392 | unknown: 1 | |
393 | local changesets: 34 |
|
393 | local changesets: 34 | |
394 | common: 2 |
|
394 | common: 2 | |
395 | missing: 32 |
|
395 | missing: 32 | |
396 | common heads: 66f7d451a68b |
|
396 | common heads: 66f7d451a68b | |
397 |
|
397 | |||
398 | % -- b -> a tree |
|
398 | % -- b -> a tree | |
399 | comparing with a |
|
399 | comparing with a | |
400 | searching for changes |
|
400 | searching for changes | |
401 | unpruned common: 2dc09a01254d 66f7d451a68b |
|
401 | unpruned common: 2dc09a01254d 66f7d451a68b | |
402 | elapsed time: * seconds (glob) |
|
402 | elapsed time: * seconds (glob) | |
403 | heads summary: |
|
403 | heads summary: | |
404 | total common heads: 1 |
|
404 | total common heads: 1 | |
405 | also local heads: 0 |
|
405 | also local heads: 0 | |
406 | also remote heads: 1 |
|
406 | also remote heads: 1 | |
407 | both: 0 |
|
407 | both: 0 | |
408 | local heads: 1 |
|
408 | local heads: 1 | |
409 | common: 0 |
|
409 | common: 0 | |
410 | missing: 1 |
|
410 | missing: 1 | |
411 | remote heads: 2 |
|
411 | remote heads: 2 | |
412 | common: 1 |
|
412 | common: 1 | |
413 | unknown: 1 |
|
413 | unknown: 1 | |
414 | local changesets: 34 |
|
414 | local changesets: 34 | |
415 | common: 4 |
|
415 | common: 4 | |
416 | missing: 30 |
|
416 | missing: 30 | |
417 | common heads: 2dc09a01254d |
|
417 | common heads: 2dc09a01254d | |
418 |
|
418 | |||
419 | % -- b -> a set |
|
419 | % -- b -> a set | |
420 | comparing with a |
|
420 | comparing with a | |
421 | query 1; heads |
|
421 | query 1; heads | |
422 | searching for changes |
|
422 | searching for changes | |
423 | taking initial sample |
|
423 | taking initial sample | |
424 | searching: 2 queries |
|
424 | searching: 2 queries | |
425 | query 2; still undecided: 29, sample size is: 29 |
|
425 | query 2; still undecided: 29, sample size is: 29 | |
426 | 2 total queries in *.????s (glob) |
|
426 | 2 total queries in *.????s (glob) | |
427 | elapsed time: * seconds (glob) |
|
427 | elapsed time: * seconds (glob) | |
428 | heads summary: |
|
428 | heads summary: | |
429 | total common heads: 1 |
|
429 | total common heads: 1 | |
430 | also local heads: 0 |
|
430 | also local heads: 0 | |
431 | also remote heads: 1 |
|
431 | also remote heads: 1 | |
432 | both: 0 |
|
432 | both: 0 | |
433 | local heads: 1 |
|
433 | local heads: 1 | |
434 | common: 0 |
|
434 | common: 0 | |
435 | missing: 1 |
|
435 | missing: 1 | |
436 | remote heads: 2 |
|
436 | remote heads: 2 | |
437 | common: 1 |
|
437 | common: 1 | |
438 | unknown: 1 |
|
438 | unknown: 1 | |
439 | local changesets: 34 |
|
439 | local changesets: 34 | |
440 | common: 4 |
|
440 | common: 4 | |
441 | missing: 30 |
|
441 | missing: 30 | |
442 | common heads: 2dc09a01254d |
|
442 | common heads: 2dc09a01254d | |
443 |
|
443 | |||
444 | % -- b -> a set (tip only) |
|
444 | % -- b -> a set (tip only) | |
445 | comparing with a |
|
445 | comparing with a | |
446 | query 1; heads |
|
446 | query 1; heads | |
447 | searching for changes |
|
447 | searching for changes | |
448 | taking initial sample |
|
448 | taking initial sample | |
449 | searching: 2 queries |
|
449 | searching: 2 queries | |
450 | query 2; still undecided: 29, sample size is: 29 |
|
450 | query 2; still undecided: 29, sample size is: 29 | |
451 | 2 total queries in *.????s (glob) |
|
451 | 2 total queries in *.????s (glob) | |
452 | elapsed time: * seconds (glob) |
|
452 | elapsed time: * seconds (glob) | |
453 | heads summary: |
|
453 | heads summary: | |
454 | total common heads: 1 |
|
454 | total common heads: 1 | |
455 | also local heads: 0 |
|
455 | also local heads: 0 | |
456 | also remote heads: 1 |
|
456 | also remote heads: 1 | |
457 | both: 0 |
|
457 | both: 0 | |
458 | local heads: 1 |
|
458 | local heads: 1 | |
459 | common: 0 |
|
459 | common: 0 | |
460 | missing: 1 |
|
460 | missing: 1 | |
461 | remote heads: 2 |
|
461 | remote heads: 2 | |
462 | common: 1 |
|
462 | common: 1 | |
463 | unknown: 1 |
|
463 | unknown: 1 | |
464 | local changesets: 34 |
|
464 | local changesets: 34 | |
465 | common: 4 |
|
465 | common: 4 | |
466 | missing: 30 |
|
466 | missing: 30 | |
467 | common heads: 2dc09a01254d |
|
467 | common heads: 2dc09a01254d | |
468 |
|
468 | |||
469 |
|
469 | |||
470 | Both many new: |
|
470 | Both many new: | |
471 |
|
471 | |||
472 | $ testdesc '-ra' '-rb' ' |
|
472 | $ testdesc '-ra' '-rb' ' | |
473 | > +2:f +30 :b |
|
473 | > +2:f +30 :b | |
474 | > <f +30 :a' |
|
474 | > <f +30 :a' | |
475 |
|
475 | |||
476 | % -- a -> b tree |
|
476 | % -- a -> b tree | |
477 | comparing with b |
|
477 | comparing with b | |
478 | searching for changes |
|
478 | searching for changes | |
479 | unpruned common: 66f7d451a68b |
|
479 | unpruned common: 66f7d451a68b | |
480 | elapsed time: * seconds (glob) |
|
480 | elapsed time: * seconds (glob) | |
481 | heads summary: |
|
481 | heads summary: | |
482 | total common heads: 1 |
|
482 | total common heads: 1 | |
483 | also local heads: 0 |
|
483 | also local heads: 0 | |
484 | also remote heads: 0 |
|
484 | also remote heads: 0 | |
485 | both: 0 |
|
485 | both: 0 | |
486 | local heads: 1 |
|
486 | local heads: 1 | |
487 | common: 0 |
|
487 | common: 0 | |
488 | missing: 1 |
|
488 | missing: 1 | |
489 | remote heads: 1 |
|
489 | remote heads: 1 | |
490 | common: 0 |
|
490 | common: 0 | |
491 | unknown: 1 |
|
491 | unknown: 1 | |
492 | local changesets: 32 |
|
492 | local changesets: 32 | |
493 | common: 2 |
|
493 | common: 2 | |
494 | missing: 30 |
|
494 | missing: 30 | |
495 | common heads: 66f7d451a68b |
|
495 | common heads: 66f7d451a68b | |
496 |
|
496 | |||
497 | % -- a -> b set |
|
497 | % -- a -> b set | |
498 | comparing with b |
|
498 | comparing with b | |
499 | query 1; heads |
|
499 | query 1; heads | |
500 | searching for changes |
|
500 | searching for changes | |
501 | taking quick initial sample |
|
501 | taking quick initial sample | |
502 | searching: 2 queries |
|
502 | searching: 2 queries | |
503 | query 2; still undecided: 31, sample size is: 31 |
|
503 | query 2; still undecided: 31, sample size is: 31 | |
504 | 2 total queries in *.????s (glob) |
|
504 | 2 total queries in *.????s (glob) | |
505 | elapsed time: * seconds (glob) |
|
505 | elapsed time: * seconds (glob) | |
506 | heads summary: |
|
506 | heads summary: | |
507 | total common heads: 1 |
|
507 | total common heads: 1 | |
508 | also local heads: 0 |
|
508 | also local heads: 0 | |
509 | also remote heads: 0 |
|
509 | also remote heads: 0 | |
510 | both: 0 |
|
510 | both: 0 | |
511 | local heads: 1 |
|
511 | local heads: 1 | |
512 | common: 0 |
|
512 | common: 0 | |
513 | missing: 1 |
|
513 | missing: 1 | |
514 | remote heads: 1 |
|
514 | remote heads: 1 | |
515 | common: 0 |
|
515 | common: 0 | |
516 | unknown: 1 |
|
516 | unknown: 1 | |
517 | local changesets: 32 |
|
517 | local changesets: 32 | |
518 | common: 2 |
|
518 | common: 2 | |
519 | missing: 30 |
|
519 | missing: 30 | |
520 | common heads: 66f7d451a68b |
|
520 | common heads: 66f7d451a68b | |
521 |
|
521 | |||
522 | % -- a -> b set (tip only) |
|
522 | % -- a -> b set (tip only) | |
523 | comparing with b |
|
523 | comparing with b | |
524 | query 1; heads |
|
524 | query 1; heads | |
525 | searching for changes |
|
525 | searching for changes | |
526 | taking quick initial sample |
|
526 | taking quick initial sample | |
527 | searching: 2 queries |
|
527 | searching: 2 queries | |
528 | query 2; still undecided: 31, sample size is: 31 |
|
528 | query 2; still undecided: 31, sample size is: 31 | |
529 | 2 total queries in *.????s (glob) |
|
529 | 2 total queries in *.????s (glob) | |
530 | elapsed time: * seconds (glob) |
|
530 | elapsed time: * seconds (glob) | |
531 | heads summary: |
|
531 | heads summary: | |
532 | total common heads: 1 |
|
532 | total common heads: 1 | |
533 | also local heads: 0 |
|
533 | also local heads: 0 | |
534 | also remote heads: 0 |
|
534 | also remote heads: 0 | |
535 | both: 0 |
|
535 | both: 0 | |
536 | local heads: 1 |
|
536 | local heads: 1 | |
537 | common: 0 |
|
537 | common: 0 | |
538 | missing: 1 |
|
538 | missing: 1 | |
539 | remote heads: 1 |
|
539 | remote heads: 1 | |
540 | common: 0 |
|
540 | common: 0 | |
541 | unknown: 1 |
|
541 | unknown: 1 | |
542 | local changesets: 32 |
|
542 | local changesets: 32 | |
543 | common: 2 |
|
543 | common: 2 | |
544 | missing: 30 |
|
544 | missing: 30 | |
545 | common heads: 66f7d451a68b |
|
545 | common heads: 66f7d451a68b | |
546 |
|
546 | |||
547 | % -- b -> a tree |
|
547 | % -- b -> a tree | |
548 | comparing with a |
|
548 | comparing with a | |
549 | searching for changes |
|
549 | searching for changes | |
550 | unpruned common: 66f7d451a68b |
|
550 | unpruned common: 66f7d451a68b | |
551 | elapsed time: * seconds (glob) |
|
551 | elapsed time: * seconds (glob) | |
552 | heads summary: |
|
552 | heads summary: | |
553 | total common heads: 1 |
|
553 | total common heads: 1 | |
554 | also local heads: 0 |
|
554 | also local heads: 0 | |
555 | also remote heads: 0 |
|
555 | also remote heads: 0 | |
556 | both: 0 |
|
556 | both: 0 | |
557 | local heads: 1 |
|
557 | local heads: 1 | |
558 | common: 0 |
|
558 | common: 0 | |
559 | missing: 1 |
|
559 | missing: 1 | |
560 | remote heads: 1 |
|
560 | remote heads: 1 | |
561 | common: 0 |
|
561 | common: 0 | |
562 | unknown: 1 |
|
562 | unknown: 1 | |
563 | local changesets: 32 |
|
563 | local changesets: 32 | |
564 | common: 2 |
|
564 | common: 2 | |
565 | missing: 30 |
|
565 | missing: 30 | |
566 | common heads: 66f7d451a68b |
|
566 | common heads: 66f7d451a68b | |
567 |
|
567 | |||
568 | % -- b -> a set |
|
568 | % -- b -> a set | |
569 | comparing with a |
|
569 | comparing with a | |
570 | query 1; heads |
|
570 | query 1; heads | |
571 | searching for changes |
|
571 | searching for changes | |
572 | taking quick initial sample |
|
572 | taking quick initial sample | |
573 | searching: 2 queries |
|
573 | searching: 2 queries | |
574 | query 2; still undecided: 31, sample size is: 31 |
|
574 | query 2; still undecided: 31, sample size is: 31 | |
575 | 2 total queries in *.????s (glob) |
|
575 | 2 total queries in *.????s (glob) | |
576 | elapsed time: * seconds (glob) |
|
576 | elapsed time: * seconds (glob) | |
577 | heads summary: |
|
577 | heads summary: | |
578 | total common heads: 1 |
|
578 | total common heads: 1 | |
579 | also local heads: 0 |
|
579 | also local heads: 0 | |
580 | also remote heads: 0 |
|
580 | also remote heads: 0 | |
581 | both: 0 |
|
581 | both: 0 | |
582 | local heads: 1 |
|
582 | local heads: 1 | |
583 | common: 0 |
|
583 | common: 0 | |
584 | missing: 1 |
|
584 | missing: 1 | |
585 | remote heads: 1 |
|
585 | remote heads: 1 | |
586 | common: 0 |
|
586 | common: 0 | |
587 | unknown: 1 |
|
587 | unknown: 1 | |
588 | local changesets: 32 |
|
588 | local changesets: 32 | |
589 | common: 2 |
|
589 | common: 2 | |
590 | missing: 30 |
|
590 | missing: 30 | |
591 | common heads: 66f7d451a68b |
|
591 | common heads: 66f7d451a68b | |
592 |
|
592 | |||
593 | % -- b -> a set (tip only) |
|
593 | % -- b -> a set (tip only) | |
594 | comparing with a |
|
594 | comparing with a | |
595 | query 1; heads |
|
595 | query 1; heads | |
596 | searching for changes |
|
596 | searching for changes | |
597 | taking quick initial sample |
|
597 | taking quick initial sample | |
598 | searching: 2 queries |
|
598 | searching: 2 queries | |
599 | query 2; still undecided: 31, sample size is: 31 |
|
599 | query 2; still undecided: 31, sample size is: 31 | |
600 | 2 total queries in *.????s (glob) |
|
600 | 2 total queries in *.????s (glob) | |
601 | elapsed time: * seconds (glob) |
|
601 | elapsed time: * seconds (glob) | |
602 | heads summary: |
|
602 | heads summary: | |
603 | total common heads: 1 |
|
603 | total common heads: 1 | |
604 | also local heads: 0 |
|
604 | also local heads: 0 | |
605 | also remote heads: 0 |
|
605 | also remote heads: 0 | |
606 | both: 0 |
|
606 | both: 0 | |
607 | local heads: 1 |
|
607 | local heads: 1 | |
608 | common: 0 |
|
608 | common: 0 | |
609 | missing: 1 |
|
609 | missing: 1 | |
610 | remote heads: 1 |
|
610 | remote heads: 1 | |
611 | common: 0 |
|
611 | common: 0 | |
612 | unknown: 1 |
|
612 | unknown: 1 | |
613 | local changesets: 32 |
|
613 | local changesets: 32 | |
614 | common: 2 |
|
614 | common: 2 | |
615 | missing: 30 |
|
615 | missing: 30 | |
616 | common heads: 66f7d451a68b |
|
616 | common heads: 66f7d451a68b | |
617 |
|
617 | |||
618 |
|
618 | |||
619 | Both many new skewed: |
|
619 | Both many new skewed: | |
620 |
|
620 | |||
621 | $ testdesc '-ra' '-rb' ' |
|
621 | $ testdesc '-ra' '-rb' ' | |
622 | > +2:f +30 :b |
|
622 | > +2:f +30 :b | |
623 | > <f +50 :a' |
|
623 | > <f +50 :a' | |
624 |
|
624 | |||
625 | % -- a -> b tree |
|
625 | % -- a -> b tree | |
626 | comparing with b |
|
626 | comparing with b | |
627 | searching for changes |
|
627 | searching for changes | |
628 | unpruned common: 66f7d451a68b |
|
628 | unpruned common: 66f7d451a68b | |
629 | elapsed time: * seconds (glob) |
|
629 | elapsed time: * seconds (glob) | |
630 | heads summary: |
|
630 | heads summary: | |
631 | total common heads: 1 |
|
631 | total common heads: 1 | |
632 | also local heads: 0 |
|
632 | also local heads: 0 | |
633 | also remote heads: 0 |
|
633 | also remote heads: 0 | |
634 | both: 0 |
|
634 | both: 0 | |
635 | local heads: 1 |
|
635 | local heads: 1 | |
636 | common: 0 |
|
636 | common: 0 | |
637 | missing: 1 |
|
637 | missing: 1 | |
638 | remote heads: 1 |
|
638 | remote heads: 1 | |
639 | common: 0 |
|
639 | common: 0 | |
640 | unknown: 1 |
|
640 | unknown: 1 | |
641 | local changesets: 52 |
|
641 | local changesets: 52 | |
642 | common: 2 |
|
642 | common: 2 | |
643 | missing: 50 |
|
643 | missing: 50 | |
644 | common heads: 66f7d451a68b |
|
644 | common heads: 66f7d451a68b | |
645 |
|
645 | |||
646 | % -- a -> b set |
|
646 | % -- a -> b set | |
647 | comparing with b |
|
647 | comparing with b | |
648 | query 1; heads |
|
648 | query 1; heads | |
649 | searching for changes |
|
649 | searching for changes | |
650 | taking quick initial sample |
|
650 | taking quick initial sample | |
651 | searching: 2 queries |
|
651 | searching: 2 queries | |
652 | query 2; still undecided: 51, sample size is: 51 |
|
652 | query 2; still undecided: 51, sample size is: 51 | |
653 | 2 total queries in *.????s (glob) |
|
653 | 2 total queries in *.????s (glob) | |
654 | elapsed time: * seconds (glob) |
|
654 | elapsed time: * seconds (glob) | |
655 | heads summary: |
|
655 | heads summary: | |
656 | total common heads: 1 |
|
656 | total common heads: 1 | |
657 | also local heads: 0 |
|
657 | also local heads: 0 | |
658 | also remote heads: 0 |
|
658 | also remote heads: 0 | |
659 | both: 0 |
|
659 | both: 0 | |
660 | local heads: 1 |
|
660 | local heads: 1 | |
661 | common: 0 |
|
661 | common: 0 | |
662 | missing: 1 |
|
662 | missing: 1 | |
663 | remote heads: 1 |
|
663 | remote heads: 1 | |
664 | common: 0 |
|
664 | common: 0 | |
665 | unknown: 1 |
|
665 | unknown: 1 | |
666 | local changesets: 52 |
|
666 | local changesets: 52 | |
667 | common: 2 |
|
667 | common: 2 | |
668 | missing: 50 |
|
668 | missing: 50 | |
669 | common heads: 66f7d451a68b |
|
669 | common heads: 66f7d451a68b | |
670 |
|
670 | |||
671 | % -- a -> b set (tip only) |
|
671 | % -- a -> b set (tip only) | |
672 | comparing with b |
|
672 | comparing with b | |
673 | query 1; heads |
|
673 | query 1; heads | |
674 | searching for changes |
|
674 | searching for changes | |
675 | taking quick initial sample |
|
675 | taking quick initial sample | |
676 | searching: 2 queries |
|
676 | searching: 2 queries | |
677 | query 2; still undecided: 51, sample size is: 51 |
|
677 | query 2; still undecided: 51, sample size is: 51 | |
678 | 2 total queries in *.????s (glob) |
|
678 | 2 total queries in *.????s (glob) | |
679 | elapsed time: * seconds (glob) |
|
679 | elapsed time: * seconds (glob) | |
680 | heads summary: |
|
680 | heads summary: | |
681 | total common heads: 1 |
|
681 | total common heads: 1 | |
682 | also local heads: 0 |
|
682 | also local heads: 0 | |
683 | also remote heads: 0 |
|
683 | also remote heads: 0 | |
684 | both: 0 |
|
684 | both: 0 | |
685 | local heads: 1 |
|
685 | local heads: 1 | |
686 | common: 0 |
|
686 | common: 0 | |
687 | missing: 1 |
|
687 | missing: 1 | |
688 | remote heads: 1 |
|
688 | remote heads: 1 | |
689 | common: 0 |
|
689 | common: 0 | |
690 | unknown: 1 |
|
690 | unknown: 1 | |
691 | local changesets: 52 |
|
691 | local changesets: 52 | |
692 | common: 2 |
|
692 | common: 2 | |
693 | missing: 50 |
|
693 | missing: 50 | |
694 | common heads: 66f7d451a68b |
|
694 | common heads: 66f7d451a68b | |
695 |
|
695 | |||
696 | % -- b -> a tree |
|
696 | % -- b -> a tree | |
697 | comparing with a |
|
697 | comparing with a | |
698 | searching for changes |
|
698 | searching for changes | |
699 | unpruned common: 66f7d451a68b |
|
699 | unpruned common: 66f7d451a68b | |
700 | elapsed time: * seconds (glob) |
|
700 | elapsed time: * seconds (glob) | |
701 | heads summary: |
|
701 | heads summary: | |
702 | total common heads: 1 |
|
702 | total common heads: 1 | |
703 | also local heads: 0 |
|
703 | also local heads: 0 | |
704 | also remote heads: 0 |
|
704 | also remote heads: 0 | |
705 | both: 0 |
|
705 | both: 0 | |
706 | local heads: 1 |
|
706 | local heads: 1 | |
707 | common: 0 |
|
707 | common: 0 | |
708 | missing: 1 |
|
708 | missing: 1 | |
709 | remote heads: 1 |
|
709 | remote heads: 1 | |
710 | common: 0 |
|
710 | common: 0 | |
711 | unknown: 1 |
|
711 | unknown: 1 | |
712 | local changesets: 32 |
|
712 | local changesets: 32 | |
713 | common: 2 |
|
713 | common: 2 | |
714 | missing: 30 |
|
714 | missing: 30 | |
715 | common heads: 66f7d451a68b |
|
715 | common heads: 66f7d451a68b | |
716 |
|
716 | |||
717 | % -- b -> a set |
|
717 | % -- b -> a set | |
718 | comparing with a |
|
718 | comparing with a | |
719 | query 1; heads |
|
719 | query 1; heads | |
720 | searching for changes |
|
720 | searching for changes | |
721 | taking quick initial sample |
|
721 | taking quick initial sample | |
722 | searching: 2 queries |
|
722 | searching: 2 queries | |
723 | query 2; still undecided: 31, sample size is: 31 |
|
723 | query 2; still undecided: 31, sample size is: 31 | |
724 | 2 total queries in *.????s (glob) |
|
724 | 2 total queries in *.????s (glob) | |
725 | elapsed time: * seconds (glob) |
|
725 | elapsed time: * seconds (glob) | |
726 | heads summary: |
|
726 | heads summary: | |
727 | total common heads: 1 |
|
727 | total common heads: 1 | |
728 | also local heads: 0 |
|
728 | also local heads: 0 | |
729 | also remote heads: 0 |
|
729 | also remote heads: 0 | |
730 | both: 0 |
|
730 | both: 0 | |
731 | local heads: 1 |
|
731 | local heads: 1 | |
732 | common: 0 |
|
732 | common: 0 | |
733 | missing: 1 |
|
733 | missing: 1 | |
734 | remote heads: 1 |
|
734 | remote heads: 1 | |
735 | common: 0 |
|
735 | common: 0 | |
736 | unknown: 1 |
|
736 | unknown: 1 | |
737 | local changesets: 32 |
|
737 | local changesets: 32 | |
738 | common: 2 |
|
738 | common: 2 | |
739 | missing: 30 |
|
739 | missing: 30 | |
740 | common heads: 66f7d451a68b |
|
740 | common heads: 66f7d451a68b | |
741 |
|
741 | |||
742 | % -- b -> a set (tip only) |
|
742 | % -- b -> a set (tip only) | |
743 | comparing with a |
|
743 | comparing with a | |
744 | query 1; heads |
|
744 | query 1; heads | |
745 | searching for changes |
|
745 | searching for changes | |
746 | taking quick initial sample |
|
746 | taking quick initial sample | |
747 | searching: 2 queries |
|
747 | searching: 2 queries | |
748 | query 2; still undecided: 31, sample size is: 31 |
|
748 | query 2; still undecided: 31, sample size is: 31 | |
749 | 2 total queries in *.????s (glob) |
|
749 | 2 total queries in *.????s (glob) | |
750 | elapsed time: * seconds (glob) |
|
750 | elapsed time: * seconds (glob) | |
751 | heads summary: |
|
751 | heads summary: | |
752 | total common heads: 1 |
|
752 | total common heads: 1 | |
753 | also local heads: 0 |
|
753 | also local heads: 0 | |
754 | also remote heads: 0 |
|
754 | also remote heads: 0 | |
755 | both: 0 |
|
755 | both: 0 | |
756 | local heads: 1 |
|
756 | local heads: 1 | |
757 | common: 0 |
|
757 | common: 0 | |
758 | missing: 1 |
|
758 | missing: 1 | |
759 | remote heads: 1 |
|
759 | remote heads: 1 | |
760 | common: 0 |
|
760 | common: 0 | |
761 | unknown: 1 |
|
761 | unknown: 1 | |
762 | local changesets: 32 |
|
762 | local changesets: 32 | |
763 | common: 2 |
|
763 | common: 2 | |
764 | missing: 30 |
|
764 | missing: 30 | |
765 | common heads: 66f7d451a68b |
|
765 | common heads: 66f7d451a68b | |
766 |
|
766 | |||
767 |
|
767 | |||
768 | Both many new on top of long history: |
|
768 | Both many new on top of long history: | |
769 |
|
769 | |||
770 | $ testdesc '-ra' '-rb' ' |
|
770 | $ testdesc '-ra' '-rb' ' | |
771 | > +1000:f +30 :b |
|
771 | > +1000:f +30 :b | |
772 | > <f +50 :a' |
|
772 | > <f +50 :a' | |
773 |
|
773 | |||
774 | % -- a -> b tree |
|
774 | % -- a -> b tree | |
775 | comparing with b |
|
775 | comparing with b | |
776 | searching for changes |
|
776 | searching for changes | |
777 | unpruned common: 7ead0cba2838 |
|
777 | unpruned common: 7ead0cba2838 | |
778 | elapsed time: * seconds (glob) |
|
778 | elapsed time: * seconds (glob) | |
779 | heads summary: |
|
779 | heads summary: | |
780 | total common heads: 1 |
|
780 | total common heads: 1 | |
781 | also local heads: 0 |
|
781 | also local heads: 0 | |
782 | also remote heads: 0 |
|
782 | also remote heads: 0 | |
783 | both: 0 |
|
783 | both: 0 | |
784 | local heads: 1 |
|
784 | local heads: 1 | |
785 | common: 0 |
|
785 | common: 0 | |
786 | missing: 1 |
|
786 | missing: 1 | |
787 | remote heads: 1 |
|
787 | remote heads: 1 | |
788 | common: 0 |
|
788 | common: 0 | |
789 | unknown: 1 |
|
789 | unknown: 1 | |
790 | local changesets: 1050 |
|
790 | local changesets: 1050 | |
791 | common: 1000 |
|
791 | common: 1000 | |
792 | missing: 50 |
|
792 | missing: 50 | |
793 | common heads: 7ead0cba2838 |
|
793 | common heads: 7ead0cba2838 | |
794 |
|
794 | |||
795 | % -- a -> b set |
|
795 | % -- a -> b set | |
796 | comparing with b |
|
796 | comparing with b | |
797 | query 1; heads |
|
797 | query 1; heads | |
798 | searching for changes |
|
798 | searching for changes | |
799 | taking quick initial sample |
|
799 | taking quick initial sample | |
800 | searching: 2 queries |
|
800 | searching: 2 queries | |
801 | query 2; still undecided: 1049, sample size is: 11 |
|
801 | query 2; still undecided: 1049, sample size is: 11 | |
802 | sampling from both directions |
|
802 | sampling from both directions | |
803 | searching: 3 queries |
|
803 | searching: 3 queries | |
804 | query 3; still undecided: 31, sample size is: 31 |
|
804 | query 3; still undecided: 31, sample size is: 31 | |
805 | 3 total queries in *.????s (glob) |
|
805 | 3 total queries in *.????s (glob) | |
806 | elapsed time: * seconds (glob) |
|
806 | elapsed time: * seconds (glob) | |
807 | heads summary: |
|
807 | heads summary: | |
808 | total common heads: 1 |
|
808 | total common heads: 1 | |
809 | also local heads: 0 |
|
809 | also local heads: 0 | |
810 | also remote heads: 0 |
|
810 | also remote heads: 0 | |
811 | both: 0 |
|
811 | both: 0 | |
812 | local heads: 1 |
|
812 | local heads: 1 | |
813 | common: 0 |
|
813 | common: 0 | |
814 | missing: 1 |
|
814 | missing: 1 | |
815 | remote heads: 1 |
|
815 | remote heads: 1 | |
816 | common: 0 |
|
816 | common: 0 | |
817 | unknown: 1 |
|
817 | unknown: 1 | |
818 | local changesets: 1050 |
|
818 | local changesets: 1050 | |
819 | common: 1000 |
|
819 | common: 1000 | |
820 | missing: 50 |
|
820 | missing: 50 | |
821 | common heads: 7ead0cba2838 |
|
821 | common heads: 7ead0cba2838 | |
822 |
|
822 | |||
823 | % -- a -> b set (tip only) |
|
823 | % -- a -> b set (tip only) | |
824 | comparing with b |
|
824 | comparing with b | |
825 | query 1; heads |
|
825 | query 1; heads | |
826 | searching for changes |
|
826 | searching for changes | |
827 | taking quick initial sample |
|
827 | taking quick initial sample | |
828 | searching: 2 queries |
|
828 | searching: 2 queries | |
829 | query 2; still undecided: 1049, sample size is: 11 |
|
829 | query 2; still undecided: 1049, sample size is: 11 | |
830 | sampling from both directions |
|
830 | sampling from both directions | |
831 | searching: 3 queries |
|
831 | searching: 3 queries | |
832 | query 3; still undecided: 31, sample size is: 31 |
|
832 | query 3; still undecided: 31, sample size is: 31 | |
833 | 3 total queries in *.????s (glob) |
|
833 | 3 total queries in *.????s (glob) | |
834 | elapsed time: * seconds (glob) |
|
834 | elapsed time: * seconds (glob) | |
835 | heads summary: |
|
835 | heads summary: | |
836 | total common heads: 1 |
|
836 | total common heads: 1 | |
837 | also local heads: 0 |
|
837 | also local heads: 0 | |
838 | also remote heads: 0 |
|
838 | also remote heads: 0 | |
839 | both: 0 |
|
839 | both: 0 | |
840 | local heads: 1 |
|
840 | local heads: 1 | |
841 | common: 0 |
|
841 | common: 0 | |
842 | missing: 1 |
|
842 | missing: 1 | |
843 | remote heads: 1 |
|
843 | remote heads: 1 | |
844 | common: 0 |
|
844 | common: 0 | |
845 | unknown: 1 |
|
845 | unknown: 1 | |
846 | local changesets: 1050 |
|
846 | local changesets: 1050 | |
847 | common: 1000 |
|
847 | common: 1000 | |
848 | missing: 50 |
|
848 | missing: 50 | |
849 | common heads: 7ead0cba2838 |
|
849 | common heads: 7ead0cba2838 | |
850 |
|
850 | |||
851 | % -- b -> a tree |
|
851 | % -- b -> a tree | |
852 | comparing with a |
|
852 | comparing with a | |
853 | searching for changes |
|
853 | searching for changes | |
854 | unpruned common: 7ead0cba2838 |
|
854 | unpruned common: 7ead0cba2838 | |
855 | elapsed time: * seconds (glob) |
|
855 | elapsed time: * seconds (glob) | |
856 | heads summary: |
|
856 | heads summary: | |
857 | total common heads: 1 |
|
857 | total common heads: 1 | |
858 | also local heads: 0 |
|
858 | also local heads: 0 | |
859 | also remote heads: 0 |
|
859 | also remote heads: 0 | |
860 | both: 0 |
|
860 | both: 0 | |
861 | local heads: 1 |
|
861 | local heads: 1 | |
862 | common: 0 |
|
862 | common: 0 | |
863 | missing: 1 |
|
863 | missing: 1 | |
864 | remote heads: 1 |
|
864 | remote heads: 1 | |
865 | common: 0 |
|
865 | common: 0 | |
866 | unknown: 1 |
|
866 | unknown: 1 | |
867 | local changesets: 1030 |
|
867 | local changesets: 1030 | |
868 | common: 1000 |
|
868 | common: 1000 | |
869 | missing: 30 |
|
869 | missing: 30 | |
870 | common heads: 7ead0cba2838 |
|
870 | common heads: 7ead0cba2838 | |
871 |
|
871 | |||
872 | % -- b -> a set |
|
872 | % -- b -> a set | |
873 | comparing with a |
|
873 | comparing with a | |
874 | query 1; heads |
|
874 | query 1; heads | |
875 | searching for changes |
|
875 | searching for changes | |
876 | taking quick initial sample |
|
876 | taking quick initial sample | |
877 | searching: 2 queries |
|
877 | searching: 2 queries | |
878 | query 2; still undecided: 1029, sample size is: 11 |
|
878 | query 2; still undecided: 1029, sample size is: 11 | |
879 | sampling from both directions |
|
879 | sampling from both directions | |
880 | searching: 3 queries |
|
880 | searching: 3 queries | |
881 | query 3; still undecided: 15, sample size is: 15 |
|
881 | query 3; still undecided: 15, sample size is: 15 | |
882 | 3 total queries in *.????s (glob) |
|
882 | 3 total queries in *.????s (glob) | |
883 | elapsed time: * seconds (glob) |
|
883 | elapsed time: * seconds (glob) | |
884 | heads summary: |
|
884 | heads summary: | |
885 | total common heads: 1 |
|
885 | total common heads: 1 | |
886 | also local heads: 0 |
|
886 | also local heads: 0 | |
887 | also remote heads: 0 |
|
887 | also remote heads: 0 | |
888 | both: 0 |
|
888 | both: 0 | |
889 | local heads: 1 |
|
889 | local heads: 1 | |
890 | common: 0 |
|
890 | common: 0 | |
891 | missing: 1 |
|
891 | missing: 1 | |
892 | remote heads: 1 |
|
892 | remote heads: 1 | |
893 | common: 0 |
|
893 | common: 0 | |
894 | unknown: 1 |
|
894 | unknown: 1 | |
895 | local changesets: 1030 |
|
895 | local changesets: 1030 | |
896 | common: 1000 |
|
896 | common: 1000 | |
897 | missing: 30 |
|
897 | missing: 30 | |
898 | common heads: 7ead0cba2838 |
|
898 | common heads: 7ead0cba2838 | |
899 |
|
899 | |||
900 | % -- b -> a set (tip only) |
|
900 | % -- b -> a set (tip only) | |
901 | comparing with a |
|
901 | comparing with a | |
902 | query 1; heads |
|
902 | query 1; heads | |
903 | searching for changes |
|
903 | searching for changes | |
904 | taking quick initial sample |
|
904 | taking quick initial sample | |
905 | searching: 2 queries |
|
905 | searching: 2 queries | |
906 | query 2; still undecided: 1029, sample size is: 11 |
|
906 | query 2; still undecided: 1029, sample size is: 11 | |
907 | sampling from both directions |
|
907 | sampling from both directions | |
908 | searching: 3 queries |
|
908 | searching: 3 queries | |
909 | query 3; still undecided: 15, sample size is: 15 |
|
909 | query 3; still undecided: 15, sample size is: 15 | |
910 | 3 total queries in *.????s (glob) |
|
910 | 3 total queries in *.????s (glob) | |
911 | elapsed time: * seconds (glob) |
|
911 | elapsed time: * seconds (glob) | |
912 | heads summary: |
|
912 | heads summary: | |
913 | total common heads: 1 |
|
913 | total common heads: 1 | |
914 | also local heads: 0 |
|
914 | also local heads: 0 | |
915 | also remote heads: 0 |
|
915 | also remote heads: 0 | |
916 | both: 0 |
|
916 | both: 0 | |
917 | local heads: 1 |
|
917 | local heads: 1 | |
918 | common: 0 |
|
918 | common: 0 | |
919 | missing: 1 |
|
919 | missing: 1 | |
920 | remote heads: 1 |
|
920 | remote heads: 1 | |
921 | common: 0 |
|
921 | common: 0 | |
922 | unknown: 1 |
|
922 | unknown: 1 | |
923 | local changesets: 1030 |
|
923 | local changesets: 1030 | |
924 | common: 1000 |
|
924 | common: 1000 | |
925 | missing: 30 |
|
925 | missing: 30 | |
926 | common heads: 7ead0cba2838 |
|
926 | common heads: 7ead0cba2838 | |
927 |
|
927 | |||
928 |
|
928 | |||
929 | One with >200 heads. We now switch to send them all in the initial roundtrip, but still do sampling for the later request. |
|
929 | One with >200 heads. We now switch to send them all in the initial roundtrip, but still do sampling for the later request. | |
930 |
|
930 | |||
931 | $ hg init manyheads |
|
931 | $ hg init manyheads | |
932 | $ cd manyheads |
|
932 | $ cd manyheads | |
933 | $ echo "+300:r @a" >dagdesc |
|
933 | $ echo "+300:r @a" >dagdesc | |
934 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
934 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | |
935 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
935 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | |
936 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
936 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | |
937 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
937 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | |
938 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
938 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | |
939 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
939 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | |
940 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
940 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | |
941 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
941 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | |
942 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
942 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | |
943 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
943 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | |
944 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
944 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | |
945 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
945 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | |
946 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads |
|
946 | $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads | |
947 | $ echo "@b *r+3" >>dagdesc # one more head |
|
947 | $ echo "@b *r+3" >>dagdesc # one more head | |
948 | $ hg debugbuilddag <dagdesc |
|
948 | $ hg debugbuilddag <dagdesc | |
949 | reading DAG from stdin |
|
949 | reading DAG from stdin | |
950 |
|
950 | |||
951 | $ hg heads -t --template . | wc -c |
|
951 | $ hg heads -t --template . | wc -c | |
952 | \s*261 (re) |
|
952 | \s*261 (re) | |
953 |
|
953 | |||
954 | $ hg clone -b a . a |
|
954 | $ hg clone -b a . a | |
955 | adding changesets |
|
955 | adding changesets | |
956 | adding manifests |
|
956 | adding manifests | |
957 | adding file changes |
|
957 | adding file changes | |
958 | added 1340 changesets with 0 changes to 0 files (+259 heads) |
|
958 | added 1340 changesets with 0 changes to 0 files (+259 heads) | |
959 | new changesets 1ea73414a91b:1c51e2c80832 |
|
959 | new changesets 1ea73414a91b:1c51e2c80832 | |
960 | updating to branch a |
|
960 | updating to branch a | |
961 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
961 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
962 | $ hg clone -b b . b |
|
962 | $ hg clone -b b . b | |
963 | adding changesets |
|
963 | adding changesets | |
964 | adding manifests |
|
964 | adding manifests | |
965 | adding file changes |
|
965 | adding file changes | |
966 | added 304 changesets with 0 changes to 0 files |
|
966 | added 304 changesets with 0 changes to 0 files | |
967 | new changesets 1ea73414a91b:513314ca8b3a |
|
967 | new changesets 1ea73414a91b:513314ca8b3a | |
968 | updating to branch b |
|
968 | updating to branch b | |
969 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
969 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
970 |
|
970 | |||
971 | $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true |
|
971 | $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true | |
972 | comparing with b |
|
972 | comparing with b | |
973 | query 1; heads |
|
973 | query 1; heads | |
974 | searching for changes |
|
974 | searching for changes | |
975 | taking quick initial sample |
|
975 | taking quick initial sample | |
976 | searching: 2 queries |
|
976 | searching: 2 queries | |
977 | query 2; still undecided: 1080, sample size is: 100 |
|
977 | query 2; still undecided: 1080, sample size is: 100 | |
978 | sampling from both directions |
|
978 | sampling from both directions | |
979 | searching: 3 queries |
|
979 | searching: 3 queries | |
980 | query 3; still undecided: 980, sample size is: 200 |
|
980 | query 3; still undecided: 980, sample size is: 200 | |
981 | sampling from both directions |
|
981 | sampling from both directions | |
982 | searching: 4 queries |
|
982 | searching: 4 queries | |
983 | query 4; still undecided: 435, sample size is: 210 |
|
983 | query 4; still undecided: 435, sample size is: 210 (no-py3 !) | |
|
984 | query 4; still undecided: 430, sample size is: 210 (py3 !) | |||
984 | sampling from both directions |
|
985 | sampling from both directions | |
985 | searching: 5 queries |
|
986 | searching: 5 queries | |
986 | query 5; still undecided: 185, sample size is: 185 |
|
987 | query 5; still undecided: 185, sample size is: 185 (no-py3 !) | |
|
988 | query 5; still undecided: 187, sample size is: 187 (py3 !) | |||
987 | 5 total queries in *.????s (glob) |
|
989 | 5 total queries in *.????s (glob) | |
988 | elapsed time: * seconds (glob) |
|
990 | elapsed time: * seconds (glob) | |
989 | heads summary: |
|
991 | heads summary: | |
990 | total common heads: 1 |
|
992 | total common heads: 1 | |
991 | also local heads: 0 |
|
993 | also local heads: 0 | |
992 | also remote heads: 0 |
|
994 | also remote heads: 0 | |
993 | both: 0 |
|
995 | both: 0 | |
994 | local heads: 260 |
|
996 | local heads: 260 | |
995 | common: 0 |
|
997 | common: 0 | |
996 | missing: 260 |
|
998 | missing: 260 | |
997 | remote heads: 1 |
|
999 | remote heads: 1 | |
998 | common: 0 |
|
1000 | common: 0 | |
999 | unknown: 1 |
|
1001 | unknown: 1 | |
1000 | local changesets: 1340 |
|
1002 | local changesets: 1340 | |
1001 | common: 300 |
|
1003 | common: 300 | |
1002 | missing: 1040 |
|
1004 | missing: 1040 | |
1003 | common heads: 3ee37d65064a |
|
1005 | common heads: 3ee37d65064a | |
1004 | $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip |
|
1006 | $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip | |
1005 | comparing with b |
|
1007 | comparing with b | |
1006 | query 1; heads |
|
1008 | query 1; heads | |
1007 | searching for changes |
|
1009 | searching for changes | |
1008 | taking quick initial sample |
|
1010 | taking quick initial sample | |
1009 | searching: 2 queries |
|
1011 | searching: 2 queries | |
1010 | query 2; still undecided: 303, sample size is: 9 |
|
1012 | query 2; still undecided: 303, sample size is: 9 | |
1011 | sampling from both directions |
|
1013 | sampling from both directions | |
1012 | searching: 3 queries |
|
1014 | searching: 3 queries | |
1013 | query 3; still undecided: 3, sample size is: 3 |
|
1015 | query 3; still undecided: 3, sample size is: 3 | |
1014 | 3 total queries in *.????s (glob) |
|
1016 | 3 total queries in *.????s (glob) | |
1015 | elapsed time: * seconds (glob) |
|
1017 | elapsed time: * seconds (glob) | |
1016 | heads summary: |
|
1018 | heads summary: | |
1017 | total common heads: 1 |
|
1019 | total common heads: 1 | |
1018 | also local heads: 0 |
|
1020 | also local heads: 0 | |
1019 | also remote heads: 0 |
|
1021 | also remote heads: 0 | |
1020 | both: 0 |
|
1022 | both: 0 | |
1021 | local heads: 260 |
|
1023 | local heads: 260 | |
1022 | common: 0 |
|
1024 | common: 0 | |
1023 | missing: 260 |
|
1025 | missing: 260 | |
1024 | remote heads: 1 |
|
1026 | remote heads: 1 | |
1025 | common: 0 |
|
1027 | common: 0 | |
1026 | unknown: 1 |
|
1028 | unknown: 1 | |
1027 | local changesets: 1340 |
|
1029 | local changesets: 1340 | |
1028 | common: 300 |
|
1030 | common: 300 | |
1029 | missing: 1040 |
|
1031 | missing: 1040 | |
1030 | common heads: 3ee37d65064a |
|
1032 | common heads: 3ee37d65064a | |
1031 |
|
1033 | |||
1032 | Test actual protocol when pulling one new head in addition to common heads |
|
1034 | Test actual protocol when pulling one new head in addition to common heads | |
1033 |
|
1035 | |||
1034 | $ hg clone -U b c |
|
1036 | $ hg clone -U b c | |
1035 | $ hg -R c id -ir tip |
|
1037 | $ hg -R c id -ir tip | |
1036 | 513314ca8b3a |
|
1038 | 513314ca8b3a | |
1037 | $ hg -R c up -qr default |
|
1039 | $ hg -R c up -qr default | |
1038 | $ touch c/f |
|
1040 | $ touch c/f | |
1039 | $ hg -R c ci -Aqm "extra head" |
|
1041 | $ hg -R c ci -Aqm "extra head" | |
1040 | $ hg -R c id -i |
|
1042 | $ hg -R c id -i | |
1041 | e64a39e7da8b |
|
1043 | e64a39e7da8b | |
1042 |
|
1044 | |||
1043 | $ hg serve -R c -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
1045 | $ hg serve -R c -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
1044 | $ cat hg.pid >> $DAEMON_PIDS |
|
1046 | $ cat hg.pid >> $DAEMON_PIDS | |
1045 |
|
1047 | |||
1046 | $ hg -R b incoming http://localhost:$HGPORT/ -T '{node|short}\n' |
|
1048 | $ hg -R b incoming http://localhost:$HGPORT/ -T '{node|short}\n' | |
1047 | comparing with http://localhost:$HGPORT/ |
|
1049 | comparing with http://localhost:$HGPORT/ | |
1048 | searching for changes |
|
1050 | searching for changes | |
1049 | e64a39e7da8b |
|
1051 | e64a39e7da8b | |
1050 |
|
1052 | |||
1051 | $ killdaemons.py |
|
1053 | $ killdaemons.py | |
1052 | $ cut -d' ' -f6- access.log | grep -v cmd=known # cmd=known uses random sampling |
|
1054 | $ cut -d' ' -f6- access.log | grep -v cmd=known # cmd=known uses random sampling | |
1053 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
1055 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |
1054 | "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866db x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull |
|
1056 | "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866db x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull | |
1055 | "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=513314ca8b3ae4dac8eec56966265b00fcf866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull |
|
1057 | "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=513314ca8b3ae4dac8eec56966265b00fcf866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull | |
1056 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull |
|
1058 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull | |
1057 | $ cat errors.log |
|
1059 | $ cat errors.log | |
1058 |
|
1060 | |||
1059 | $ cd .. |
|
1061 | $ cd .. | |
1060 |
|
1062 | |||
1061 |
|
1063 | |||
1062 | Issue 4438 - test coverage for 3ef893520a85 issues. |
|
1064 | Issue 4438 - test coverage for 3ef893520a85 issues. | |
1063 |
|
1065 | |||
1064 | $ mkdir issue4438 |
|
1066 | $ mkdir issue4438 | |
1065 | $ cd issue4438 |
|
1067 | $ cd issue4438 | |
1066 | #if false |
|
1068 | #if false | |
1067 | generate new bundles: |
|
1069 | generate new bundles: | |
1068 | $ hg init r1 |
|
1070 | $ hg init r1 | |
1069 | $ for i in `"$PYTHON" $TESTDIR/seq.py 101`; do hg -R r1 up -qr null && hg -R r1 branch -q b$i && hg -R r1 ci -qmb$i; done |
|
1071 | $ for i in `"$PYTHON" $TESTDIR/seq.py 101`; do hg -R r1 up -qr null && hg -R r1 branch -q b$i && hg -R r1 ci -qmb$i; done | |
1070 | $ hg clone -q r1 r2 |
|
1072 | $ hg clone -q r1 r2 | |
1071 | $ for i in `"$PYTHON" $TESTDIR/seq.py 10`; do hg -R r1 up -qr null && hg -R r1 branch -q c$i && hg -R r1 ci -qmc$i; done |
|
1073 | $ for i in `"$PYTHON" $TESTDIR/seq.py 10`; do hg -R r1 up -qr null && hg -R r1 branch -q c$i && hg -R r1 ci -qmc$i; done | |
1072 | $ hg -R r2 branch -q r2change && hg -R r2 ci -qmr2change |
|
1074 | $ hg -R r2 branch -q r2change && hg -R r2 ci -qmr2change | |
1073 | $ hg -R r1 bundle -qa $TESTDIR/bundles/issue4438-r1.hg |
|
1075 | $ hg -R r1 bundle -qa $TESTDIR/bundles/issue4438-r1.hg | |
1074 | $ hg -R r2 bundle -qa $TESTDIR/bundles/issue4438-r2.hg |
|
1076 | $ hg -R r2 bundle -qa $TESTDIR/bundles/issue4438-r2.hg | |
1075 | #else |
|
1077 | #else | |
1076 | use existing bundles: |
|
1078 | use existing bundles: | |
1077 | $ hg init r1 |
|
1079 | $ hg init r1 | |
1078 | $ hg -R r1 -q unbundle $TESTDIR/bundles/issue4438-r1.hg |
|
1080 | $ hg -R r1 -q unbundle $TESTDIR/bundles/issue4438-r1.hg | |
1079 | $ hg -R r1 -q up |
|
1081 | $ hg -R r1 -q up | |
1080 | $ hg init r2 |
|
1082 | $ hg init r2 | |
1081 | $ hg -R r2 -q unbundle $TESTDIR/bundles/issue4438-r2.hg |
|
1083 | $ hg -R r2 -q unbundle $TESTDIR/bundles/issue4438-r2.hg | |
1082 | $ hg -R r2 -q up |
|
1084 | $ hg -R r2 -q up | |
1083 | #endif |
|
1085 | #endif | |
1084 |
|
1086 | |||
1085 | Set iteration order could cause wrong and unstable results - fixed in 73cfaa348650: |
|
1087 | Set iteration order could cause wrong and unstable results - fixed in 73cfaa348650: | |
1086 |
|
1088 | |||
1087 | $ hg -R r1 outgoing r2 -T'{rev} ' |
|
1089 | $ hg -R r1 outgoing r2 -T'{rev} ' | |
1088 | comparing with r2 |
|
1090 | comparing with r2 | |
1089 | searching for changes |
|
1091 | searching for changes | |
1090 | 101 102 103 104 105 106 107 108 109 110 (no-eol) |
|
1092 | 101 102 103 104 105 106 107 108 109 110 (no-eol) | |
1091 |
|
1093 | |||
1092 | The case where all the 'initialsamplesize' samples already were common would |
|
1094 | The case where all the 'initialsamplesize' samples already were common would | |
1093 | give 'all remote heads known locally' without checking the remaining heads - |
|
1095 | give 'all remote heads known locally' without checking the remaining heads - | |
1094 | fixed in 86c35b7ae300: |
|
1096 | fixed in 86c35b7ae300: | |
1095 |
|
1097 | |||
1096 | $ cat >> $TESTTMP/unrandomsample.py << EOF |
|
1098 | $ cat >> $TESTTMP/unrandomsample.py << EOF | |
1097 | > import random |
|
1099 | > import random | |
1098 | > def sample(population, k): |
|
1100 | > def sample(population, k): | |
1099 | > return sorted(population)[:k] |
|
1101 | > return sorted(population)[:k] | |
1100 | > random.sample = sample |
|
1102 | > random.sample = sample | |
1101 | > EOF |
|
1103 | > EOF | |
1102 |
|
1104 | |||
1103 | $ cat >> r1/.hg/hgrc << EOF |
|
1105 | $ cat >> r1/.hg/hgrc << EOF | |
1104 | > [extensions] |
|
1106 | > [extensions] | |
1105 | > unrandomsample = $TESTTMP/unrandomsample.py |
|
1107 | > unrandomsample = $TESTTMP/unrandomsample.py | |
1106 | > EOF |
|
1108 | > EOF | |
1107 |
|
1109 | |||
1108 | $ hg -R r1 outgoing r2 -T'{rev} ' --config extensions.blackbox= \ |
|
1110 | $ hg -R r1 outgoing r2 -T'{rev} ' --config extensions.blackbox= \ | |
1109 | > --config blackbox.track='command commandfinish discovery' |
|
1111 | > --config blackbox.track='command commandfinish discovery' | |
1110 | comparing with r2 |
|
1112 | comparing with r2 | |
1111 | searching for changes |
|
1113 | searching for changes | |
1112 | 101 102 103 104 105 106 107 108 109 110 (no-eol) |
|
1114 | 101 102 103 104 105 106 107 108 109 110 (no-eol) | |
1113 | $ hg -R r1 --config extensions.blackbox= blackbox --config blackbox.track= |
|
1115 | $ hg -R r1 --config extensions.blackbox= blackbox --config blackbox.track= | |
1114 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> serve --cmdserver chgunix * (glob) (chg !) |
|
1116 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> serve --cmdserver chgunix * (glob) (chg !) | |
1115 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* (glob) |
|
1117 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* (glob) | |
1116 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 1 roundtrips in *.????s (glob) |
|
1118 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 1 roundtrips in *.????s (glob) | |
1117 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob) |
|
1119 | * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob) | |
1118 | $ cd .. |
|
1120 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now