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