sshpeer: rename sshpeer class to sshv1peer (API)
authorGregory Szorc <gregory.szorc@gmail.com>
Tue, 06 Feb 2018 10:57:56 -0800
changeset 36016 625038cb4b1d
parent 36015 48a3a9283f09
child 36017 59e4a7781a36
sshpeer: rename sshpeer class to sshv1peer (API) With the introduction of version 2 of the SSH wire protocol, we will need a new peer class to speak that protocol because it will be too difficult to shoehorn a single class to speak two protocols. We rename sshpeer.sshpeer to sshpeer.sshv1peer to reflect the fact that there will be multiple versions of the peer depending on the negotiated protocol. .. api:: sshpeer.sshpeer renamed to sshpeer.sshv1peer. Differential Revision: https://phab.mercurial-scm.org/D2062
hgext/largefiles/uisetup.py
mercurial/sshpeer.py
tests/test-check-interfaces.py
--- a/hgext/largefiles/uisetup.py	Tue Feb 06 11:08:36 2018 -0800
+++ b/hgext/largefiles/uisetup.py	Tue Feb 06 10:57:56 2018 -0800
@@ -185,9 +185,9 @@
 
     # can't do this in reposetup because it needs to have happened before
     # wirerepo.__init__ is called
-    proto.ssholdcallstream = sshpeer.sshpeer._callstream
+    proto.ssholdcallstream = sshpeer.sshv1peer._callstream
     proto.httpoldcallstream = httppeer.httppeer._callstream
-    sshpeer.sshpeer._callstream = proto.sshrepocallstream
+    sshpeer.sshv1peer._callstream = proto.sshrepocallstream
     httppeer.httppeer._callstream = proto.httprepocallstream
 
     # override some extensions' stuff as well
--- a/mercurial/sshpeer.py	Tue Feb 06 11:08:36 2018 -0800
+++ b/mercurial/sshpeer.py	Tue Feb 06 10:57:56 2018 -0800
@@ -328,7 +328,7 @@
 
     return caps
 
-class sshpeer(wireproto.wirepeer):
+class sshv1peer(wireproto.wirepeer):
     def __init__(self, ui, url, proc, stdin, stdout, stderr, caps):
         """Create a peer from an existing SSH connection.
 
@@ -537,4 +537,4 @@
         _cleanuppipes(ui, stdout, stdin, stderr)
         raise
 
-    return sshpeer(ui, path, proc, stdin, stdout, stderr, caps)
+    return sshv1peer(ui, path, proc, stdin, stdout, stderr, caps)
--- a/tests/test-check-interfaces.py	Tue Feb 06 11:08:36 2018 -0800
+++ b/tests/test-check-interfaces.py	Tue Feb 06 10:57:56 2018 -0800
@@ -65,8 +65,8 @@
     checkobject(badpeer())
     checkobject(httppeer.httppeer(ui, 'http://localhost'))
     checkobject(localrepo.localpeer(dummyrepo()))
-    checkobject(sshpeer.sshpeer(ui, 'ssh://localhost/foo', None, None, None,
-                               None, None))
+    checkobject(sshpeer.sshv1peer(ui, 'ssh://localhost/foo', None, None, None,
+                                  None, None))
     checkobject(bundlerepo.bundlepeer(dummyrepo()))
     checkobject(statichttprepo.statichttppeer(dummyrepo()))
     checkobject(unionrepo.unionpeer(dummyrepo()))