Show More
@@ -1,432 +1,432 b'' | |||
|
1 | 1 | Set up a server |
|
2 | 2 | |
|
3 | 3 | $ cat >> $HGRCPATH << EOF |
|
4 | 4 | > [format] |
|
5 | 5 | > usegeneraldelta=yes |
|
6 | 6 | > EOF |
|
7 | 7 | $ hg init server |
|
8 | 8 | $ cd server |
|
9 | 9 | $ cat >> .hg/hgrc << EOF |
|
10 | 10 | > [extensions] |
|
11 | 11 | > clonebundles = |
|
12 | 12 | > EOF |
|
13 | 13 | |
|
14 | 14 | $ touch foo |
|
15 | 15 | $ hg -q commit -A -m 'add foo' |
|
16 | 16 | $ touch bar |
|
17 | 17 | $ hg -q commit -A -m 'add bar' |
|
18 | 18 | |
|
19 | 19 | $ hg serve -d -p $HGPORT --pid-file hg.pid --accesslog access.log |
|
20 | 20 | $ cat hg.pid >> $DAEMON_PIDS |
|
21 | 21 | $ cd .. |
|
22 | 22 | |
|
23 | 23 | Missing manifest should not result in server lookup |
|
24 | 24 | |
|
25 | 25 | $ hg --verbose clone -U http://localhost:$HGPORT no-manifest |
|
26 | 26 | requesting all changes |
|
27 | 27 | adding changesets |
|
28 | 28 | adding manifests |
|
29 | 29 | adding file changes |
|
30 | 30 | added 2 changesets with 2 changes to 2 files |
|
31 | 31 | |
|
32 | 32 | $ cat server/access.log |
|
33 | 33 | * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) |
|
34 | 34 | * - - [*] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) |
|
35 | 35 | * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=aaff8d2ffbbf07a46dd1f05d8ae7877e3f56e2a2&listkeys=phases%2Cbookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) |
|
36 | 36 | |
|
37 | 37 | Empty manifest file results in retrieval |
|
38 | 38 | (the extension only checks if the manifest file exists) |
|
39 | 39 | |
|
40 | 40 | $ touch server/.hg/clonebundles.manifest |
|
41 | 41 | $ hg --verbose clone -U http://localhost:$HGPORT empty-manifest |
|
42 | 42 | no clone bundles available on remote; falling back to regular clone |
|
43 | 43 | requesting all changes |
|
44 | 44 | adding changesets |
|
45 | 45 | adding manifests |
|
46 | 46 | adding file changes |
|
47 | 47 | added 2 changesets with 2 changes to 2 files |
|
48 | 48 | |
|
49 | 49 | Manifest file with invalid URL aborts |
|
50 | 50 | |
|
51 | 51 | $ echo 'http://does.not.exist/bundle.hg' > server/.hg/clonebundles.manifest |
|
52 | 52 | $ hg clone http://localhost:$HGPORT 404-url |
|
53 | 53 | applying clone bundle from http://does.not.exist/bundle.hg |
|
54 | 54 | error fetching bundle: (.* not known|getaddrinfo failed|No address associated with hostname) (re) |
|
55 | 55 | abort: error applying bundle |
|
56 | 56 | (if this error persists, consider contacting the server operator or disable clone bundles via "--config ui.clonebundles=false") |
|
57 | 57 | [255] |
|
58 | 58 | |
|
59 | 59 | Server is not running aborts |
|
60 | 60 | |
|
61 | 61 | $ echo "http://localhost:$HGPORT1/bundle.hg" > server/.hg/clonebundles.manifest |
|
62 | 62 | $ hg clone http://localhost:$HGPORT server-not-runner |
|
63 | 63 | applying clone bundle from http://localhost:$HGPORT1/bundle.hg |
|
64 | error fetching bundle: (.* refused.*|Protocol not supported) (re) | |
|
64 | error fetching bundle: (.* refused.*|Protocol not supported|Cannot assign requested address) (re) | |
|
65 | 65 | abort: error applying bundle |
|
66 | 66 | (if this error persists, consider contacting the server operator or disable clone bundles via "--config ui.clonebundles=false") |
|
67 | 67 | [255] |
|
68 | 68 | |
|
69 | 69 | Server returns 404 |
|
70 | 70 | |
|
71 | 71 | $ python $TESTDIR/dumbhttp.py -p $HGPORT1 --pid http.pid |
|
72 | 72 | $ cat http.pid >> $DAEMON_PIDS |
|
73 | 73 | $ hg clone http://localhost:$HGPORT running-404 |
|
74 | 74 | applying clone bundle from http://localhost:$HGPORT1/bundle.hg |
|
75 | 75 | HTTP error fetching bundle: HTTP Error 404: File not found |
|
76 | 76 | abort: error applying bundle |
|
77 | 77 | (if this error persists, consider contacting the server operator or disable clone bundles via "--config ui.clonebundles=false") |
|
78 | 78 | [255] |
|
79 | 79 | |
|
80 | 80 | We can override failure to fall back to regular clone |
|
81 | 81 | |
|
82 | 82 | $ hg --config ui.clonebundlefallback=true clone -U http://localhost:$HGPORT 404-fallback |
|
83 | 83 | applying clone bundle from http://localhost:$HGPORT1/bundle.hg |
|
84 | 84 | HTTP error fetching bundle: HTTP Error 404: File not found |
|
85 | 85 | falling back to normal clone |
|
86 | 86 | requesting all changes |
|
87 | 87 | adding changesets |
|
88 | 88 | adding manifests |
|
89 | 89 | adding file changes |
|
90 | 90 | added 2 changesets with 2 changes to 2 files |
|
91 | 91 | |
|
92 | 92 | Bundle with partial content works |
|
93 | 93 | |
|
94 | 94 | $ hg -R server bundle --type gzip-v1 --base null -r 53245c60e682 partial.hg |
|
95 | 95 | 1 changesets found |
|
96 | 96 | |
|
97 | 97 | We verify exact bundle content as an extra check against accidental future |
|
98 | 98 | changes. If this output changes, we could break old clients. |
|
99 | 99 | |
|
100 | 100 | $ f --size --hexdump partial.hg |
|
101 | 101 | partial.hg: size=207 |
|
102 | 102 | 0000: 48 47 31 30 47 5a 78 9c 63 60 60 98 17 ac 12 93 |HG10GZx.c``.....| |
|
103 | 103 | 0010: f0 ac a9 23 45 70 cb bf 0d 5f 59 4e 4a 7f 79 21 |...#Ep..._YNJ.y!| |
|
104 | 104 | 0020: 9b cc 40 24 20 a0 d7 ce 2c d1 38 25 cd 24 25 d5 |..@$ ...,.8%.$%.| |
|
105 | 105 | 0030: d8 c2 22 cd 38 d9 24 cd 22 d5 c8 22 cd 24 cd 32 |..".8.$."..".$.2| |
|
106 | 106 | 0040: d1 c2 d0 c4 c8 d2 32 d1 38 39 29 c9 34 cd d4 80 |......2.89).4...| |
|
107 | 107 | 0050: ab 24 b5 b8 84 cb 40 c1 80 2b 2d 3f 9f 8b 2b 31 |.$....@..+-?..+1| |
|
108 | 108 | 0060: 25 45 01 c8 80 9a d2 9b 65 fb e5 9e 45 bf 8d 7f |%E......e...E...| |
|
109 | 109 | 0070: 9f c6 97 9f 2b 44 34 67 d9 ec 8e 0f a0 92 0b 75 |....+D4g.......u| |
|
110 | 110 | 0080: 41 d6 24 59 18 a4 a4 9a a6 18 1a 5b 98 9b 5a 98 |A.$Y.......[..Z.| |
|
111 | 111 | 0090: 9a 18 26 9b a6 19 98 1a 99 99 26 a6 18 9a 98 24 |..&.......&....$| |
|
112 | 112 | 00a0: 26 59 a6 25 5a 98 a5 18 a6 24 71 41 35 b1 43 dc |&Y.%Z....$qA5.C.| |
|
113 | 113 | 00b0: 16 b2 83 f7 e9 45 8b d2 56 c7 a3 1f 82 52 d7 8a |.....E..V....R..| |
|
114 | 114 | 00c0: 78 ed fc d5 76 f1 36 35 dc 05 00 36 ed 5e c7 |x...v.65...6.^.| |
|
115 | 115 | |
|
116 | 116 | $ echo "http://localhost:$HGPORT1/partial.hg" > server/.hg/clonebundles.manifest |
|
117 | 117 | $ hg clone -U http://localhost:$HGPORT partial-bundle |
|
118 | 118 | applying clone bundle from http://localhost:$HGPORT1/partial.hg |
|
119 | 119 | adding changesets |
|
120 | 120 | adding manifests |
|
121 | 121 | adding file changes |
|
122 | 122 | added 1 changesets with 1 changes to 1 files |
|
123 | 123 | finished applying clone bundle |
|
124 | 124 | searching for changes |
|
125 | 125 | adding changesets |
|
126 | 126 | adding manifests |
|
127 | 127 | adding file changes |
|
128 | 128 | added 1 changesets with 1 changes to 1 files |
|
129 | 129 | |
|
130 | 130 | Incremental pull doesn't fetch bundle |
|
131 | 131 | |
|
132 | 132 | $ hg clone -r 53245c60e682 -U http://localhost:$HGPORT partial-clone |
|
133 | 133 | adding changesets |
|
134 | 134 | adding manifests |
|
135 | 135 | adding file changes |
|
136 | 136 | added 1 changesets with 1 changes to 1 files |
|
137 | 137 | |
|
138 | 138 | $ cd partial-clone |
|
139 | 139 | $ hg pull |
|
140 | 140 | pulling from http://localhost:$HGPORT/ |
|
141 | 141 | searching for changes |
|
142 | 142 | adding changesets |
|
143 | 143 | adding manifests |
|
144 | 144 | adding file changes |
|
145 | 145 | added 1 changesets with 1 changes to 1 files |
|
146 | 146 | (run 'hg update' to get a working copy) |
|
147 | 147 | $ cd .. |
|
148 | 148 | |
|
149 | 149 | Bundle with full content works |
|
150 | 150 | |
|
151 | 151 | $ hg -R server bundle --type gzip-v2 --base null -r tip full.hg |
|
152 | 152 | 2 changesets found |
|
153 | 153 | |
|
154 | 154 | Again, we perform an extra check against bundle content changes. If this content |
|
155 | 155 | changes, clone bundles produced by new Mercurial versions may not be readable |
|
156 | 156 | by old clients. |
|
157 | 157 | |
|
158 | 158 | $ f --size --hexdump full.hg |
|
159 | 159 | full.hg: size=396 |
|
160 | 160 | 0000: 48 47 32 30 00 00 00 0e 43 6f 6d 70 72 65 73 73 |HG20....Compress| |
|
161 | 161 | 0010: 69 6f 6e 3d 47 5a 78 9c 63 60 60 d0 e4 76 f6 70 |ion=GZx.c``..v.p| |
|
162 | 162 | 0020: f4 73 77 75 0f f2 0f 0d 60 00 02 46 46 76 26 4e |.swu....`..FFv&N| |
|
163 | 163 | 0030: c6 b2 d4 a2 e2 cc fc 3c 03 a3 bc a4 e4 8c c4 bc |.......<........| |
|
164 | 164 | 0040: f4 d4 62 23 06 06 e6 19 40 f9 4d c1 2a 31 09 cf |..b#....@.M.*1..| |
|
165 | 165 | 0050: 9a 3a 52 04 b7 fc db f0 95 e5 a4 f4 97 17 b2 c9 |.:R.............| |
|
166 | 166 | 0060: 0c 14 00 02 e6 d9 99 25 1a a7 a4 99 a4 a4 1a 5b |.......%.......[| |
|
167 | 167 | 0070: 58 a4 19 27 9b a4 59 a4 1a 59 a4 99 a4 59 26 5a |X..'..Y..Y...Y&Z| |
|
168 | 168 | 0080: 18 9a 18 59 5a 26 1a 27 27 25 99 a6 99 1a 70 95 |...YZ&.''%....p.| |
|
169 | 169 | 0090: a4 16 97 70 19 28 18 70 a5 e5 e7 73 71 25 a6 a4 |...p.(.p...sq%..| |
|
170 | 170 | 00a0: 28 00 19 20 17 af fa df ab ff 7b 3f fb 92 dc 8b |(.. ......{?....| |
|
171 | 171 | 00b0: 1f 62 bb 9e b7 d7 d9 87 3d 5a 44 89 2f b0 99 87 |.b......=ZD./...| |
|
172 | 172 | 00c0: ec e2 54 63 43 e3 b4 64 43 73 23 33 43 53 0b 63 |..TcC..dCs#3CS.c| |
|
173 | 173 | 00d0: d3 14 23 03 a0 fb 2c 2c 0c d3 80 1e 30 49 49 b1 |..#...,,....0II.| |
|
174 | 174 | 00e0: 4c 4a 32 48 33 30 b0 34 42 b8 38 29 b1 08 e2 62 |LJ2H30.4B.8)...b| |
|
175 | 175 | 00f0: 20 03 6a ca c2 2c db 2f f7 2c fa 6d fc fb 34 be | .j..,./.,.m..4.| |
|
176 | 176 | 0100: fc 5c 21 a2 39 cb 66 77 7c 00 0d c3 59 17 14 58 |.\!.9.fw|...Y..X| |
|
177 | 177 | 0110: 49 16 06 29 a9 a6 29 86 c6 16 e6 a6 16 a6 26 86 |I..)..).......&.| |
|
178 | 178 | 0120: c9 a6 69 06 a6 46 66 a6 89 29 86 26 26 89 49 96 |..i..Ff..).&&.I.| |
|
179 | 179 | 0130: 69 89 16 66 29 86 29 49 5c 20 07 3e 16 fe 23 ae |i..f).)I\ .>..#.| |
|
180 | 180 | 0140: 26 da 1c ab 10 1f d1 f8 e3 b3 ef cd dd fc 0c 93 |&...............| |
|
181 | 181 | 0150: 88 75 34 36 75 04 82 55 17 14 36 a4 38 10 04 d8 |.u46u..U..6.8...| |
|
182 | 182 | 0160: 21 01 9a b1 83 f7 e9 45 8b d2 56 c7 a3 1f 82 52 |!......E..V....R| |
|
183 | 183 | 0170: d7 8a 78 ed fc d5 76 f1 36 25 81 89 c7 ad ec 90 |..x...v.6%......| |
|
184 | 184 | 0180: 54 47 75 2b 89 49 b1 00 d2 8a eb 92 |TGu+.I......| |
|
185 | 185 | |
|
186 | 186 | $ echo "http://localhost:$HGPORT1/full.hg" > server/.hg/clonebundles.manifest |
|
187 | 187 | $ hg clone -U http://localhost:$HGPORT full-bundle |
|
188 | 188 | applying clone bundle from http://localhost:$HGPORT1/full.hg |
|
189 | 189 | adding changesets |
|
190 | 190 | adding manifests |
|
191 | 191 | adding file changes |
|
192 | 192 | added 2 changesets with 2 changes to 2 files |
|
193 | 193 | finished applying clone bundle |
|
194 | 194 | searching for changes |
|
195 | 195 | no changes found |
|
196 | 196 | |
|
197 | 197 | Feature works over SSH |
|
198 | 198 | |
|
199 | 199 | $ hg clone -U -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/server ssh-full-clone |
|
200 | 200 | applying clone bundle from http://localhost:$HGPORT1/full.hg |
|
201 | 201 | adding changesets |
|
202 | 202 | adding manifests |
|
203 | 203 | adding file changes |
|
204 | 204 | added 2 changesets with 2 changes to 2 files |
|
205 | 205 | finished applying clone bundle |
|
206 | 206 | searching for changes |
|
207 | 207 | no changes found |
|
208 | 208 | |
|
209 | 209 | Entry with unknown BUNDLESPEC is filtered and not used |
|
210 | 210 | |
|
211 | 211 | $ cat > server/.hg/clonebundles.manifest << EOF |
|
212 | 212 | > http://bad.entry1 BUNDLESPEC=UNKNOWN |
|
213 | 213 | > http://bad.entry2 BUNDLESPEC=xz-v1 |
|
214 | 214 | > http://bad.entry3 BUNDLESPEC=none-v100 |
|
215 | 215 | > http://localhost:$HGPORT1/full.hg BUNDLESPEC=gzip-v2 |
|
216 | 216 | > EOF |
|
217 | 217 | |
|
218 | 218 | $ hg clone -U http://localhost:$HGPORT filter-unknown-type |
|
219 | 219 | applying clone bundle from http://localhost:$HGPORT1/full.hg |
|
220 | 220 | adding changesets |
|
221 | 221 | adding manifests |
|
222 | 222 | adding file changes |
|
223 | 223 | added 2 changesets with 2 changes to 2 files |
|
224 | 224 | finished applying clone bundle |
|
225 | 225 | searching for changes |
|
226 | 226 | no changes found |
|
227 | 227 | |
|
228 | 228 | Automatic fallback when all entries are filtered |
|
229 | 229 | |
|
230 | 230 | $ cat > server/.hg/clonebundles.manifest << EOF |
|
231 | 231 | > http://bad.entry BUNDLESPEC=UNKNOWN |
|
232 | 232 | > EOF |
|
233 | 233 | |
|
234 | 234 | $ hg clone -U http://localhost:$HGPORT filter-all |
|
235 | 235 | no compatible clone bundles available on server; falling back to regular clone |
|
236 | 236 | (you may want to report this to the server operator) |
|
237 | 237 | requesting all changes |
|
238 | 238 | adding changesets |
|
239 | 239 | adding manifests |
|
240 | 240 | adding file changes |
|
241 | 241 | added 2 changesets with 2 changes to 2 files |
|
242 | 242 | |
|
243 | 243 | URLs requiring SNI are filtered in Python <2.7.9 |
|
244 | 244 | |
|
245 | 245 | $ cp full.hg sni.hg |
|
246 | 246 | $ cat > server/.hg/clonebundles.manifest << EOF |
|
247 | 247 | > http://localhost:$HGPORT1/sni.hg REQUIRESNI=true |
|
248 | 248 | > http://localhost:$HGPORT1/full.hg |
|
249 | 249 | > EOF |
|
250 | 250 | |
|
251 | 251 | #if sslcontext |
|
252 | 252 | Python 2.7.9+ support SNI |
|
253 | 253 | |
|
254 | 254 | $ hg clone -U http://localhost:$HGPORT sni-supported |
|
255 | 255 | applying clone bundle from http://localhost:$HGPORT1/sni.hg |
|
256 | 256 | adding changesets |
|
257 | 257 | adding manifests |
|
258 | 258 | adding file changes |
|
259 | 259 | added 2 changesets with 2 changes to 2 files |
|
260 | 260 | finished applying clone bundle |
|
261 | 261 | searching for changes |
|
262 | 262 | no changes found |
|
263 | 263 | #else |
|
264 | 264 | Python <2.7.9 will filter SNI URLs |
|
265 | 265 | |
|
266 | 266 | $ hg clone -U http://localhost:$HGPORT sni-unsupported |
|
267 | 267 | applying clone bundle from http://localhost:$HGPORT1/full.hg |
|
268 | 268 | adding changesets |
|
269 | 269 | adding manifests |
|
270 | 270 | adding file changes |
|
271 | 271 | added 2 changesets with 2 changes to 2 files |
|
272 | 272 | finished applying clone bundle |
|
273 | 273 | searching for changes |
|
274 | 274 | no changes found |
|
275 | 275 | #endif |
|
276 | 276 | |
|
277 | 277 | Stream clone bundles are supported |
|
278 | 278 | |
|
279 | 279 | $ hg -R server debugcreatestreamclonebundle packed.hg |
|
280 | 280 | writing 613 bytes for 4 files |
|
281 | 281 | bundle requirements: generaldelta, revlogv1 |
|
282 | 282 | |
|
283 | 283 | No bundle spec should work |
|
284 | 284 | |
|
285 | 285 | $ cat > server/.hg/clonebundles.manifest << EOF |
|
286 | 286 | > http://localhost:$HGPORT1/packed.hg |
|
287 | 287 | > EOF |
|
288 | 288 | |
|
289 | 289 | $ hg clone -U http://localhost:$HGPORT stream-clone-no-spec |
|
290 | 290 | applying clone bundle from http://localhost:$HGPORT1/packed.hg |
|
291 | 291 | 4 files to transfer, 613 bytes of data |
|
292 | 292 | transferred 613 bytes in *.* seconds (*) (glob) |
|
293 | 293 | finished applying clone bundle |
|
294 | 294 | searching for changes |
|
295 | 295 | no changes found |
|
296 | 296 | |
|
297 | 297 | Bundle spec without parameters should work |
|
298 | 298 | |
|
299 | 299 | $ cat > server/.hg/clonebundles.manifest << EOF |
|
300 | 300 | > http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1 |
|
301 | 301 | > EOF |
|
302 | 302 | |
|
303 | 303 | $ hg clone -U http://localhost:$HGPORT stream-clone-vanilla-spec |
|
304 | 304 | applying clone bundle from http://localhost:$HGPORT1/packed.hg |
|
305 | 305 | 4 files to transfer, 613 bytes of data |
|
306 | 306 | transferred 613 bytes in *.* seconds (*) (glob) |
|
307 | 307 | finished applying clone bundle |
|
308 | 308 | searching for changes |
|
309 | 309 | no changes found |
|
310 | 310 | |
|
311 | 311 | Bundle spec with format requirements should work |
|
312 | 312 | |
|
313 | 313 | $ cat > server/.hg/clonebundles.manifest << EOF |
|
314 | 314 | > http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1;requirements%3Drevlogv1 |
|
315 | 315 | > EOF |
|
316 | 316 | |
|
317 | 317 | $ hg clone -U http://localhost:$HGPORT stream-clone-supported-requirements |
|
318 | 318 | applying clone bundle from http://localhost:$HGPORT1/packed.hg |
|
319 | 319 | 4 files to transfer, 613 bytes of data |
|
320 | 320 | transferred 613 bytes in *.* seconds (*) (glob) |
|
321 | 321 | finished applying clone bundle |
|
322 | 322 | searching for changes |
|
323 | 323 | no changes found |
|
324 | 324 | |
|
325 | 325 | Stream bundle spec with unknown requirements should be filtered out |
|
326 | 326 | |
|
327 | 327 | $ cat > server/.hg/clonebundles.manifest << EOF |
|
328 | 328 | > http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1;requirements%3Drevlogv42 |
|
329 | 329 | > EOF |
|
330 | 330 | |
|
331 | 331 | $ hg clone -U http://localhost:$HGPORT stream-clone-unsupported-requirements |
|
332 | 332 | no compatible clone bundles available on server; falling back to regular clone |
|
333 | 333 | (you may want to report this to the server operator) |
|
334 | 334 | requesting all changes |
|
335 | 335 | adding changesets |
|
336 | 336 | adding manifests |
|
337 | 337 | adding file changes |
|
338 | 338 | added 2 changesets with 2 changes to 2 files |
|
339 | 339 | |
|
340 | 340 | Set up manifest for testing preferences |
|
341 | 341 | (Remember, the TYPE does not have to match reality - the URL is |
|
342 | 342 | important) |
|
343 | 343 | |
|
344 | 344 | $ cp full.hg gz-a.hg |
|
345 | 345 | $ cp full.hg gz-b.hg |
|
346 | 346 | $ cp full.hg bz2-a.hg |
|
347 | 347 | $ cp full.hg bz2-b.hg |
|
348 | 348 | $ cat > server/.hg/clonebundles.manifest << EOF |
|
349 | 349 | > http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2 extra=a |
|
350 | 350 | > http://localhost:$HGPORT1/bz2-a.hg BUNDLESPEC=bzip2-v2 extra=a |
|
351 | 351 | > http://localhost:$HGPORT1/gz-b.hg BUNDLESPEC=gzip-v2 extra=b |
|
352 | 352 | > http://localhost:$HGPORT1/bz2-b.hg BUNDLESPEC=bzip2-v2 extra=b |
|
353 | 353 | > EOF |
|
354 | 354 | |
|
355 | 355 | Preferring an undefined attribute will take first entry |
|
356 | 356 | |
|
357 | 357 | $ hg --config ui.clonebundleprefers=foo=bar clone -U http://localhost:$HGPORT prefer-foo |
|
358 | 358 | applying clone bundle from http://localhost:$HGPORT1/gz-a.hg |
|
359 | 359 | adding changesets |
|
360 | 360 | adding manifests |
|
361 | 361 | adding file changes |
|
362 | 362 | added 2 changesets with 2 changes to 2 files |
|
363 | 363 | finished applying clone bundle |
|
364 | 364 | searching for changes |
|
365 | 365 | no changes found |
|
366 | 366 | |
|
367 | 367 | Preferring bz2 type will download first entry of that type |
|
368 | 368 | |
|
369 | 369 | $ hg --config ui.clonebundleprefers=COMPRESSION=bzip2 clone -U http://localhost:$HGPORT prefer-bz |
|
370 | 370 | applying clone bundle from http://localhost:$HGPORT1/bz2-a.hg |
|
371 | 371 | adding changesets |
|
372 | 372 | adding manifests |
|
373 | 373 | adding file changes |
|
374 | 374 | added 2 changesets with 2 changes to 2 files |
|
375 | 375 | finished applying clone bundle |
|
376 | 376 | searching for changes |
|
377 | 377 | no changes found |
|
378 | 378 | |
|
379 | 379 | Preferring multiple values of an option works |
|
380 | 380 | |
|
381 | 381 | $ hg --config ui.clonebundleprefers=COMPRESSION=unknown,COMPRESSION=bzip2 clone -U http://localhost:$HGPORT prefer-multiple-bz |
|
382 | 382 | applying clone bundle from http://localhost:$HGPORT1/bz2-a.hg |
|
383 | 383 | adding changesets |
|
384 | 384 | adding manifests |
|
385 | 385 | adding file changes |
|
386 | 386 | added 2 changesets with 2 changes to 2 files |
|
387 | 387 | finished applying clone bundle |
|
388 | 388 | searching for changes |
|
389 | 389 | no changes found |
|
390 | 390 | |
|
391 | 391 | Sorting multiple values should get us back to original first entry |
|
392 | 392 | |
|
393 | 393 | $ hg --config ui.clonebundleprefers=BUNDLESPEC=unknown,BUNDLESPEC=gzip-v2,BUNDLESPEC=bzip2-v2 clone -U http://localhost:$HGPORT prefer-multiple-gz |
|
394 | 394 | applying clone bundle from http://localhost:$HGPORT1/gz-a.hg |
|
395 | 395 | adding changesets |
|
396 | 396 | adding manifests |
|
397 | 397 | adding file changes |
|
398 | 398 | added 2 changesets with 2 changes to 2 files |
|
399 | 399 | finished applying clone bundle |
|
400 | 400 | searching for changes |
|
401 | 401 | no changes found |
|
402 | 402 | |
|
403 | 403 | Preferring multiple attributes has correct order |
|
404 | 404 | |
|
405 | 405 | $ hg --config ui.clonebundleprefers=extra=b,BUNDLESPEC=bzip2-v2 clone -U http://localhost:$HGPORT prefer-separate-attributes |
|
406 | 406 | applying clone bundle from http://localhost:$HGPORT1/bz2-b.hg |
|
407 | 407 | adding changesets |
|
408 | 408 | adding manifests |
|
409 | 409 | adding file changes |
|
410 | 410 | added 2 changesets with 2 changes to 2 files |
|
411 | 411 | finished applying clone bundle |
|
412 | 412 | searching for changes |
|
413 | 413 | no changes found |
|
414 | 414 | |
|
415 | 415 | Test where attribute is missing from some entries |
|
416 | 416 | |
|
417 | 417 | $ cat > server/.hg/clonebundles.manifest << EOF |
|
418 | 418 | > http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2 |
|
419 | 419 | > http://localhost:$HGPORT1/bz2-a.hg BUNDLESPEC=bzip2-v2 |
|
420 | 420 | > http://localhost:$HGPORT1/gz-b.hg BUNDLESPEC=gzip-v2 extra=b |
|
421 | 421 | > http://localhost:$HGPORT1/bz2-b.hg BUNDLESPEC=bzip2-v2 extra=b |
|
422 | 422 | > EOF |
|
423 | 423 | |
|
424 | 424 | $ hg --config ui.clonebundleprefers=extra=b clone -U http://localhost:$HGPORT prefer-partially-defined-attribute |
|
425 | 425 | applying clone bundle from http://localhost:$HGPORT1/gz-b.hg |
|
426 | 426 | adding changesets |
|
427 | 427 | adding manifests |
|
428 | 428 | adding file changes |
|
429 | 429 | added 2 changesets with 2 changes to 2 files |
|
430 | 430 | finished applying clone bundle |
|
431 | 431 | searching for changes |
|
432 | 432 | no changes found |
@@ -1,120 +1,120 b'' | |||
|
1 | 1 | #require serve |
|
2 | 2 | |
|
3 | 3 | $ hg init a |
|
4 | 4 | $ cd a |
|
5 | 5 | $ echo a > a |
|
6 | 6 | $ hg ci -Ama -d '1123456789 0' |
|
7 | 7 | adding a |
|
8 | 8 | $ hg serve --config server.uncompressed=True -p $HGPORT -d --pid-file=hg.pid |
|
9 | 9 | $ cat hg.pid >> $DAEMON_PIDS |
|
10 | 10 | $ cd .. |
|
11 | 11 | $ tinyproxy.py $HGPORT1 localhost >proxy.log 2>&1 </dev/null & |
|
12 | 12 | $ while [ ! -f proxy.pid ]; do sleep 0; done |
|
13 | 13 | $ cat proxy.pid >> $DAEMON_PIDS |
|
14 | 14 | |
|
15 | 15 | url for proxy, stream |
|
16 | 16 | |
|
17 | 17 | $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --uncompressed http://localhost:$HGPORT/ b |
|
18 | 18 | streaming all changes |
|
19 | 19 | 3 files to transfer, 303 bytes of data |
|
20 | 20 | transferred * bytes in * seconds (*/sec) (glob) |
|
21 | 21 | searching for changes |
|
22 | 22 | no changes found |
|
23 | 23 | updating to branch default |
|
24 | 24 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
25 | 25 | $ cd b |
|
26 | 26 | $ hg verify |
|
27 | 27 | checking changesets |
|
28 | 28 | checking manifests |
|
29 | 29 | crosschecking files in changesets and manifests |
|
30 | 30 | checking files |
|
31 | 31 | 1 files, 1 changesets, 1 total revisions |
|
32 | 32 | $ cd .. |
|
33 | 33 | |
|
34 | 34 | url for proxy, pull |
|
35 | 35 | |
|
36 | 36 | $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone http://localhost:$HGPORT/ b-pull |
|
37 | 37 | requesting all changes |
|
38 | 38 | adding changesets |
|
39 | 39 | adding manifests |
|
40 | 40 | adding file changes |
|
41 | 41 | added 1 changesets with 1 changes to 1 files |
|
42 | 42 | updating to branch default |
|
43 | 43 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
44 | 44 | $ cd b-pull |
|
45 | 45 | $ hg verify |
|
46 | 46 | checking changesets |
|
47 | 47 | checking manifests |
|
48 | 48 | crosschecking files in changesets and manifests |
|
49 | 49 | checking files |
|
50 | 50 | 1 files, 1 changesets, 1 total revisions |
|
51 | 51 | $ cd .. |
|
52 | 52 | |
|
53 | 53 | host:port for proxy |
|
54 | 54 | |
|
55 | 55 | $ http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ c |
|
56 | 56 | requesting all changes |
|
57 | 57 | adding changesets |
|
58 | 58 | adding manifests |
|
59 | 59 | adding file changes |
|
60 | 60 | added 1 changesets with 1 changes to 1 files |
|
61 | 61 | updating to branch default |
|
62 | 62 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
63 | 63 | |
|
64 | 64 | proxy url with user name and password |
|
65 | 65 | |
|
66 | 66 | $ http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ d |
|
67 | 67 | requesting all changes |
|
68 | 68 | adding changesets |
|
69 | 69 | adding manifests |
|
70 | 70 | adding file changes |
|
71 | 71 | added 1 changesets with 1 changes to 1 files |
|
72 | 72 | updating to branch default |
|
73 | 73 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
74 | 74 | |
|
75 | 75 | url with user name and password |
|
76 | 76 | |
|
77 | 77 | $ http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://user:passwd@localhost:$HGPORT/ e |
|
78 | 78 | requesting all changes |
|
79 | 79 | adding changesets |
|
80 | 80 | adding manifests |
|
81 | 81 | adding file changes |
|
82 | 82 | added 1 changesets with 1 changes to 1 files |
|
83 | 83 | updating to branch default |
|
84 | 84 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
85 | 85 | |
|
86 | 86 | bad host:port for proxy ("Protocol not supported" can happen on |
|
87 | 87 | misconfigured hosts) |
|
88 | 88 | |
|
89 | 89 | $ http_proxy=localhost:$HGPORT2 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ f |
|
90 | abort: error: (Connection refused|Protocol not supported|.* actively refused it) (re) | |
|
90 | abort: error: (Connection refused|Protocol not supported|.* actively refused it|Cannot assign requested address) (re) | |
|
91 | 91 | [255] |
|
92 | 92 | |
|
93 | 93 | do not use the proxy if it is in the no list |
|
94 | 94 | |
|
95 | 95 | $ http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.no=localhost http://localhost:$HGPORT/ g |
|
96 | 96 | requesting all changes |
|
97 | 97 | adding changesets |
|
98 | 98 | adding manifests |
|
99 | 99 | adding file changes |
|
100 | 100 | added 1 changesets with 1 changes to 1 files |
|
101 | 101 | updating to branch default |
|
102 | 102 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
103 | 103 | $ cat proxy.log |
|
104 | 104 | * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) |
|
105 | 105 | * - - [*] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) |
|
106 | 106 | * - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) |
|
107 | 107 | * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D83180e7845de420a1bb46896fd5fe05294f8d629 x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) |
|
108 | 108 | * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=83180e7845de420a1bb46896fd5fe05294f8d629&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) |
|
109 | 109 | * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) |
|
110 | 110 | * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) |
|
111 | 111 | * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) |
|
112 | 112 | * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) |
|
113 | 113 | * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) |
|
114 | 114 | * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) |
|
115 | 115 | * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) |
|
116 | 116 | * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) |
|
117 | 117 | * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) |
|
118 | 118 | * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) |
|
119 | 119 | * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) |
|
120 | 120 | * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now