Show More
@@ -1,4 +1,4 b'' | |||
|
1 | #require serve | |
|
1 | #require serve no-reposimplestore | |
|
2 | 2 | |
|
3 | 3 | #testcases stream-legacy stream-bundle2 |
|
4 | 4 |
@@ -35,6 +35,7 b' Test server address cannot be reused' | |||
|
35 | 35 | |
|
36 | 36 | clone via stream |
|
37 | 37 | |
|
38 | #if no-reposimplestore | |
|
38 | 39 | $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1 |
|
39 | 40 | streaming all changes |
|
40 | 41 | 6 files to transfer, 606 bytes of data |
@@ -49,6 +50,7 b' clone via stream' | |||
|
49 | 50 | crosschecking files in changesets and manifests |
|
50 | 51 | checking files |
|
51 | 52 | 4 files, 1 changesets, 4 total revisions |
|
53 | #endif | |
|
52 | 54 | |
|
53 | 55 | try to clone via stream, should use pull instead |
|
54 | 56 | |
@@ -223,6 +225,8 b' test http authentication' | |||
|
223 | 225 | 5fed3813f7f5 |
|
224 | 226 | $ hg id http://user@localhost:$HGPORT2/ |
|
225 | 227 | 5fed3813f7f5 |
|
228 | ||
|
229 | #if no-reposimplestore | |
|
226 | 230 | $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1 |
|
227 | 231 | streaming all changes |
|
228 | 232 | 7 files to transfer, 916 bytes of data |
@@ -231,7 +235,10 b' test http authentication' | |||
|
231 | 235 | no changes found |
|
232 | 236 | updating to branch default |
|
233 | 237 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
238 | #endif | |
|
239 | ||
|
234 | 240 | --pull should override server's preferuncompressed |
|
241 | ||
|
235 | 242 | $ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1 |
|
236 | 243 | requesting all changes |
|
237 | 244 | adding changesets |
@@ -249,8 +256,8 b' test http authentication' | |||
|
249 | 256 | abort: HTTP Error 403: no |
|
250 | 257 | [255] |
|
251 | 258 | |
|
252 | $ hg -R dest tag -r tip top | |
|
253 | $ hg -R dest push http://user:pass@localhost:$HGPORT2/ | |
|
259 | $ hg -R dest-pull tag -r tip top | |
|
260 | $ hg -R dest-pull push http://user:pass@localhost:$HGPORT2/ | |
|
254 | 261 | pushing to http://user:***@localhost:$HGPORT2/ |
|
255 | 262 | searching for changes |
|
256 | 263 | remote: adding changesets |
@@ -287,16 +294,16 b' test http authentication' | |||
|
287 | 294 | "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
288 | 295 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
289 | 296 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
290 | "GET /?cmd=capabilities HTTP/1.1" 401 - | |
|
291 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |
|
292 | "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
293 | "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
294 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
295 | "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
296 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
297 | "GET /?cmd=capabilities HTTP/1.1" 401 - | |
|
298 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |
|
299 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
297 | "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !) | |
|
298 | "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !) | |
|
299 | "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !) | |
|
300 | "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !) | |
|
301 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !) | |
|
302 | "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !) | |
|
303 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !) | |
|
304 | "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !) | |
|
305 | "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !) | |
|
306 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !) | |
|
300 | 307 | "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
301 | 308 | "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
302 | 309 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
@@ -26,6 +26,7 b' Test server address cannot be reused' | |||
|
26 | 26 | |
|
27 | 27 | clone via stream |
|
28 | 28 | |
|
29 | #if no-reposimplestore | |
|
29 | 30 | $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1 |
|
30 | 31 | streaming all changes |
|
31 | 32 | 6 files to transfer, 606 bytes of data |
@@ -40,6 +41,7 b' clone via stream' | |||
|
40 | 41 | crosschecking files in changesets and manifests |
|
41 | 42 | checking files |
|
42 | 43 | 4 files, 1 changesets, 4 total revisions |
|
44 | #endif | |
|
43 | 45 | |
|
44 | 46 | try to clone via stream, should use pull instead |
|
45 | 47 | |
@@ -213,6 +215,8 b' test http authentication' | |||
|
213 | 215 | 5fed3813f7f5 |
|
214 | 216 | $ hg id http://user@localhost:$HGPORT2/ |
|
215 | 217 | 5fed3813f7f5 |
|
218 | ||
|
219 | #if no-reposimplestore | |
|
216 | 220 | $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1 |
|
217 | 221 | streaming all changes |
|
218 | 222 | 7 files to transfer, 916 bytes of data |
@@ -221,6 +225,8 b' test http authentication' | |||
|
221 | 225 | no changes found |
|
222 | 226 | updating to branch default |
|
223 | 227 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
228 | #endif | |
|
229 | ||
|
224 | 230 | --pull should override server's preferuncompressed |
|
225 | 231 | $ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1 |
|
226 | 232 | requesting all changes |
@@ -239,8 +245,8 b' test http authentication' | |||
|
239 | 245 | abort: HTTP Error 403: no |
|
240 | 246 | [255] |
|
241 | 247 | |
|
242 | $ hg -R dest tag -r tip top | |
|
243 | $ hg -R dest push http://user:pass@localhost:$HGPORT2/ | |
|
248 | $ hg -R dest-pull tag -r tip top | |
|
249 | $ hg -R dest-pull push http://user:pass@localhost:$HGPORT2/ | |
|
244 | 250 | pushing to http://user:***@localhost:$HGPORT2/ |
|
245 | 251 | searching for changes |
|
246 | 252 | remote: adding changesets |
@@ -248,7 +254,7 b' test http authentication' | |||
|
248 | 254 | remote: adding file changes |
|
249 | 255 | remote: added 1 changesets with 1 changes to 1 files |
|
250 | 256 | $ hg rollback -q |
|
251 | $ hg -R dest push http://user:pass@localhost:$HGPORT2/ --debug --config devel.debug.peer-request=yes | |
|
257 | $ hg -R dest-pull push http://user:pass@localhost:$HGPORT2/ --debug --config devel.debug.peer-request=yes | |
|
252 | 258 | pushing to http://user:***@localhost:$HGPORT2/ |
|
253 | 259 | using http://localhost:$HGPORT2/ |
|
254 | 260 | http auth: user user, password **** |
@@ -370,14 +376,14 b' test http authentication' | |||
|
370 | 376 | "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
371 | 377 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=namespaces x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
372 | 378 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
373 | "GET /?cmd=capabilities HTTP/1.1" 401 - | |
|
374 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |
|
375 | "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
376 | "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
377 | "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
378 | "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
379 | "GET /?cmd=capabilities HTTP/1.1" 401 - | |
|
380 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |
|
379 | "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !) | |
|
380 | "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !) | |
|
381 | "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !) | |
|
382 | "GET /?cmd=stream_out HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !) | |
|
383 | "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !) | |
|
384 | "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (no-reposimplestore !) | |
|
385 | "GET /?cmd=capabilities HTTP/1.1" 401 - (no-reposimplestore !) | |
|
386 | "GET /?cmd=capabilities HTTP/1.1" 200 - (no-reposimplestore !) | |
|
381 | 387 | "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
382 | 388 | "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&$USUAL_BUNDLE_CAPS$&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
383 | 389 | "GET /?cmd=capabilities HTTP/1.1" 401 - |
@@ -66,6 +66,8 b' non-existent absolute path' | |||
|
66 | 66 | |
|
67 | 67 | clone remote via stream |
|
68 | 68 | |
|
69 | #if no-reposimplestore | |
|
70 | ||
|
69 | 71 | $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/remote local-stream |
|
70 | 72 | streaming all changes |
|
71 | 73 | 4 files to transfer, 602 bytes of data |
@@ -102,6 +104,8 b' clone bookmarks via stream' | |||
|
102 | 104 | $ cd .. |
|
103 | 105 | $ rm -rf local-stream stream2 |
|
104 | 106 | |
|
107 | #endif | |
|
108 | ||
|
105 | 109 | clone remote via pull |
|
106 | 110 | |
|
107 | 111 | $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local |
@@ -499,9 +503,9 b' debug output' | |||
|
499 | 503 | Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio |
|
500 | 504 | Got arguments 1:user@dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio |
|
501 | 505 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
502 | Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio | |
|
503 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio | |
|
504 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio | |
|
506 | Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio (no-reposimplestore !) | |
|
507 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !) | |
|
508 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !) | |
|
505 | 509 | Got arguments 1:user@dummy 2:hg -R doesnotexist serve --stdio |
|
506 | 510 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
507 | 511 | Got arguments 1:user@dummy 2:hg -R local serve --stdio |
@@ -56,6 +56,8 b' non-existent absolute path' | |||
|
56 | 56 | |
|
57 | 57 | clone remote via stream |
|
58 | 58 | |
|
59 | #if no-reposimplestore | |
|
60 | ||
|
59 | 61 | $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/remote local-stream |
|
60 | 62 | streaming all changes |
|
61 | 63 | 4 files to transfer, 602 bytes of data |
@@ -92,6 +94,8 b' clone bookmarks via stream' | |||
|
92 | 94 | $ cd .. |
|
93 | 95 | $ rm -rf local-stream stream2 |
|
94 | 96 | |
|
97 | #endif | |
|
98 | ||
|
95 | 99 | clone remote via pull |
|
96 | 100 | |
|
97 | 101 | $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local |
@@ -530,9 +534,9 b' debug output' | |||
|
530 | 534 | Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio |
|
531 | 535 | Got arguments 1:user@dummy 2:hg -R $TESTTMP/nonexistent serve --stdio |
|
532 | 536 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
533 | Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio | |
|
534 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio | |
|
535 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio | |
|
537 | Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio (no-reposimplestore !) | |
|
538 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !) | |
|
539 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio (no-reposimplestore !) | |
|
536 | 540 | Got arguments 1:user@dummy 2:hg -R doesnotexist serve --stdio |
|
537 | 541 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
538 | 542 | Got arguments 1:user@dummy 2:hg -R local serve --stdio |
General Comments 0
You need to be logged in to leave comments.
Login now