Show More
@@ -1724,14 +1724,15 b' class localrepository(object):' | |||
|
1724 | 1724 | if stream and not heads: |
|
1725 | 1725 | # 'stream' means remote revlog format is revlogv1 only |
|
1726 | 1726 | if remote.capable('stream'): |
|
1727 |
|
|
|
1728 | # otherwise, 'streamreqs' contains the remote revlog format | |
|
1729 | streamreqs = remote.capable('streamreqs') | |
|
1730 | if streamreqs: | |
|
1731 |
streamreqs |
|
|
1732 | # if we support it, stream in and adjust our requirements | |
|
1733 | if not streamreqs - self.supportedformats: | |
|
1734 | return self.stream_in(remote, streamreqs) | |
|
1727 | self.stream_in(remote, set(('revlogv1',))) | |
|
1728 | else: | |
|
1729 | # otherwise, 'streamreqs' contains the remote revlog format | |
|
1730 | streamreqs = remote.capable('streamreqs') | |
|
1731 | if streamreqs: | |
|
1732 | streamreqs = set(streamreqs.split(',')) | |
|
1733 | # if we support it, stream in and adjust our requirements | |
|
1734 | if not streamreqs - self.supportedformats: | |
|
1735 | self.stream_in(remote, streamreqs) | |
|
1735 | 1736 | |
|
1736 | 1737 | quiet = self.ui.backupconfig('ui', 'quietbookmarkmove') |
|
1737 | 1738 | try: |
@@ -18,6 +18,8 b' url for proxy, stream' | |||
|
18 | 18 | streaming all changes |
|
19 | 19 | 3 files to transfer, 303 bytes of data |
|
20 | 20 | transferred * bytes in * seconds (*/sec) (glob) |
|
21 | searching for changes | |
|
22 | no changes found | |
|
21 | 23 | updating to branch default |
|
22 | 24 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 | 25 | $ cd b |
@@ -101,6 +103,9 b' do not use the proxy if it is in the no ' | |||
|
101 | 103 | * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) |
|
102 | 104 | * - - [*] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - - (glob) |
|
103 | 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 | 109 | * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) |
|
105 | 110 | *- - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=bookmarks (glob) |
|
106 | 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 | 35 | streaming all changes |
|
36 | 36 | 6 files to transfer, 606 bytes of data |
|
37 | 37 | transferred * bytes in * seconds (*/sec) (glob) |
|
38 | searching for changes | |
|
39 | no changes found | |
|
38 | 40 | updating to branch default |
|
39 | 41 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
40 | 42 | $ hg verify -R copy |
@@ -195,6 +197,8 b' test http authentication' | |||
|
195 | 197 | streaming all changes |
|
196 | 198 | 7 files to transfer, 916 bytes of data |
|
197 | 199 | transferred * bytes in * seconds (*/sec) (glob) |
|
200 | searching for changes | |
|
201 | no changes found | |
|
198 | 202 | updating to branch default |
|
199 | 203 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
200 | 204 | |
@@ -251,6 +255,9 b' test http authentication' | |||
|
251 | 255 | "GET /?cmd=branchmap HTTP/1.1" 200 - |
|
252 | 256 | "GET /?cmd=stream_out HTTP/1.1" 401 - |
|
253 | 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 | 261 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
255 | 262 | "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip |
|
256 | 263 | "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces |
@@ -38,6 +38,8 b' clone remote via stream' | |||
|
38 | 38 | streaming all changes |
|
39 | 39 | 4 files to transfer, 392 bytes of data |
|
40 | 40 | transferred 392 bytes in * seconds (*/sec) (glob) |
|
41 | searching for changes | |
|
42 | no changes found | |
|
41 | 43 | updating to branch default |
|
42 | 44 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
43 | 45 | $ cd local-stream |
@@ -49,6 +51,23 b' clone remote via stream' | |||
|
49 | 51 | 2 files, 1 changesets, 2 total revisions |
|
50 | 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 | 71 | clone remote via pull |
|
53 | 72 | |
|
54 | 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 | 423 | Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio |
|
405 | 424 | Got arguments 1:user@dummy 2:hg -R /$TESTTMP/nonexistent serve --stdio |
|
406 | 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 | 427 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
408 | 428 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
409 | 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