Show More
@@ -4512,7 +4512,7 b' def debugwireproto(ui, repo, path=None, ' | |||||
4512 | peer = None |
|
4512 | peer = None | |
4513 | else: |
|
4513 | else: | |
4514 | ui.write(_(b'creating ssh peer from handshake results\n')) |
|
4514 | ui.write(_(b'creating ssh peer from handshake results\n')) | |
4515 | peer = sshpeer.makepeer( |
|
4515 | peer = sshpeer._make_peer( | |
4516 | ui, |
|
4516 | ui, | |
4517 | url, |
|
4517 | url, | |
4518 | proc, |
|
4518 | proc, | |
@@ -4568,7 +4568,7 b' def debugwireproto(ui, repo, path=None, ' | |||||
4568 | ) |
|
4568 | ) | |
4569 | else: |
|
4569 | else: | |
4570 | peer_path = urlutil.try_path(ui, path) |
|
4570 | peer_path = urlutil.try_path(ui, path) | |
4571 | peer = httppeer.makepeer(ui, peer_path, opener=opener) |
|
4571 | peer = httppeer._make_peer(ui, peer_path, opener=opener) | |
4572 |
|
4572 | |||
4573 | # We /could/ populate stdin/stdout with sock.makefile()... |
|
4573 | # We /could/ populate stdin/stdout with sock.makefile()... | |
4574 | else: |
|
4574 | else: |
@@ -592,7 +592,7 b' def performhandshake(ui, url, opener, re' | |||||
592 | return respurl, info |
|
592 | return respurl, info | |
593 |
|
593 | |||
594 |
|
594 | |||
595 | def makepeer(ui, path, opener=None, requestbuilder=urlreq.request): |
|
595 | def _make_peer(ui, path, opener=None, requestbuilder=urlreq.request): | |
596 | """Construct an appropriate HTTP peer instance. |
|
596 | """Construct an appropriate HTTP peer instance. | |
597 |
|
597 | |||
598 | ``opener`` is an ``url.opener`` that should be used to establish |
|
598 | ``opener`` is an ``url.opener`` that should be used to establish | |
@@ -628,7 +628,7 b' def make_peer(ui, path, create, intents=' | |||||
628 | _(b'Python support for SSL and HTTPS is not installed') |
|
628 | _(b'Python support for SSL and HTTPS is not installed') | |
629 | ) |
|
629 | ) | |
630 |
|
630 | |||
631 | inst = makepeer(ui, path) |
|
631 | inst = _make_peer(ui, path) | |
632 |
|
632 | |||
633 | return inst |
|
633 | return inst | |
634 | except error.RepoError as httpexception: |
|
634 | except error.RepoError as httpexception: |
@@ -568,7 +568,7 b' class sshv1peer(wireprotov1peer.wirepeer' | |||||
568 | self._readerr() |
|
568 | self._readerr() | |
569 |
|
569 | |||
570 |
|
570 | |||
571 | def makepeer(ui, path, proc, stdin, stdout, stderr, autoreadstderr=True): |
|
571 | def _make_peer(ui, path, proc, stdin, stdout, stderr, autoreadstderr=True): | |
572 | """Make a peer instance from existing pipes. |
|
572 | """Make a peer instance from existing pipes. | |
573 |
|
573 | |||
574 | ``path`` and ``proc`` are stored on the eventual peer instance and may |
|
574 | ``path`` and ``proc`` are stored on the eventual peer instance and may | |
@@ -658,7 +658,7 b' def make_peer(ui, path, create, intents=' | |||||
658 | ui, sshcmd, args, remotecmd, remotepath, sshenv |
|
658 | ui, sshcmd, args, remotecmd, remotepath, sshenv | |
659 | ) |
|
659 | ) | |
660 |
|
660 | |||
661 | peer = makepeer(ui, path, proc, stdin, stdout, stderr) |
|
661 | peer = _make_peer(ui, path, proc, stdin, stdout, stderr) | |
662 |
|
662 | |||
663 | # Finally, if supported by the server, notify it about our own |
|
663 | # Finally, if supported by the server, notify it about our own | |
664 | # capabilities. |
|
664 | # capabilities. |
General Comments 0
You need to be logged in to leave comments.
Login now