Show More
@@ -1724,14 +1724,15 b' class localrepository(object):' | |||||
1724 | if stream and not heads: |
|
1724 | if stream and not heads: | |
1725 | # 'stream' means remote revlog format is revlogv1 only |
|
1725 | # 'stream' means remote revlog format is revlogv1 only | |
1726 | if remote.capable('stream'): |
|
1726 | if remote.capable('stream'): | |
1727 |
|
|
1727 | self.stream_in(remote, set(('revlogv1',))) | |
|
1728 | else: | |||
1728 | # otherwise, 'streamreqs' contains the remote revlog format |
|
1729 | # otherwise, 'streamreqs' contains the remote revlog format | |
1729 | streamreqs = remote.capable('streamreqs') |
|
1730 | streamreqs = remote.capable('streamreqs') | |
1730 | if streamreqs: |
|
1731 | if streamreqs: | |
1731 | streamreqs = set(streamreqs.split(',')) |
|
1732 | streamreqs = set(streamreqs.split(',')) | |
1732 | # if we support it, stream in and adjust our requirements |
|
1733 | # if we support it, stream in and adjust our requirements | |
1733 | if not streamreqs - self.supportedformats: |
|
1734 | if not streamreqs - self.supportedformats: | |
1734 |
|
|
1735 | self.stream_in(remote, streamreqs) | |
1735 |
|
1736 | |||
1736 | quiet = self.ui.backupconfig('ui', 'quietbookmarkmove') |
|
1737 | quiet = self.ui.backupconfig('ui', 'quietbookmarkmove') | |
1737 | try: |
|
1738 | try: |
@@ -18,6 +18,8 b' url for proxy, stream' | |||||
18 | streaming all changes |
|
18 | streaming all changes | |
19 | 3 files to transfer, 303 bytes of data |
|
19 | 3 files to transfer, 303 bytes of data | |
20 | transferred * bytes in * seconds (*/sec) (glob) |
|
20 | transferred * bytes in * seconds (*/sec) (glob) | |
|
21 | searching for changes | |||
|
22 | no changes found | |||
21 | updating to branch default |
|
23 | updating to branch default | |
22 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
24 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
23 | $ cd b |
|
25 | $ cd b | |
@@ -101,6 +103,9 b' do not use the proxy if it is in the no ' | |||||
101 | * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) |
|
103 | * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) | |
102 | * - - [*] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - - (glob) |
|
104 | * - - [*] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - - (glob) | |
103 | * - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - (glob) |
|
105 | * - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - (glob) | |
|
106 | * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob) | |||
|
107 | * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D83180e7845de420a1bb46896fd5fe05294f8d629 (glob) | |||
|
108 | * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob) | |||
104 | * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) |
|
109 | * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) | |
105 | *- - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob) |
|
110 | *- - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob) | |
106 | *- - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob) |
|
111 | *- - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob) |
@@ -35,6 +35,8 b' clone via stream' | |||||
35 | streaming all changes |
|
35 | streaming all changes | |
36 | 6 files to transfer, 606 bytes of data |
|
36 | 6 files to transfer, 606 bytes of data | |
37 | transferred * bytes in * seconds (*/sec) (glob) |
|
37 | transferred * bytes in * seconds (*/sec) (glob) | |
|
38 | searching for changes | |||
|
39 | no changes found | |||
38 | updating to branch default |
|
40 | updating to branch default | |
39 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
41 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
40 | $ hg verify -R copy |
|
42 | $ hg verify -R copy | |
@@ -195,6 +197,8 b' test http authentication' | |||||
195 | streaming all changes |
|
197 | streaming all changes | |
196 | 7 files to transfer, 916 bytes of data |
|
198 | 7 files to transfer, 916 bytes of data | |
197 | transferred * bytes in * seconds (*/sec) (glob) |
|
199 | transferred * bytes in * seconds (*/sec) (glob) | |
|
200 | searching for changes | |||
|
201 | no changes found | |||
198 | updating to branch default |
|
202 | updating to branch default | |
199 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
203 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
200 |
|
204 | |||
@@ -251,6 +255,9 b' test http authentication' | |||||
251 | "GET /?cmd=branchmap HTTP/1.1" 200 - |
|
255 | "GET /?cmd=branchmap HTTP/1.1" 200 - | |
252 | "GET /?cmd=stream_out HTTP/1.1" 401 - |
|
256 | "GET /?cmd=stream_out HTTP/1.1" 401 - | |
253 | "GET /?cmd=stream_out HTTP/1.1" 200 - |
|
257 | "GET /?cmd=stream_out HTTP/1.1" 200 - | |
|
258 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks | |||
|
259 | "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d | |||
|
260 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases | |||
254 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
261 | "GET /?cmd=capabilities HTTP/1.1" 200 - | |
255 | "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip |
|
262 | "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip | |
256 | "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces |
|
263 | "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces |
@@ -38,6 +38,8 b' clone remote via stream' | |||||
38 | streaming all changes |
|
38 | streaming all changes | |
39 | 4 files to transfer, 392 bytes of data |
|
39 | 4 files to transfer, 392 bytes of data | |
40 | transferred 392 bytes in * seconds (*/sec) (glob) |
|
40 | transferred 392 bytes in * seconds (*/sec) (glob) | |
|
41 | searching for changes | |||
|
42 | no changes found | |||
41 | updating to branch default |
|
43 | updating to branch default | |
42 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
44 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
43 | $ cd local-stream |
|
45 | $ cd local-stream | |
@@ -49,6 +51,23 b' clone remote via stream' | |||||
49 | 2 files, 1 changesets, 2 total revisions |
|
51 | 2 files, 1 changesets, 2 total revisions | |
50 | $ cd .. |
|
52 | $ cd .. | |
51 |
|
53 | |||
|
54 | clone bookmarks via stream | |||
|
55 | ||||
|
56 | $ hg -R local-stream book mybook | |||
|
57 | $ hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/local-stream stream2 | |||
|
58 | streaming all changes | |||
|
59 | 4 files to transfer, 392 bytes of data | |||
|
60 | transferred 392 bytes in * seconds (* KB/sec) (glob) | |||
|
61 | searching for changes | |||
|
62 | no changes found | |||
|
63 | updating to branch default | |||
|
64 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
65 | $ cd stream2 | |||
|
66 | $ hg book | |||
|
67 | mybook 0:1160648e36ce | |||
|
68 | $ cd .. | |||
|
69 | $ rm -rf local-stream stream2 | |||
|
70 | ||||
52 | clone remote via pull |
|
71 | clone remote via pull | |
53 |
|
72 | |||
54 | $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local |
|
73 | $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local | |
@@ -404,6 +423,7 b' stderr from remote commands should be pr' | |||||
404 | Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio |
|
423 | Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio | |
405 | Got arguments 1:user@dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio |
|
424 | Got arguments 1:user@dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio | |
406 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
425 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio | |
|
426 | Got arguments 1:user@dummy 2:hg -R local-stream serve --stdio | |||
407 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
427 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio | |
408 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
428 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio | |
409 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
429 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
General Comments 0
You need to be logged in to leave comments.
Login now