Show More
@@ -1,268 +1,268 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 [ - |
|
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 |
|
17 | > hg -R a debugdiscovery b --verbose --debug | |
18 | > echo |
|
18 | > echo | |
19 | > echo "% -- b -> a tree" |
|
19 | > echo "% -- b -> a tree" | |
20 | > hg -R b debugdiscovery a --verbose --old |
|
20 | > hg -R b debugdiscovery a --verbose --old | |
21 | > echo |
|
21 | > echo | |
22 | > echo "% -- b -> a set" |
|
22 | > echo "% -- b -> a set" | |
23 | > hg -R b debugdiscovery a --verbose --debug |
|
23 | > hg -R b debugdiscovery a --verbose --debug | |
24 | > cd .. |
|
24 | > cd .. | |
25 | > } |
|
25 | > } | |
26 |
|
26 | |||
27 |
|
27 | |||
28 | Small superset: |
|
28 | Small superset: | |
29 |
|
29 | |||
30 | $ testdesc '-ra1 -ra2' '-rb1 -rb2 -rb3' ' |
|
30 | $ testdesc '-ra1 -ra2' '-rb1 -rb2 -rb3' ' | |
31 | > +2:f +1:a1:b1 |
|
31 | > +2:f +1:a1:b1 | |
32 | > <f +4 :a2 |
|
32 | > <f +4 :a2 | |
33 | > +5 :b2 |
|
33 | > +5 :b2 | |
34 | > <f +3 :b3' |
|
34 | > <f +3 :b3' | |
35 |
|
35 | |||
36 | % -- a -> b tree |
|
36 | % -- a -> b tree | |
37 | comparing with b |
|
37 | comparing with b | |
38 | searching for changes |
|
38 | searching for changes | |
39 | unpruned common: b5714e113bc0 66f7d451a68b 01241442b3c2 |
|
39 | unpruned common: b5714e113bc0 66f7d451a68b 01241442b3c2 | |
40 | common heads: b5714e113bc0 01241442b3c2 |
|
40 | common heads: b5714e113bc0 01241442b3c2 | |
41 | local is subset |
|
41 | local is subset | |
42 |
|
42 | |||
43 | % -- a -> b set |
|
43 | % -- a -> b set | |
44 | comparing with b |
|
44 | comparing with b | |
45 | query 1; heads |
|
45 | query 1; heads | |
46 | searching for changes |
|
46 | searching for changes | |
47 | all local heads known remotely |
|
47 | all local heads known remotely | |
48 | common heads: b5714e113bc0 01241442b3c2 |
|
48 | common heads: b5714e113bc0 01241442b3c2 | |
49 | local is subset |
|
49 | local is subset | |
50 |
|
50 | |||
51 | % -- b -> a tree |
|
51 | % -- b -> a tree | |
52 | comparing with a |
|
52 | comparing with a | |
53 | searching for changes |
|
53 | searching for changes | |
54 | unpruned common: b5714e113bc0 01241442b3c2 |
|
54 | unpruned common: b5714e113bc0 01241442b3c2 | |
55 | common heads: b5714e113bc0 01241442b3c2 |
|
55 | common heads: b5714e113bc0 01241442b3c2 | |
56 | remote is subset |
|
56 | remote is subset | |
57 |
|
57 | |||
58 | % -- b -> a set |
|
58 | % -- b -> a set | |
59 | comparing with a |
|
59 | comparing with a | |
60 | query 1; heads |
|
60 | query 1; heads | |
61 | searching for changes |
|
61 | searching for changes | |
62 | all remote heads known locally |
|
62 | all remote heads known locally | |
63 | common heads: b5714e113bc0 01241442b3c2 |
|
63 | common heads: b5714e113bc0 01241442b3c2 | |
64 | remote is subset |
|
64 | remote is subset | |
65 |
|
65 | |||
66 |
|
66 | |||
67 | Many new: |
|
67 | Many new: | |
68 |
|
68 | |||
69 | $ testdesc '-ra1 -ra2' '-rb' ' |
|
69 | $ testdesc '-ra1 -ra2' '-rb' ' | |
70 | > +2:f +3:a1 +3:b |
|
70 | > +2:f +3:a1 +3:b | |
71 | > <f +30 :a2' |
|
71 | > <f +30 :a2' | |
72 |
|
72 | |||
73 | % -- a -> b tree |
|
73 | % -- a -> b tree | |
74 | comparing with b |
|
74 | comparing with b | |
75 | searching for changes |
|
75 | searching for changes | |
76 | unpruned common: bebd167eb94d |
|
76 | unpruned common: bebd167eb94d | |
77 | common heads: bebd167eb94d |
|
77 | common heads: bebd167eb94d | |
78 |
|
78 | |||
79 | % -- a -> b set |
|
79 | % -- a -> b set | |
80 | comparing with b |
|
80 | comparing with b | |
81 | query 1; heads |
|
81 | query 1; heads | |
82 | searching for changes |
|
82 | searching for changes | |
83 | taking initial sample |
|
83 | taking initial sample | |
84 | searching: 2 queries |
|
84 | searching: 2 queries | |
85 | query 2; still undecided: 29, sample size is: 29 |
|
85 | query 2; still undecided: 29, sample size is: 29 | |
86 | 2 total queries |
|
86 | 2 total queries | |
87 | common heads: bebd167eb94d |
|
87 | common heads: bebd167eb94d | |
88 |
|
88 | |||
89 | % -- b -> a tree |
|
89 | % -- b -> a tree | |
90 | comparing with a |
|
90 | comparing with a | |
91 | searching for changes |
|
91 | searching for changes | |
92 | unpruned common: bebd167eb94d 66f7d451a68b |
|
92 | unpruned common: bebd167eb94d 66f7d451a68b | |
93 | common heads: bebd167eb94d |
|
93 | common heads: bebd167eb94d | |
94 |
|
94 | |||
95 | % -- b -> a set |
|
95 | % -- b -> a set | |
96 | comparing with a |
|
96 | comparing with a | |
97 | query 1; heads |
|
97 | query 1; heads | |
98 | searching for changes |
|
98 | searching for changes | |
99 | taking initial sample |
|
99 | taking initial sample | |
100 | searching: 2 queries |
|
100 | searching: 2 queries | |
101 | query 2; still undecided: 2, sample size is: 2 |
|
101 | query 2; still undecided: 2, sample size is: 2 | |
102 | 2 total queries |
|
102 | 2 total queries | |
103 | common heads: bebd167eb94d |
|
103 | common heads: bebd167eb94d | |
104 |
|
104 | |||
105 |
|
105 | |||
106 | Both sides many new with stub: |
|
106 | Both sides many new with stub: | |
107 |
|
107 | |||
108 | $ testdesc '-ra1 -ra2' '-rb' ' |
|
108 | $ testdesc '-ra1 -ra2' '-rb' ' | |
109 | > +2:f +2:a1 +30 :b |
|
109 | > +2:f +2:a1 +30 :b | |
110 | > <f +30 :a2' |
|
110 | > <f +30 :a2' | |
111 |
|
111 | |||
112 | % -- a -> b tree |
|
112 | % -- a -> b tree | |
113 | comparing with b |
|
113 | comparing with b | |
114 | searching for changes |
|
114 | searching for changes | |
115 | unpruned common: 2dc09a01254d |
|
115 | unpruned common: 2dc09a01254d | |
116 | common heads: 2dc09a01254d |
|
116 | common heads: 2dc09a01254d | |
117 |
|
117 | |||
118 | % -- a -> b set |
|
118 | % -- a -> b set | |
119 | comparing with b |
|
119 | comparing with b | |
120 | query 1; heads |
|
120 | query 1; heads | |
121 | searching for changes |
|
121 | searching for changes | |
122 | taking initial sample |
|
122 | taking initial sample | |
123 | searching: 2 queries |
|
123 | searching: 2 queries | |
124 | query 2; still undecided: 29, sample size is: 29 |
|
124 | query 2; still undecided: 29, sample size is: 29 | |
125 | 2 total queries |
|
125 | 2 total queries | |
126 | common heads: 2dc09a01254d |
|
126 | common heads: 2dc09a01254d | |
127 |
|
127 | |||
128 | % -- b -> a tree |
|
128 | % -- b -> a tree | |
129 | comparing with a |
|
129 | comparing with a | |
130 | searching for changes |
|
130 | searching for changes | |
131 | unpruned common: 66f7d451a68b 2dc09a01254d |
|
131 | unpruned common: 66f7d451a68b 2dc09a01254d | |
132 | common heads: 2dc09a01254d |
|
132 | common heads: 2dc09a01254d | |
133 |
|
133 | |||
134 | % -- b -> a set |
|
134 | % -- b -> a set | |
135 | comparing with a |
|
135 | comparing with a | |
136 | query 1; heads |
|
136 | query 1; heads | |
137 | searching for changes |
|
137 | searching for changes | |
138 | taking initial sample |
|
138 | taking initial sample | |
139 | searching: 2 queries |
|
139 | searching: 2 queries | |
140 | query 2; still undecided: 29, sample size is: 29 |
|
140 | query 2; still undecided: 29, sample size is: 29 | |
141 | 2 total queries |
|
141 | 2 total queries | |
142 | common heads: 2dc09a01254d |
|
142 | common heads: 2dc09a01254d | |
143 |
|
143 | |||
144 |
|
144 | |||
145 | Both many new: |
|
145 | Both many new: | |
146 |
|
146 | |||
147 | $ testdesc '-ra' '-rb' ' |
|
147 | $ testdesc '-ra' '-rb' ' | |
148 | > +2:f +30 :b |
|
148 | > +2:f +30 :b | |
149 | > <f +30 :a' |
|
149 | > <f +30 :a' | |
150 |
|
150 | |||
151 | % -- a -> b tree |
|
151 | % -- a -> b tree | |
152 | comparing with b |
|
152 | comparing with b | |
153 | searching for changes |
|
153 | searching for changes | |
154 | unpruned common: 66f7d451a68b |
|
154 | unpruned common: 66f7d451a68b | |
155 | common heads: 66f7d451a68b |
|
155 | common heads: 66f7d451a68b | |
156 |
|
156 | |||
157 | % -- a -> b set |
|
157 | % -- a -> b set | |
158 | comparing with b |
|
158 | comparing with b | |
159 | query 1; heads |
|
159 | query 1; heads | |
160 | searching for changes |
|
160 | searching for changes | |
161 | taking quick initial sample |
|
161 | taking quick initial sample | |
162 | searching: 2 queries |
|
162 | searching: 2 queries | |
163 | query 2; still undecided: 31, sample size is: 31 |
|
163 | query 2; still undecided: 31, sample size is: 31 | |
164 | 2 total queries |
|
164 | 2 total queries | |
165 | common heads: 66f7d451a68b |
|
165 | common heads: 66f7d451a68b | |
166 |
|
166 | |||
167 | % -- b -> a tree |
|
167 | % -- b -> a tree | |
168 | comparing with a |
|
168 | comparing with a | |
169 | searching for changes |
|
169 | searching for changes | |
170 | unpruned common: 66f7d451a68b |
|
170 | unpruned common: 66f7d451a68b | |
171 | common heads: 66f7d451a68b |
|
171 | common heads: 66f7d451a68b | |
172 |
|
172 | |||
173 | % -- b -> a set |
|
173 | % -- b -> a set | |
174 | comparing with a |
|
174 | comparing with a | |
175 | query 1; heads |
|
175 | query 1; heads | |
176 | searching for changes |
|
176 | searching for changes | |
177 | taking quick initial sample |
|
177 | taking quick initial sample | |
178 | searching: 2 queries |
|
178 | searching: 2 queries | |
179 | query 2; still undecided: 31, sample size is: 31 |
|
179 | query 2; still undecided: 31, sample size is: 31 | |
180 | 2 total queries |
|
180 | 2 total queries | |
181 | common heads: 66f7d451a68b |
|
181 | common heads: 66f7d451a68b | |
182 |
|
182 | |||
183 |
|
183 | |||
184 | Both many new skewed: |
|
184 | Both many new skewed: | |
185 |
|
185 | |||
186 | $ testdesc '-ra' '-rb' ' |
|
186 | $ testdesc '-ra' '-rb' ' | |
187 | > +2:f +30 :b |
|
187 | > +2:f +30 :b | |
188 | > <f +50 :a' |
|
188 | > <f +50 :a' | |
189 |
|
189 | |||
190 | % -- a -> b tree |
|
190 | % -- a -> b tree | |
191 | comparing with b |
|
191 | comparing with b | |
192 | searching for changes |
|
192 | searching for changes | |
193 | unpruned common: 66f7d451a68b |
|
193 | unpruned common: 66f7d451a68b | |
194 | common heads: 66f7d451a68b |
|
194 | common heads: 66f7d451a68b | |
195 |
|
195 | |||
196 | % -- a -> b set |
|
196 | % -- a -> b set | |
197 | comparing with b |
|
197 | comparing with b | |
198 | query 1; heads |
|
198 | query 1; heads | |
199 | searching for changes |
|
199 | searching for changes | |
200 | taking quick initial sample |
|
200 | taking quick initial sample | |
201 | searching: 2 queries |
|
201 | searching: 2 queries | |
202 | query 2; still undecided: 51, sample size is: 51 |
|
202 | query 2; still undecided: 51, sample size is: 51 | |
203 | 2 total queries |
|
203 | 2 total queries | |
204 | common heads: 66f7d451a68b |
|
204 | common heads: 66f7d451a68b | |
205 |
|
205 | |||
206 | % -- b -> a tree |
|
206 | % -- b -> a tree | |
207 | comparing with a |
|
207 | comparing with a | |
208 | searching for changes |
|
208 | searching for changes | |
209 | unpruned common: 66f7d451a68b |
|
209 | unpruned common: 66f7d451a68b | |
210 | common heads: 66f7d451a68b |
|
210 | common heads: 66f7d451a68b | |
211 |
|
211 | |||
212 | % -- b -> a set |
|
212 | % -- b -> a set | |
213 | comparing with a |
|
213 | comparing with a | |
214 | query 1; heads |
|
214 | query 1; heads | |
215 | searching for changes |
|
215 | searching for changes | |
216 | taking quick initial sample |
|
216 | taking quick initial sample | |
217 | searching: 2 queries |
|
217 | searching: 2 queries | |
218 | query 2; still undecided: 31, sample size is: 31 |
|
218 | query 2; still undecided: 31, sample size is: 31 | |
219 | 2 total queries |
|
219 | 2 total queries | |
220 | common heads: 66f7d451a68b |
|
220 | common heads: 66f7d451a68b | |
221 |
|
221 | |||
222 |
|
222 | |||
223 | Both many new on top of long history: |
|
223 | Both many new on top of long history: | |
224 |
|
224 | |||
225 | $ testdesc '-ra' '-rb' ' |
|
225 | $ testdesc '-ra' '-rb' ' | |
226 | > +1000:f +30 :b |
|
226 | > +1000:f +30 :b | |
227 | > <f +50 :a' |
|
227 | > <f +50 :a' | |
228 |
|
228 | |||
229 | % -- a -> b tree |
|
229 | % -- a -> b tree | |
230 | comparing with b |
|
230 | comparing with b | |
231 | searching for changes |
|
231 | searching for changes | |
232 | unpruned common: 7ead0cba2838 |
|
232 | unpruned common: 7ead0cba2838 | |
233 | common heads: 7ead0cba2838 |
|
233 | common heads: 7ead0cba2838 | |
234 |
|
234 | |||
235 | % -- a -> b set |
|
235 | % -- a -> b set | |
236 | comparing with b |
|
236 | comparing with b | |
237 | query 1; heads |
|
237 | query 1; heads | |
238 | searching for changes |
|
238 | searching for changes | |
239 | taking quick initial sample |
|
239 | taking quick initial sample | |
240 | searching: 2 queries |
|
240 | searching: 2 queries | |
241 | query 2; still undecided: 1049, sample size is: 11 |
|
241 | query 2; still undecided: 1049, sample size is: 11 | |
242 | sampling from both directions |
|
242 | sampling from both directions | |
243 | searching: 3 queries |
|
243 | searching: 3 queries | |
244 | query 3; still undecided: 31, sample size is: 31 |
|
244 | query 3; still undecided: 31, sample size is: 31 | |
245 | 3 total queries |
|
245 | 3 total queries | |
246 | common heads: 7ead0cba2838 |
|
246 | common heads: 7ead0cba2838 | |
247 |
|
247 | |||
248 | % -- b -> a tree |
|
248 | % -- b -> a tree | |
249 | comparing with a |
|
249 | comparing with a | |
250 | searching for changes |
|
250 | searching for changes | |
251 | unpruned common: 7ead0cba2838 |
|
251 | unpruned common: 7ead0cba2838 | |
252 | common heads: 7ead0cba2838 |
|
252 | common heads: 7ead0cba2838 | |
253 |
|
253 | |||
254 | % -- b -> a set |
|
254 | % -- b -> a set | |
255 | comparing with a |
|
255 | comparing with a | |
256 | query 1; heads |
|
256 | query 1; heads | |
257 | searching for changes |
|
257 | searching for changes | |
258 | taking quick initial sample |
|
258 | taking quick initial sample | |
259 | searching: 2 queries |
|
259 | searching: 2 queries | |
260 | query 2; still undecided: 1029, sample size is: 11 |
|
260 | query 2; still undecided: 1029, sample size is: 11 | |
261 | sampling from both directions |
|
261 | sampling from both directions | |
262 | searching: 3 queries |
|
262 | searching: 3 queries | |
263 | query 3; still undecided: 16, sample size is: 16 |
|
263 | query 3; still undecided: 16, sample size is: 16 | |
264 | 3 total queries |
|
264 | 3 total queries | |
265 | common heads: 7ead0cba2838 |
|
265 | common heads: 7ead0cba2838 | |
266 |
|
266 | |||
267 |
|
267 | |||
268 |
|
268 |
General Comments 0
You need to be logged in to leave comments.
Login now