Show More
@@ -185,9 +185,9 b' def uisetup(ui):' | |||||
185 |
|
185 | |||
186 | # can't do this in reposetup because it needs to have happened before |
|
186 | # can't do this in reposetup because it needs to have happened before | |
187 | # wirerepo.__init__ is called |
|
187 | # wirerepo.__init__ is called | |
188 | proto.ssholdcallstream = sshpeer.sshpeer._callstream |
|
188 | proto.ssholdcallstream = sshpeer.sshv1peer._callstream | |
189 | proto.httpoldcallstream = httppeer.httppeer._callstream |
|
189 | proto.httpoldcallstream = httppeer.httppeer._callstream | |
190 | sshpeer.sshpeer._callstream = proto.sshrepocallstream |
|
190 | sshpeer.sshv1peer._callstream = proto.sshrepocallstream | |
191 | httppeer.httppeer._callstream = proto.httprepocallstream |
|
191 | httppeer.httppeer._callstream = proto.httprepocallstream | |
192 |
|
192 | |||
193 | # override some extensions' stuff as well |
|
193 | # override some extensions' stuff as well |
@@ -328,7 +328,7 b' def _performhandshake(ui, stdin, stdout,' | |||||
328 |
|
328 | |||
329 | return caps |
|
329 | return caps | |
330 |
|
330 | |||
331 | class sshpeer(wireproto.wirepeer): |
|
331 | class sshv1peer(wireproto.wirepeer): | |
332 | def __init__(self, ui, url, proc, stdin, stdout, stderr, caps): |
|
332 | def __init__(self, ui, url, proc, stdin, stdout, stderr, caps): | |
333 | """Create a peer from an existing SSH connection. |
|
333 | """Create a peer from an existing SSH connection. | |
334 |
|
334 | |||
@@ -537,4 +537,4 b' def instance(ui, path, create):' | |||||
537 | _cleanuppipes(ui, stdout, stdin, stderr) |
|
537 | _cleanuppipes(ui, stdout, stdin, stderr) | |
538 | raise |
|
538 | raise | |
539 |
|
539 | |||
540 | return sshpeer(ui, path, proc, stdin, stdout, stderr, caps) |
|
540 | return sshv1peer(ui, path, proc, stdin, stdout, stderr, caps) |
@@ -65,8 +65,8 b' def main():' | |||||
65 | checkobject(badpeer()) |
|
65 | checkobject(badpeer()) | |
66 | checkobject(httppeer.httppeer(ui, 'http://localhost')) |
|
66 | checkobject(httppeer.httppeer(ui, 'http://localhost')) | |
67 | checkobject(localrepo.localpeer(dummyrepo())) |
|
67 | checkobject(localrepo.localpeer(dummyrepo())) | |
68 | checkobject(sshpeer.sshpeer(ui, 'ssh://localhost/foo', None, None, None, |
|
68 | checkobject(sshpeer.sshv1peer(ui, 'ssh://localhost/foo', None, None, None, | |
69 | None, None)) |
|
69 | None, None)) | |
70 | checkobject(bundlerepo.bundlepeer(dummyrepo())) |
|
70 | checkobject(bundlerepo.bundlepeer(dummyrepo())) | |
71 | checkobject(statichttprepo.statichttppeer(dummyrepo())) |
|
71 | checkobject(statichttprepo.statichttppeer(dummyrepo())) | |
72 | checkobject(unionrepo.unionpeer(dummyrepo())) |
|
72 | checkobject(unionrepo.unionpeer(dummyrepo())) |
General Comments 0
You need to be logged in to leave comments.
Login now