mercurial-scm/hg-stable: mercurial/sshpeer.py annotate

annotate mercurial/sshpeer.py @ 52276:7aec18bded6d stable

sshpeer: fix deadlock on short writes This commit makes the `sshpeer.doublepipe` object retry on short write, which fixes a deadlock in hg client-server communication, in particular when client needs to send a large message. Apparently Mercurial relies on `write` method on file objects to never return short writes, without checking, which leads to deadlocks. This work fine when the underlying file object is buffered, since buffered writers never return short writes. (why buffering has anything to do with this I don't know, but ok) It breaks horribly with raw IO, which happens to be used in sshpeer.

author	Arseniy Alekseyev <aalekseyev@janestreet.com>
date	Wed, 05 Feb 2025 16:49:43 +0000
parents	f4733654f144
children	f6b30f4b5e07

rev	line source
17192 1ac628cd7113 peer: introduce real peer classes Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 16688 diff changeset	1 # sshpeer.py - ssh repository proxy class for mercurial
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	2 #
46819 d4ba4d51f85f contributor: change mentions of mpm to olivia Rapha?l Gom?s <rgomes@octobus.net> parents: 46710 diff changeset	3 # Copyright 2005, 2006 Olivia Mackall <olivia@selenic.com>
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8210 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9878 diff changeset	6 # GNU General Public License version 2 or any later version.
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7
51901 f4733654f144 typing: add `from __future__ import annotations` to most files Matt Harbison <matt_harbison@yahoo.com> parents: 51460 diff changeset	8 from __future__ import annotations
25975 de7a3893ee65 sshpeer: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25458 diff changeset	9
15622 86fc364ca5f8 sshrepo: don't quote obviously safe strings (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15581 diff changeset	10 import re
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	11 import uuid
25975 de7a3893ee65 sshpeer: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25458 diff changeset	12
52276 7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	13 from typing import Callable, Optional
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	14
25975 de7a3893ee65 sshpeer: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25458 diff changeset	15 from .i18n import _
de7a3893ee65 sshpeer: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25458 diff changeset	16 from . import (
de7a3893ee65 sshpeer: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25458 diff changeset	17 error,
33112 05906b8e1d23 py3: use pycompat.byteskwargs() to convert kwargs' keys to bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 32062 diff changeset	18 pycompat,
25975 de7a3893ee65 sshpeer: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25458 diff changeset	19 util,
36565 3cd245945ef3 wireprotoserver: move SSHV1 and SSHV2 constants to wireprototypes Gregory Szorc <gregory.szorc@gmail.com> parents: 36562 diff changeset	20 wireprototypes,
37614 a81d02ea65db wireproto: move version 1 peer functionality to standalone module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37498 diff changeset	21 wireprotov1peer,
37785 b4d85bc122bd wireproto: rename wireproto to wireprotov1server (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37717 diff changeset	22 wireprotov1server,
25975 de7a3893ee65 sshpeer: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25458 diff changeset	23 )
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36841 diff changeset	24 from .utils import (
a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36841 diff changeset	25 procutil,
38479 67dc32d4e790 cleanup: migrate from re.escape to stringutil.reescape Augie Fackler <augie@google.com> parents: 37813 diff changeset	26 stringutil,
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	27 urlutil,
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36841 diff changeset	28 )
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	29
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	30
15581 d8fa35c28335 ssh: quote remote paths (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15017 diff changeset	31 def _serverquote(s):
35463 b520c8f98e1e sshpeer: move docstring to top Yuya Nishihara <yuya@tcha.org> parents: 35440 diff changeset	32 """quote a string for the remote shell ... which we assume is sh"""
23671 e3f30068d2eb sshpeer: more thorough shell quoting Matt Mackall <mpm@selenic.com> parents: 22935 diff changeset	33 if not s:
e3f30068d2eb sshpeer: more thorough shell quoting Matt Mackall <mpm@selenic.com> parents: 22935 diff changeset	34 return s
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	35 if re.match(b'[a-zA-Z0-9@%_+=:,./-]*$', s):
15622 86fc364ca5f8 sshrepo: don't quote obviously safe strings (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15581 diff changeset	36 return s
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	37 return b"'%s'" % s.replace(b"'", b"'\\''")
15581 d8fa35c28335 ssh: quote remote paths (issue2983) Mads Kiilerich <mads@kiilerich.com> parents: 15017 diff changeset	38
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	39
44919 5d77f571a563 sshpeer: make client print (likely) server errors on stderr (BC) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 43106 diff changeset	40 def _forwardoutput(ui, pipe, warn=False):
25244 cf90764f40a4 sshpeer: extract the forward output logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 25243 diff changeset	41 """display all data currently available on pipe as remote output.
cf90764f40a4 sshpeer: extract the forward output logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 25243 diff changeset	42
cf90764f40a4 sshpeer: extract the forward output logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 25243 diff changeset	43 This is non blocking."""
46710 fa30292b680b sshpeer: don't fail forwarding output from closed connections Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 46702 diff changeset	44 if pipe and not pipe.closed:
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36841 diff changeset	45 s = procutil.readpipe(pipe)
36841 46f4d71ed505 sshpeer: check pipe validity before forwarding output from it Matt Harbison <matt_harbison@yahoo.com> parents: 36657 diff changeset	46 if s:
44919 5d77f571a563 sshpeer: make client print (likely) server errors on stderr (BC) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 43106 diff changeset	47 display = ui.warn if warn else ui.status
36841 46f4d71ed505 sshpeer: check pipe validity before forwarding output from it Matt Harbison <matt_harbison@yahoo.com> parents: 36657 diff changeset	48 for l in s.splitlines():
44919 5d77f571a563 sshpeer: make client print (likely) server errors on stderr (BC) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 43106 diff changeset	49 display(_(b"remote: "), l, b'\n')
25244 cf90764f40a4 sshpeer: extract the forward output logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 25243 diff changeset	50
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	51
52276 7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	52 def _write_all(
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	53 write_once: Callable[[bytes], Optional[int]],
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	54 data: bytes,
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	55 ) -> Optional[int]:
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	56 """write data with a non blocking function
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	57
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	58 In case not all data were written, keep writing until everything is
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	59 written.
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	60 """
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	61 to_write = len(data)
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	62 written = write_once(data)
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	63 if written is None:
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	64 written = 0
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	65 if written < to_write:
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	66 data = memoryview(data)
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	67 while written < to_write:
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	68 wrote = write_once(data[written:])
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	69 # XXX if number of written bytes is "None", the destination is
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	70 # full. Some `select` call would be better than the current active
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	71 # polling.
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	72 if wrote is not None:
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	73 written += wrote
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	74 return written
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	75
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	76
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 49004 diff changeset	77 class doublepipe:
25421 3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	78 """Operate a side-channel pipe in addition of a main one
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	79
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	80 The side-channel pipe contains server output to be forwarded to the user
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	81 input. The double pipe will behave as the "main" pipe, but will ensure the
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	82 content of the "side" pipe is properly processed while we wait for blocking
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	83 call on the "main" pipe.
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	84
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	85 If large amounts of data are read from "main", the forward will cease after
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	86 the first bytes start to appear. This simplifies the implementation
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	87 without affecting actual output of sshpeer too much as we rarely issue
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	88 large read for data not yet emitted by the server.
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	89
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	90 The main pipe is expected to be a 'bufferedinputpipe' from the util module
31953 cc2382b60007 sshpeer: fix docstring typo Augie Fackler <augie@google.com> parents: 31207 diff changeset	91 that handle all the os specific bits. This class lives in this module
26781 1aee2ab0f902 spelling: trivial spell checking Mads Kiilerich <madski@unity3d.com> parents: 26587 diff changeset	92 because it focus on behavior specific to the ssh protocol."""
25421 3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	93
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	94 def __init__(self, ui, main, side):
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	95 self._ui = ui
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	96 self._main = main
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	97 self._side = side
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	98
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	99 def _wait(self):
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	100 """wait until some data are available on main or side
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	101
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	102 return a pair of boolean (ismainready, issideready)
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	103
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	104 (This will only wait for data if the setup is supported by `util.poll`)
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	105 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	106 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	107 isinstance(self._main, util.bufferedinputpipe)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	108 and self._main.hasbuffer
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	109 ):
36400 066e6a9d52bb sshpeer: make pipe polling code more explicit Gregory Szorc <gregory.szorc@gmail.com> parents: 36398 diff changeset	110 # Main has data. Assume side is worth poking at.
066e6a9d52bb sshpeer: make pipe polling code more explicit Gregory Szorc <gregory.szorc@gmail.com> parents: 36398 diff changeset	111 return True, True
066e6a9d52bb sshpeer: make pipe polling code more explicit Gregory Szorc <gregory.szorc@gmail.com> parents: 36398 diff changeset	112
25421 3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	113 fds = [self._main.fileno(), self._side.fileno()]
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	114 try:
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	115 act = util.poll(fds)
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	116 except NotImplementedError:
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	117 # non supported yet case, assume all have data.
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	118 act = fds
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	119 return (self._main.fileno() in act, self._side.fileno() in act)
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	120
52276 7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	121 def _write_once(self, data: bytes) -> Optional[int]:
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	122 """Write as much data as possible in a non blocking way"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	123 return self._call(b'write', data)
25456 408b7979bf03 sshpeer: allow write operations through double pipe Pierre-Yves David <pierre-yves.david@fb.com> parents: 25455 diff changeset	124
52276 7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	125 def write(self, data: bytes) -> Optional[int]:
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	126 """write all data in a blocking way"""
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	127 return _write_all(self._write_once, data)
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	128
25421 3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	129 def read(self, size):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	130 r = self._call(b'read', size)
32062 ad6c5497cd15 sshpeer: try harder to snag stderr when stdout closes unexpectedly Augie Fackler <augie@google.com> parents: 31953 diff changeset	131 if size != 0 and not r:
ad6c5497cd15 sshpeer: try harder to snag stderr when stdout closes unexpectedly Augie Fackler <augie@google.com> parents: 31953 diff changeset	132 # We've observed a condition that indicates the
ad6c5497cd15 sshpeer: try harder to snag stderr when stdout closes unexpectedly Augie Fackler <augie@google.com> parents: 31953 diff changeset	133 # stdout closed unexpectedly. Check stderr one
ad6c5497cd15 sshpeer: try harder to snag stderr when stdout closes unexpectedly Augie Fackler <augie@google.com> parents: 31953 diff changeset	134 # more time and snag anything that's there before
ad6c5497cd15 sshpeer: try harder to snag stderr when stdout closes unexpectedly Augie Fackler <augie@google.com> parents: 31953 diff changeset	135 # letting anyone know the main part of the pipe
ad6c5497cd15 sshpeer: try harder to snag stderr when stdout closes unexpectedly Augie Fackler <augie@google.com> parents: 31953 diff changeset	136 # closed prematurely.
ad6c5497cd15 sshpeer: try harder to snag stderr when stdout closes unexpectedly Augie Fackler <augie@google.com> parents: 31953 diff changeset	137 _forwardoutput(self._ui, self._side)
ad6c5497cd15 sshpeer: try harder to snag stderr when stdout closes unexpectedly Augie Fackler <augie@google.com> parents: 31953 diff changeset	138 return r
25421 3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	139
38713 27391d74aaa2 ssh: avoid reading beyond the end of stream when using compression Joerg Sonnenberger <joerg@bec.de> parents: 38479 diff changeset	140 def unbufferedread(self, size):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	141 r = self._call(b'unbufferedread', size)
38713 27391d74aaa2 ssh: avoid reading beyond the end of stream when using compression Joerg Sonnenberger <joerg@bec.de> parents: 38479 diff changeset	142 if size != 0 and not r:
27391d74aaa2 ssh: avoid reading beyond the end of stream when using compression Joerg Sonnenberger <joerg@bec.de> parents: 38479 diff changeset	143 # We've observed a condition that indicates the
27391d74aaa2 ssh: avoid reading beyond the end of stream when using compression Joerg Sonnenberger <joerg@bec.de> parents: 38479 diff changeset	144 # stdout closed unexpectedly. Check stderr one
27391d74aaa2 ssh: avoid reading beyond the end of stream when using compression Joerg Sonnenberger <joerg@bec.de> parents: 38479 diff changeset	145 # more time and snag anything that's there before
27391d74aaa2 ssh: avoid reading beyond the end of stream when using compression Joerg Sonnenberger <joerg@bec.de> parents: 38479 diff changeset	146 # letting anyone know the main part of the pipe
27391d74aaa2 ssh: avoid reading beyond the end of stream when using compression Joerg Sonnenberger <joerg@bec.de> parents: 38479 diff changeset	147 # closed prematurely.
27391d74aaa2 ssh: avoid reading beyond the end of stream when using compression Joerg Sonnenberger <joerg@bec.de> parents: 38479 diff changeset	148 _forwardoutput(self._ui, self._side)
27391d74aaa2 ssh: avoid reading beyond the end of stream when using compression Joerg Sonnenberger <joerg@bec.de> parents: 38479 diff changeset	149 return r
27391d74aaa2 ssh: avoid reading beyond the end of stream when using compression Joerg Sonnenberger <joerg@bec.de> parents: 38479 diff changeset	150
25421 3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	151 def readline(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	152 return self._call(b'readline')
25421 3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	153
25455 dc02a284e034 sshpeer: rename 'size' to 'data' in doublepipe Pierre-Yves David <pierre-yves.david@fb.com> parents: 25422 diff changeset	154 def _call(self, methname, data=None):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 44926 diff changeset	155 """call <methname> on "main", forward output of "side" while blocking"""
25455 dc02a284e034 sshpeer: rename 'size' to 'data' in doublepipe Pierre-Yves David <pierre-yves.david@fb.com> parents: 25422 diff changeset	156 # data can be '' or 0
dc02a284e034 sshpeer: rename 'size' to 'data' in doublepipe Pierre-Yves David <pierre-yves.david@fb.com> parents: 25422 diff changeset	157 if (data is not None and not data) or self._main.closed:
25421 3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	158 _forwardoutput(self._ui, self._side)
52276 7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	159 if methname == b'write':
7aec18bded6d sshpeer: fix deadlock on short writes Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51901 diff changeset	160 return 0
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	161 return b''
25421 3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	162 while True:
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	163 mainready, sideready = self._wait()
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	164 if sideready:
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	165 _forwardoutput(self._ui, self._side)
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	166 if mainready:
50943 882687259181 sshpeer: convert command name to sysstr before accessing method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50702 diff changeset	167 meth = getattr(self._main, pycompat.sysstr(methname))
25455 dc02a284e034 sshpeer: rename 'size' to 'data' in doublepipe Pierre-Yves David <pierre-yves.david@fb.com> parents: 25422 diff changeset	168 if data is None:
25421 3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	169 return meth()
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	170 else:
25455 dc02a284e034 sshpeer: rename 'size' to 'data' in doublepipe Pierre-Yves David <pierre-yves.david@fb.com> parents: 25422 diff changeset	171 return meth(data)
25421 3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	172
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	173 def close(self):
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	174 return self._main.close()
3dd3ccf7b807 sshpeer: introduce a "doublepipe" class Pierre-Yves David <pierre-yves.david@fb.com> parents: 25408 diff changeset	175
46699 0738bc25d6ac sshpeer: add a method to check if a doublepipe is closed Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46698 diff changeset	176 @property
0738bc25d6ac sshpeer: add a method to check if a doublepipe is closed Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46698 diff changeset	177 def closed(self):
0738bc25d6ac sshpeer: add a method to check if a doublepipe is closed Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46698 diff changeset	178 return self._main.closed
0738bc25d6ac sshpeer: add a method to check if a doublepipe is closed Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46698 diff changeset	179
25456 408b7979bf03 sshpeer: allow write operations through double pipe Pierre-Yves David <pierre-yves.david@fb.com> parents: 25455 diff changeset	180 def flush(self):
408b7979bf03 sshpeer: allow write operations through double pipe Pierre-Yves David <pierre-yves.david@fb.com> parents: 25455 diff changeset	181 return self._main.flush()
408b7979bf03 sshpeer: allow write operations through double pipe Pierre-Yves David <pierre-yves.david@fb.com> parents: 25455 diff changeset	182
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	183
46701 db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	184 def _cleanuppipes(ui, pipei, pipeo, pipee, warn):
35973 805edf16e8e0 sshpeer: extract pipe cleanup logic to own function Gregory Szorc <gregory.szorc@gmail.com> parents: 35972 diff changeset	185 """Clean up pipes used by an SSH connection."""
46701 db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	186 didsomething = False
db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	187 if pipeo and not pipeo.closed:
db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	188 didsomething = True
35973 805edf16e8e0 sshpeer: extract pipe cleanup logic to own function Gregory Szorc <gregory.szorc@gmail.com> parents: 35972 diff changeset	189 pipeo.close()
46701 db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	190 if pipei and not pipei.closed:
db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	191 didsomething = True
35973 805edf16e8e0 sshpeer: extract pipe cleanup logic to own function Gregory Szorc <gregory.szorc@gmail.com> parents: 35972 diff changeset	192 pipei.close()
805edf16e8e0 sshpeer: extract pipe cleanup logic to own function Gregory Szorc <gregory.szorc@gmail.com> parents: 35972 diff changeset	193
46701 db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	194 if pipee and not pipee.closed:
db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	195 didsomething = True
35973 805edf16e8e0 sshpeer: extract pipe cleanup logic to own function Gregory Szorc <gregory.szorc@gmail.com> parents: 35972 diff changeset	196 # Try to read from the err descriptor until EOF.
805edf16e8e0 sshpeer: extract pipe cleanup logic to own function Gregory Szorc <gregory.szorc@gmail.com> parents: 35972 diff changeset	197 try:
805edf16e8e0 sshpeer: extract pipe cleanup logic to own function Gregory Szorc <gregory.szorc@gmail.com> parents: 35972 diff changeset	198 for l in pipee:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	199 ui.status(_(b'remote: '), l)
35973 805edf16e8e0 sshpeer: extract pipe cleanup logic to own function Gregory Szorc <gregory.szorc@gmail.com> parents: 35972 diff changeset	200 except (IOError, ValueError):
805edf16e8e0 sshpeer: extract pipe cleanup logic to own function Gregory Szorc <gregory.szorc@gmail.com> parents: 35972 diff changeset	201 pass
805edf16e8e0 sshpeer: extract pipe cleanup logic to own function Gregory Szorc <gregory.szorc@gmail.com> parents: 35972 diff changeset	202
805edf16e8e0 sshpeer: extract pipe cleanup logic to own function Gregory Szorc <gregory.szorc@gmail.com> parents: 35972 diff changeset	203 pipee.close()
805edf16e8e0 sshpeer: extract pipe cleanup logic to own function Gregory Szorc <gregory.szorc@gmail.com> parents: 35972 diff changeset	204
46701 db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	205 if didsomething and warn is not None:
db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	206 # Encourage explicit close of sshpeers. Closing via __del__ is
db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	207 # not very predictable when exceptions are thrown, which has led
db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	208 # to deadlocks due to a peer get gc'ed in a fork
db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	209 # We add our own stack trace, because the stacktrace when called
db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	210 # from __del__ is useless.
46702 a4c19a162615 sshpeer: enable+fix warning about sshpeers not being closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46701 diff changeset	211 ui.develwarn(b'missing close on SSH connection created at:\n%s' % warn)
46701 db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	212
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	213
50481 45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	214 def _makeconnection(
45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	215 ui, sshcmd, args, remotecmd, path, sshenv=None, remotehidden=False
45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	216 ):
35975 00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	217 """Create an SSH connection to a server.
00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	218
00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	219 Returns a tuple of (process, stdin, stdout, stderr) for the
00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	220 spawned process.
00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	221 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	222 cmd = b'%s %s %s' % (
35975 00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	223 sshcmd,
00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	224 args,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	225 procutil.shellquote(
50481 45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	226 b'%s -R %s serve --stdio%s'
45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	227 % (
45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	228 _serverquote(remotecmd),
45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	229 _serverquote(path),
45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	230 b' --hidden' if remotehidden else b'',
45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	231 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	232 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	233 )
35975 00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	234
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	235 ui.debug(b'running %s\n' % cmd)
35975 00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	236
00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	237 # no buffer allow the use of 'select'
00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	238 # feel free to remove buffering and select usage when we ultimately
00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	239 # move to threading.
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36841 diff changeset	240 stdin, stdout, stderr, proc = procutil.popen4(cmd, bufsize=0, env=sshenv)
35975 00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	241
00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	242 return proc, stdin, stdout, stderr
00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	243
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	244
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	245 def _clientcapabilities():
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	246 """Return list of capabilities of this client.
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	247
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	248 Returns a list of capabilities that are supported by this client.
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	249 """
50702 b11421f3daf9 clone-bundle: drop the now unused `inlineclonebundles` capabilities Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50675 diff changeset	250 protoparams = {b'partial-pull'}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	251 comps = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	252 e.wireprotosupport().name
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	253 for e in util.compengines.supportedwireengines(util.CLIENTROLE)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	254 ]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	255 protoparams.add(b'comp=%s' % b','.join(comps))
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	256 return protoparams
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	257
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	258
35978 80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	259 def _performhandshake(ui, stdin, stdout, stderr):
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	260 def badresponse():
44919 5d77f571a563 sshpeer: make client print (likely) server errors on stderr (BC) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 43106 diff changeset	261 # Flush any output on stderr. In general, the stderr contains errors
5d77f571a563 sshpeer: make client print (likely) server errors on stderr (BC) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 43106 diff changeset	262 # from the remote (ssh errors, some hg errors), and status indications
5d77f571a563 sshpeer: make client print (likely) server errors on stderr (BC) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 43106 diff changeset	263 # (like "adding changes"), with no current way to tell them apart.
5d77f571a563 sshpeer: make client print (likely) server errors on stderr (BC) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 43106 diff changeset	264 # Here we failed so early that it's almost certainly only errors, so
5d77f571a563 sshpeer: make client print (likely) server errors on stderr (BC) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 43106 diff changeset	265 # use warn=True so -q doesn't hide them.
5d77f571a563 sshpeer: make client print (likely) server errors on stderr (BC) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 43106 diff changeset	266 _forwardoutput(ui, stderr, warn=True)
36401 11ba1a96f946 sshpeer: defer pipe buffering and stderr sidechannel binding Gregory Szorc <gregory.szorc@gmail.com> parents: 36400 diff changeset	267
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	268 msg = _(b'no suitable response from remote hg')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	269 hint = ui.config(b'ui', b'ssherrorhint')
35978 80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	270 raise error.RepoError(msg, hint=hint)
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	271
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	272 # The handshake consists of sending wire protocol commands in reverse
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	273 # order of protocol implementation and then sniffing for a response
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	274 # to one of them.
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	275 #
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	276 # Those commands (from oldest to newest) are:
35979 a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	277 #
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	278 # ``between``
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	279 # Asks for the set of revisions between a pair of revisions. Command
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	280 # present in all Mercurial server implementations.
35979 a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	281 #
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	282 # ``hello``
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	283 # Instructs the server to advertise its capabilities. Introduced in
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	284 # Mercurial 0.9.1.
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	285 #
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	286 # ``upgrade``
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	287 # Requests upgrade from default transport protocol version 1 to
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	288 # a newer version. Introduced in Mercurial 4.6 as an experimental
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	289 # feature.
35979 a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	290 #
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	291 # The ``between`` command is issued with a request for the null
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	292 # range. If the remote is a Mercurial server, this request will
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	293 # generate a specific response: ``1\n\n``. This represents the
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	294 # wire protocol encoded value for ``\n``. We look for ``1\n\n``
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	295 # in the output stream and know this is the response to ``between``
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	296 # and we're at the end of our handshake reply.
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	297 #
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	298 # The response to the ``hello`` command will be a line with the
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	299 # length of the value returned by that command followed by that
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	300 # value. If the server doesn't support ``hello`` (which should be
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	301 # rare), that line will be ``0\n``. Otherwise, the value will contain
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	302 # RFC 822 like lines. Of these, the ``capabilities:`` line contains
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	303 # the capabilities of the server.
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	304 #
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	305 # The ``upgrade`` command isn't really a command in the traditional
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	306 # sense of version 1 of the transport because it isn't using the
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	307 # proper mechanism for formatting insteads: instead, it just encodes
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	308 # arguments on the line, delimited by spaces.
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	309 #
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	310 # The ``upgrade`` line looks like ``upgrade <token> <capabilities>``.
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	311 # If the server doesn't support protocol upgrades, it will reply to
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	312 # this line with ``0\n``. Otherwise, it emits an
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	313 # ``upgraded <token> <protocol>`` line to both stdout and stderr.
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	314 # Content immediately following this line describes additional
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	315 # protocol and server state.
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	316 #
35979 a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	317 # In addition to the responses to our command requests, the server
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	318 # may emit "banner" output on stdout. SSH servers are allowed to
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	319 # print messages to stdout on login. Issuing commands on connection
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	320 # allows us to flush this banner output from the server by scanning
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	321 # for output to our well-known ``between`` command. Of course, if
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	322 # the banner contains ``1\n\n``, this will throw off our detection.
a622a927fe03 sshpeer: document the handshake mechanism Gregory Szorc <gregory.szorc@gmail.com> parents: 35978 diff changeset	323
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	324 requestlog = ui.configbool(b'devel', b'debug.peer-request')
35978 80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	325
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	326 # Generate a random token to help identify responses to version 2
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	327 # upgrade request.
36081 223ed0b53f08 py3: more robustly cast UUID to bytes Gregory Szorc <gregory.szorc@gmail.com> parents: 36017 diff changeset	328 token = pycompat.sysbytes(str(uuid.uuid4()))
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	329
35978 80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	330 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	331 pairsarg = b'%s-%s' % (b'0' * 40, b'0' * 40)
35978 80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	332 handshake = [
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	333 b'hello\n',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	334 b'between\n',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	335 b'pairs %d\n' % len(pairsarg),
35978 80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	336 pairsarg,
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	337 ]
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	338
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	339 if requestlog:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	340 ui.debug(b'devel-peer-request: hello+between\n')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	341 ui.debug(b'devel-peer-request: pairs: %d bytes\n' % len(pairsarg))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	342 ui.debug(b'sending hello command\n')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	343 ui.debug(b'sending between command\n')
35978 80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	344
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	345 stdin.write(b''.join(handshake))
35978 80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	346 stdin.flush()
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	347 except IOError:
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	348 badresponse()
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	349
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	350 # Assume version 1 of wire protocol by default.
36565 3cd245945ef3 wireprotoserver: move SSHV1 and SSHV2 constants to wireprototypes Gregory Szorc <gregory.szorc@gmail.com> parents: 36562 diff changeset	351 protoname = wireprototypes.SSHV1
38479 67dc32d4e790 cleanup: migrate from re.escape to stringutil.reescape Augie Fackler <augie@google.com> parents: 37813 diff changeset	352 reupgraded = re.compile(b'^upgraded %s (.*)$' % stringutil.reescape(token))
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	353
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	354 lines = [b'', b'dummy']
35978 80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	355 max_noise = 500
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	356 while lines[-1] and max_noise:
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	357 try:
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	358 l = stdout.readline()
44919 5d77f571a563 sshpeer: make client print (likely) server errors on stderr (BC) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 43106 diff changeset	359 _forwardoutput(ui, stderr, warn=True)
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	360
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	361 # Look for reply to protocol upgrade request. It has a token
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	362 # in it, so there should be no false positives.
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	363 m = reupgraded.match(l)
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	364 if m:
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	365 protoname = m.group(1)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	366 ui.debug(b'protocol upgraded to %s\n' % protoname)
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	367 # If an upgrade was handled, the ``hello`` and ``between``
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	368 # requests are ignored. The next output belongs to the
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	369 # protocol, so stop scanning lines.
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	370 break
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	371
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	372 # Otherwise it could be a banner, ``0\n`` response if server
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	373 # doesn't support upgrade.
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	374
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	375 if lines[-1] == b'1\n' and l == b'\n':
35978 80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	376 break
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	377 if l:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	378 ui.debug(b'remote: ', l)
35978 80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	379 lines.append(l)
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	380 max_noise -= 1
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	381 except IOError:
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	382 badresponse()
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	383 else:
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	384 badresponse()
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	385
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	386 caps = set()
80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	387
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	388 # For version 1, we should see a ``capabilities`` line in response to the
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	389 # ``hello`` command.
36565 3cd245945ef3 wireprotoserver: move SSHV1 and SSHV2 constants to wireprototypes Gregory Szorc <gregory.szorc@gmail.com> parents: 36562 diff changeset	390 if protoname == wireprototypes.SSHV1:
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	391 for l in reversed(lines):
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	392 # Look for response to ``hello`` command. Scan from the back so
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	393 # we don't misinterpret banner output as the command reply.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	394 if l.startswith(b'capabilities:'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	395 caps.update(l[:-1].split(b':')[1].split())
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	396 break
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	397
48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	398 # Error if we couldn't find capabilities, this means:
35980 556218e08e25 sshpeer: remove support for connecting to <0.9.1 servers (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 35979 diff changeset	399 #
556218e08e25 sshpeer: remove support for connecting to <0.9.1 servers (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 35979 diff changeset	400 # 1. Remote isn't a Mercurial server
556218e08e25 sshpeer: remove support for connecting to <0.9.1 servers (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 35979 diff changeset	401 # 2. Remote is a <0.9.1 Mercurial server
556218e08e25 sshpeer: remove support for connecting to <0.9.1 servers (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 35979 diff changeset	402 # 3. Remote is a future Mercurial server that dropped ``hello``
36015 48a3a9283f09 sshpeer: initial definition and implementation of new SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35980 diff changeset	403 # and other attempted handshake mechanisms.
35980 556218e08e25 sshpeer: remove support for connecting to <0.9.1 servers (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 35979 diff changeset	404 if not caps:
556218e08e25 sshpeer: remove support for connecting to <0.9.1 servers (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 35979 diff changeset	405 badresponse()
556218e08e25 sshpeer: remove support for connecting to <0.9.1 servers (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 35979 diff changeset	406
36401 11ba1a96f946 sshpeer: defer pipe buffering and stderr sidechannel binding Gregory Szorc <gregory.szorc@gmail.com> parents: 36400 diff changeset	407 # Flush any output on stderr before proceeding.
44919 5d77f571a563 sshpeer: make client print (likely) server errors on stderr (BC) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 43106 diff changeset	408 _forwardoutput(ui, stderr, warn=True)
36401 11ba1a96f946 sshpeer: defer pipe buffering and stderr sidechannel binding Gregory Szorc <gregory.szorc@gmail.com> parents: 36400 diff changeset	409
36017 59e4a7781a36 sshpeer: implement peer for version 2 of wire protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 36016 diff changeset	410 return protoname, caps
35978 80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	411
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	412
37614 a81d02ea65db wireproto: move version 1 peer functionality to standalone module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37498 diff changeset	413 class sshv1peer(wireprotov1peer.wirepeer):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	414 def __init__(
50474 3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	415 self,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	416 ui,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	417 path,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	418 proc,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	419 stdin,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	420 stdout,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	421 stderr,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	422 caps,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	423 autoreadstderr=True,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	424 remotehidden=False,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	425 ):
35976 f8f034344b39 sshpeer: clean up API for sshpeer.__init__ (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35975 diff changeset	426 """Create a peer from an existing SSH connection.
f8f034344b39 sshpeer: clean up API for sshpeer.__init__ (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35975 diff changeset	427
f8f034344b39 sshpeer: clean up API for sshpeer.__init__ (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35975 diff changeset	428 ``proc`` is a handle on the underlying SSH process.
f8f034344b39 sshpeer: clean up API for sshpeer.__init__ (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35975 diff changeset	429 ``stdin``, ``stdout``, and ``stderr`` are handles on the stdio
f8f034344b39 sshpeer: clean up API for sshpeer.__init__ (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35975 diff changeset	430 pipes for that process.
35978 80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	431 ``caps`` is a set of capabilities supported by the remote.
36562 1a36ef7df70a sshpeer: support not reading and forwarding stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 36517 diff changeset	432 ``autoreadstderr`` denotes whether to automatically read from
1a36ef7df70a sshpeer: support not reading and forwarding stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 36517 diff changeset	433 stderr and to forward its output.
35976 f8f034344b39 sshpeer: clean up API for sshpeer.__init__ (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35975 diff changeset	434 """
50474 3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	435 super().__init__(ui, path=path, remotehidden=remotehidden)
35975 00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	436 # self._subprocess is unused. Keeping a handle on the process
00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	437 # holds a reference and prevents it from being garbage collected.
35976 f8f034344b39 sshpeer: clean up API for sshpeer.__init__ (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35975 diff changeset	438 self._subprocess = proc
36401 11ba1a96f946 sshpeer: defer pipe buffering and stderr sidechannel binding Gregory Szorc <gregory.szorc@gmail.com> parents: 36400 diff changeset	439
11ba1a96f946 sshpeer: defer pipe buffering and stderr sidechannel binding Gregory Szorc <gregory.szorc@gmail.com> parents: 36400 diff changeset	440 # And we hook up our "doublepipe" wrapper to allow querying
11ba1a96f946 sshpeer: defer pipe buffering and stderr sidechannel binding Gregory Szorc <gregory.szorc@gmail.com> parents: 36400 diff changeset	441 # stderr any time we perform I/O.
36562 1a36ef7df70a sshpeer: support not reading and forwarding stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 36517 diff changeset	442 if autoreadstderr:
1a36ef7df70a sshpeer: support not reading and forwarding stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 36517 diff changeset	443 stdout = doublepipe(ui, util.bufferedinputpipe(stdout), stderr)
1a36ef7df70a sshpeer: support not reading and forwarding stderr Gregory Szorc <gregory.szorc@gmail.com> parents: 36517 diff changeset	444 stdin = doublepipe(ui, stdin, stderr)
36401 11ba1a96f946 sshpeer: defer pipe buffering and stderr sidechannel binding Gregory Szorc <gregory.szorc@gmail.com> parents: 36400 diff changeset	445
35976 f8f034344b39 sshpeer: clean up API for sshpeer.__init__ (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35975 diff changeset	446 self._pipeo = stdin
f8f034344b39 sshpeer: clean up API for sshpeer.__init__ (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35975 diff changeset	447 self._pipei = stdout
f8f034344b39 sshpeer: clean up API for sshpeer.__init__ (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 35975 diff changeset	448 self._pipee = stderr
35978 80a2b8ae42a1 sshpeer: move handshake outside of sshpeer Gregory Szorc <gregory.szorc@gmail.com> parents: 35977 diff changeset	449 self._caps = caps
36637 1151c731686e sshpeer: don't read from stderr when that behavior is disabled Gregory Szorc <gregory.szorc@gmail.com> parents: 36565 diff changeset	450 self._autoreadstderr = autoreadstderr
46701 db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	451 self._initstack = b''.join(util.getstackframes(1))
50481 45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	452 self._remotehidden = remotehidden
2549 e1831f06eef1 Added ability to clone from a local repository to a (new) remote one. Sean Meiners <sean.meiners@linspire.com> parents: 2484 diff changeset	453
36398 043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	454 # Commands that have a "framed" response where the first line of the
043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	455 # response contains the length of that response.
043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	456 _FRAMED_COMMANDS = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	457 b'batch',
36398 043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	458 }
043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	459
37320 39f7d4ee8bcd repository: port peer interfaces to zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37123 diff changeset	460 # Begin of ipeerconnection interface.
33825 1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	461
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	462 def url(self):
49873 73ed1d13c0bf peer: get the `path` object down to the sshpeer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49869 diff changeset	463 return self.path.loc
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	464
33825 1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	465 def local(self):
1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	466 return None
1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	467
1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	468 def canpush(self):
1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	469 return True
1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	470
1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	471 def close(self):
46698 8c4906105f37 sshpeer: make sshpeer.close() close the underlying connection Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 45957 diff changeset	472 self._cleanup()
33825 1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	473
37320 39f7d4ee8bcd repository: port peer interfaces to zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37123 diff changeset	474 # End of ipeerconnection interface.
33825 1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	475
37320 39f7d4ee8bcd repository: port peer interfaces to zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37123 diff changeset	476 # Begin of ipeercommands interface.
33825 1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	477
1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	478 def capabilities(self):
1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	479 return self._caps
1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	480
37320 39f7d4ee8bcd repository: port peer interfaces to zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37123 diff changeset	481 # End of ipeercommands interface.
33825 1f8460b55986 sshpeer: use peer interface Gregory Szorc <gregory.szorc@gmail.com> parents: 33789 diff changeset	482
33789 82d564d5ac4f sshpeer: make instance attributes and methods internal Gregory Szorc <gregory.szorc@gmail.com> parents: 33763 diff changeset	483 def _readerr(self):
82d564d5ac4f sshpeer: make instance attributes and methods internal Gregory Szorc <gregory.szorc@gmail.com> parents: 33763 diff changeset	484 _forwardoutput(self.ui, self._pipee)
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	485
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11369 diff changeset	486 def _abort(self, exception):
33789 82d564d5ac4f sshpeer: make instance attributes and methods internal Gregory Szorc <gregory.szorc@gmail.com> parents: 33763 diff changeset	487 self._cleanup()
11586 ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11369 diff changeset	488 raise exception
ddaaaa23bb8f protocol: move basic ssh client commands to wirerepository Matt Mackall <mpm@selenic.com> parents: 11369 diff changeset	489
46701 db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	490 def _cleanup(self, warn=None):
db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	491 _cleanuppipes(self.ui, self._pipei, self._pipeo, self._pipee, warn=warn)
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	492
46701 db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	493 def __del__(self):
db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	494 self._cleanup(warn=self._initstack)
3034 2b0bc36a48d8 sshrepo: flush stderr before connecting to the hg server Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2859 diff changeset	495
36398 043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	496 def _sendrequest(self, cmd, args, framed=False):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	497 if self.ui.debugflag and self.ui.configbool(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	498 b'devel', b'debug.peer-request'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	499 ):
35699 f7ef49e44d7c sshpeer: add support for request tracing Boris Feld <boris.feld@octobus.net> parents: 35463 diff changeset	500 dbg = self.ui.debug
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	501 line = b'devel-peer-request: %s\n'
35699 f7ef49e44d7c sshpeer: add support for request tracing Boris Feld <boris.feld@octobus.net> parents: 35463 diff changeset	502 dbg(line % cmd)
f7ef49e44d7c sshpeer: add support for request tracing Boris Feld <boris.feld@octobus.net> parents: 35463 diff changeset	503 for key, value in sorted(args.items()):
f7ef49e44d7c sshpeer: add support for request tracing Boris Feld <boris.feld@octobus.net> parents: 35463 diff changeset	504 if not isinstance(value, dict):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	505 dbg(line % b' %s: %d bytes' % (key, len(value)))
35699 f7ef49e44d7c sshpeer: add support for request tracing Boris Feld <boris.feld@octobus.net> parents: 35463 diff changeset	506 else:
f7ef49e44d7c sshpeer: add support for request tracing Boris Feld <boris.feld@octobus.net> parents: 35463 diff changeset	507 for dk, dv in sorted(value.items()):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	508 dbg(line % b' %s-%s: %d' % (key, dk, len(dv)))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	509 self.ui.debug(b"sending %s command\n" % cmd)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	510 self._pipeo.write(b"%s\n" % cmd)
37785 b4d85bc122bd wireproto: rename wireproto to wireprotov1server (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37717 diff changeset	511 _func, names = wireprotov1server.commands[cmd]
13721 3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	512 keys = names.split()
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	513 wireargs = {}
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	514 for k in keys:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	515 if k == b'*':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	516 wireargs[b'*'] = args
13721 3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	517 break
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	518 else:
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	519 wireargs[k] = args[k]
3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	520 del args[k]
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	521 for k, v in sorted(wireargs.items()):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	522 self._pipeo.write(b"%s %d\n" % (k, len(v)))
13721 3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	523 if isinstance(v, dict):
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	524 for dk, dv in v.items():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	525 self._pipeo.write(b"%s %d\n" % (dk, len(dv)))
33789 82d564d5ac4f sshpeer: make instance attributes and methods internal Gregory Szorc <gregory.szorc@gmail.com> parents: 33763 diff changeset	526 self._pipeo.write(dv)
13721 3458c15ab2f0 wireproto: fix handling of '' args for HTTP and SSH Peter Arrenbrecht <peter.arrenbrecht@gmail.com>* parents: 13464 diff changeset	527 else:
33789 82d564d5ac4f sshpeer: make instance attributes and methods internal Gregory Szorc <gregory.szorc@gmail.com> parents: 33763 diff changeset	528 self._pipeo.write(v)
82d564d5ac4f sshpeer: make instance attributes and methods internal Gregory Szorc <gregory.szorc@gmail.com> parents: 33763 diff changeset	529 self._pipeo.flush()
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	530
36398 043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	531 # We know exactly how many bytes are in the response. So return a proxy
043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	532 # around the raw output stream that allows reading exactly this many
043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	533 # bytes. Callers then can read() without fear of overrunning the
043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	534 # response.
043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	535 if framed:
043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	536 amount = self._getamount()
043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	537 return util.cappedreader(self._pipei, amount)
043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	538
33789 82d564d5ac4f sshpeer: make instance attributes and methods internal Gregory Szorc <gregory.szorc@gmail.com> parents: 33763 diff changeset	539 return self._pipei
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 623 diff changeset	540
36397 a34d5ef53c2e sshpeer: move logic for sending a request into a new function Gregory Szorc <gregory.szorc@gmail.com> parents: 36396 diff changeset	541 def _callstream(self, cmd, **args):
a34d5ef53c2e sshpeer: move logic for sending a request into a new function Gregory Szorc <gregory.szorc@gmail.com> parents: 36396 diff changeset	542 args = pycompat.byteskwargs(args)
36398 043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	543 return self._sendrequest(cmd, args, framed=cmd in self._FRAMED_COMMANDS)
36397 a34d5ef53c2e sshpeer: move logic for sending a request into a new function Gregory Szorc <gregory.szorc@gmail.com> parents: 36396 diff changeset	544
20905 167047ba3cfa wireproto: drop the _decompress method in favor a new call type Pierre-Yves David <pierre-yves.david@fb.com> parents: 20794 diff changeset	545 def _callcompressable(self, cmd, **args):
36397 a34d5ef53c2e sshpeer: move logic for sending a request into a new function Gregory Szorc <gregory.szorc@gmail.com> parents: 36396 diff changeset	546 args = pycompat.byteskwargs(args)
36398 043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	547 return self._sendrequest(cmd, args, framed=cmd in self._FRAMED_COMMANDS)
20905 167047ba3cfa wireproto: drop the _decompress method in favor a new call type Pierre-Yves David <pierre-yves.david@fb.com> parents: 20794 diff changeset	548
11589 e8d22fe2ddab protocol: clean up call-like functions in http and ssh clients Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	549 def _call(self, cmd, **args):
36397 a34d5ef53c2e sshpeer: move logic for sending a request into a new function Gregory Szorc <gregory.szorc@gmail.com> parents: 36396 diff changeset	550 args = pycompat.byteskwargs(args)
36398 043e77f3be09 sshpeer: return framed file object when needed Gregory Szorc <gregory.szorc@gmail.com> parents: 36397 diff changeset	551 return self._sendrequest(cmd, args, framed=True).read()
5978 7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	552
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	553 def _callpush(self, cmd, fp, **args):
36403 b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	554 # The server responds with an empty frame if the client should
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	555 # continue submitting the payload.
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	556 r = self._call(cmd, **args)
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	557 if r:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	558 return b'', r
36403 b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	559
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	560 # The payload consists of frames with content followed by an empty
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	561 # frame.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	562 for d in iter(lambda: fp.read(4096), b''):
36396 7f8f74531b0b sshpeer: rename _recv and _send to _readframed and _writeframed Gregory Szorc <gregory.szorc@gmail.com> parents: 36254 diff changeset	563 self._writeframed(d)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	564 self._writeframed(b"", flush=True)
36403 b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	565
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	566 # In case of success, there is an empty frame and a frame containing
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	567 # the integer result (as a string).
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	568 # In case of error, there is a non-empty frame containing the error.
36396 7f8f74531b0b sshpeer: rename _recv and _send to _readframed and _writeframed Gregory Szorc <gregory.szorc@gmail.com> parents: 36254 diff changeset	569 r = self._readframed()
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	570 if r:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	571 return b'', r
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	572 return self._readframed(), b''
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	573
21073 83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	574 def _calltwowaystream(self, cmd, fp, **args):
36403 b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	575 # The server responds with an empty frame if the client should
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	576 # continue submitting the payload.
21073 83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	577 r = self._call(cmd, **args)
83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	578 if r:
83ce71ef7804 sshpeer: add implementation of _calltwowaystream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20905 diff changeset	579 # XXX needs to be made better
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	580 raise error.Abort(_(b'unexpected remote reply: %s') % r)
36403 b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	581
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	582 # The payload consists of frames with content followed by an empty
b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	583 # frame.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	584 for d in iter(lambda: fp.read(4096), b''):
36396 7f8f74531b0b sshpeer: rename _recv and _send to _readframed and _writeframed Gregory Szorc <gregory.szorc@gmail.com> parents: 36254 diff changeset	585 self._writeframed(d)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	586 self._writeframed(b"", flush=True)
36403 b8d0761a85c7 wireproto: document the wonky push protocol for SSH Gregory Szorc <gregory.szorc@gmail.com> parents: 36401 diff changeset	587
33789 82d564d5ac4f sshpeer: make instance attributes and methods internal Gregory Szorc <gregory.szorc@gmail.com> parents: 33763 diff changeset	588 return self._pipei
11591 0d9cb3f3b0a1 protocol: unify client changegroup methods Matt Mackall <mpm@selenic.com> parents: 11590 diff changeset	589
28438 48fd02dac1d4 wireproto: make iterbatcher behave streamily over http(s) Augie Fackler <augie@google.com> parents: 27798 diff changeset	590 def _getamount(self):
33789 82d564d5ac4f sshpeer: make instance attributes and methods internal Gregory Szorc <gregory.szorc@gmail.com> parents: 33763 diff changeset	591 l = self._pipei.readline()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	592 if l == b'\n':
36637 1151c731686e sshpeer: don't read from stderr when that behavior is disabled Gregory Szorc <gregory.szorc@gmail.com> parents: 36565 diff changeset	593 if self._autoreadstderr:
1151c731686e sshpeer: don't read from stderr when that behavior is disabled Gregory Szorc <gregory.szorc@gmail.com> parents: 36565 diff changeset	594 self._readerr()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	595 msg = _(b'check previous remote output')
25243 d65243d28749 sshpeer: break "OutOfBandError" feature for ssh (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23684 diff changeset	596 self._abort(error.OutOfBandError(hint=msg))
36637 1151c731686e sshpeer: don't read from stderr when that behavior is disabled Gregory Szorc <gregory.szorc@gmail.com> parents: 36565 diff changeset	597 if self._autoreadstderr:
1151c731686e sshpeer: don't read from stderr when that behavior is disabled Gregory Szorc <gregory.szorc@gmail.com> parents: 36565 diff changeset	598 self._readerr()
646 342927da4f4c Show remote client output with "remote:" Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	599 try:
28438 48fd02dac1d4 wireproto: make iterbatcher behave streamily over http(s) Augie Fackler <augie@google.com> parents: 27798 diff changeset	600 return int(l)
14004 97ed99d1f419 eliminate various naked except clauses Idan Kamara <idankk86@gmail.com> parents: 13827 diff changeset	601 except ValueError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	602 self._abort(error.ResponseError(_(b"unexpected response:"), l))
28438 48fd02dac1d4 wireproto: make iterbatcher behave streamily over http(s) Augie Fackler <augie@google.com> parents: 27798 diff changeset	603
36396 7f8f74531b0b sshpeer: rename _recv and _send to _readframed and _writeframed Gregory Szorc <gregory.szorc@gmail.com> parents: 36254 diff changeset	604 def _readframed(self):
36657 70415568ea65 sshpeer: don't read(0) Gregory Szorc <gregory.szorc@gmail.com> parents: 36637 diff changeset	605 size = self._getamount()
70415568ea65 sshpeer: don't read(0) Gregory Szorc <gregory.szorc@gmail.com> parents: 36637 diff changeset	606 if not size:
70415568ea65 sshpeer: don't read(0) Gregory Szorc <gregory.szorc@gmail.com> parents: 36637 diff changeset	607 return b''
70415568ea65 sshpeer: don't read(0) Gregory Szorc <gregory.szorc@gmail.com> parents: 36637 diff changeset	608
70415568ea65 sshpeer: don't read(0) Gregory Szorc <gregory.szorc@gmail.com> parents: 36637 diff changeset	609 return self._pipei.read(size)
5978 7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	610
36396 7f8f74531b0b sshpeer: rename _recv and _send to _readframed and _writeframed Gregory Szorc <gregory.szorc@gmail.com> parents: 36254 diff changeset	611 def _writeframed(self, data, flush=False):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	612 self._pipeo.write(b"%d\n" % len(data))
5978 7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	613 if data:
33789 82d564d5ac4f sshpeer: make instance attributes and methods internal Gregory Szorc <gregory.szorc@gmail.com> parents: 33763 diff changeset	614 self._pipeo.write(data)
5978 7939c71f3132 sshrepo: be more careful while reading data Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5293 diff changeset	615 if flush:
33789 82d564d5ac4f sshpeer: make instance attributes and methods internal Gregory Szorc <gregory.szorc@gmail.com> parents: 33763 diff changeset	616 self._pipeo.flush()
36637 1151c731686e sshpeer: don't read from stderr when that behavior is disabled Gregory Szorc <gregory.szorc@gmail.com> parents: 36565 diff changeset	617 if self._autoreadstderr:
1151c731686e sshpeer: don't read from stderr when that behavior is disabled Gregory Szorc <gregory.szorc@gmail.com> parents: 36565 diff changeset	618 self._readerr()
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2549 diff changeset	619
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	620
50474 3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	621 def _make_peer(
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	622 ui,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	623 path,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	624 proc,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	625 stdin,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	626 stdout,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	627 stderr,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	628 autoreadstderr=True,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	629 remotehidden=False,
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	630 ):
36517 dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	631 """Make a peer instance from existing pipes.
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	632
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	633 ``path`` and ``proc`` are stored on the eventual peer instance and may
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	634 not be used for anything meaningful.
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	635
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	636 ``stdin``, ``stdout``, and ``stderr`` are the pipes connected to the
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	637 SSH server's stdio handles.
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	638
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	639 This function is factored out to allow creating peers that don't
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	640 actually spawn a new process. It is useful for starting SSH protocol
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	641 servers and clients via non-standard means, which can be useful for
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	642 testing.
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	643 """
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	644 try:
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	645 protoname, caps = _performhandshake(ui, stdin, stdout, stderr)
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	646 except Exception:
46701 db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	647 _cleanuppipes(ui, stdout, stdin, stderr, warn=None)
36517 dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	648 raise
dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	649
36565 3cd245945ef3 wireprotoserver: move SSHV1 and SSHV2 constants to wireprototypes Gregory Szorc <gregory.szorc@gmail.com> parents: 36562 diff changeset	650 if protoname == wireprototypes.SSHV1:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	651 return sshv1peer(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	652 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	653 path,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	654 proc,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	655 stdin,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	656 stdout,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	657 stderr,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	658 caps,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	659 autoreadstderr=autoreadstderr,
50474 3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	660 remotehidden=remotehidden,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	661 )
36517 dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	662 else:
46701 db8037e38085 sshpeer: add a develwarning if an sshpeer is not closed explicitly Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 46699 diff changeset	663 _cleanuppipes(ui, stdout, stdin, stderr, warn=None)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	664 raise error.RepoError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	665 _(b'unknown version of SSH protocol: %s') % protoname
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	666 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	667
36517 dabf86721200 sshpeer: factor out code for creating peers from pipes Gregory Szorc <gregory.szorc@gmail.com> parents: 36403 diff changeset	668
50474 3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	669 def make_peer(
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	670 ui, path, create, intents=None, createopts=None, remotehidden=False
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	671 ):
35971 b202d360d2a4 sshpeer: move URL validation out of sshpeer.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 35968 diff changeset	672 """Create an SSH peer.
b202d360d2a4 sshpeer: move URL validation out of sshpeer.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 35968 diff changeset	673
37614 a81d02ea65db wireproto: move version 1 peer functionality to standalone module (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37498 diff changeset	674 The returned object conforms to the ``wireprotov1peer.wirepeer`` interface.
35971 b202d360d2a4 sshpeer: move URL validation out of sshpeer.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 35968 diff changeset	675 """
49873 73ed1d13c0bf peer: get the `path` object down to the sshpeer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49869 diff changeset	676 u = urlutil.url(path.loc, parsequery=False, parsefragment=False)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	677 if u.scheme != b'ssh' or not u.host or u.path is None:
51460 a2f1d97e5284 sshpeer: fix path when handling invalid url exception Felipe Resende <felipe@fcresende.dev.br> parents: 50952 diff changeset	678 raise error.RepoError(_(b"couldn't parse location %s") % path.loc)
35971 b202d360d2a4 sshpeer: move URL validation out of sshpeer.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 35968 diff changeset	679
49873 73ed1d13c0bf peer: get the `path` object down to the sshpeer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49869 diff changeset	680 urlutil.checksafessh(path.loc)
35971 b202d360d2a4 sshpeer: move URL validation out of sshpeer.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 35968 diff changeset	681
b202d360d2a4 sshpeer: move URL validation out of sshpeer.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 35968 diff changeset	682 if u.passwd is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	683 raise error.RepoError(_(b'password in URL not supported'))
35971 b202d360d2a4 sshpeer: move URL validation out of sshpeer.__init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 35968 diff changeset	684
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	685 sshcmd = ui.config(b'ui', b'ssh')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	686 remotecmd = ui.config(b'ui', b'remotecmd')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	687 sshaddenv = dict(ui.configitems(b'sshenv'))
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36841 diff changeset	688 sshenv = procutil.shellenviron(sshaddenv)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	689 remotepath = u.path or b'.'
35972 31449baf0936 sshpeer: move ssh command and repo creation logic out of __init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 35971 diff changeset	690
37123 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36841 diff changeset	691 args = procutil.sshargs(sshcmd, u.host, u.user, u.port)
35972 31449baf0936 sshpeer: move ssh command and repo creation logic out of __init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 35971 diff changeset	692
31449baf0936 sshpeer: move ssh command and repo creation logic out of __init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 35971 diff changeset	693 if create:
39565 089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 38713 diff changeset	694 # We /could/ do this, but only if the remote init command knows how to
089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 38713 diff changeset	695 # handle them. We don't yet make any assumptions about that. And without
089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 38713 diff changeset	696 # querying the remote, there's no way of knowing if the remote even
089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 38713 diff changeset	697 # supports said requested feature.
089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 38713 diff changeset	698 if createopts:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	699 raise error.RepoError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	700 _(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	701 b'cannot create remote SSH repositories '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	702 b'with extra options'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	703 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	704 )
39565 089fc0db0954 hg: allow extra arguments to be passed to repo creation (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 38713 diff changeset	705
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	706 cmd = b'%s %s %s' % (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	707 sshcmd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	708 args,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	709 procutil.shellquote(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	710 b'%s init %s'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	711 % (_serverquote(remotecmd), _serverquote(remotepath))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	712 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	713 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	714 ui.debug(b'running %s\n' % cmd)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	715 res = ui.system(cmd, blockedtag=b'sshpeer', environ=sshenv)
35972 31449baf0936 sshpeer: move ssh command and repo creation logic out of __init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 35971 diff changeset	716 if res != 0:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	717 raise error.RepoError(_(b'could not create remote repo'))
35972 31449baf0936 sshpeer: move ssh command and repo creation logic out of __init__ Gregory Szorc <gregory.szorc@gmail.com> parents: 35971 diff changeset	718
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	719 proc, stdin, stdout, stderr = _makeconnection(
50481 45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	720 ui,
45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	721 sshcmd,
45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	722 args,
45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	723 remotecmd,
45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	724 remotepath,
45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	725 sshenv,
45c7bada5200 hidden: add support to explicitly access hidden changesets with SSH peers Manuel Jacob <me@manueljacob.de> parents: 50474 diff changeset	726 remotehidden=remotehidden,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	727 )
35975 00b9e26d727b sshpeer: establish SSH connection before class instantiation Gregory Szorc <gregory.szorc@gmail.com> parents: 35974 diff changeset	728
50474 3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	729 peer = _make_peer(
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	730 ui, path, proc, stdin, stdout, stderr, remotehidden=remotehidden
3a2df812e1c7 pull: add --remote-hidden option and pass it through peer creation Manuel Jacob <me@manueljacob.de> parents: 50458 diff changeset	731 )
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	732
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	733 # Finally, if supported by the server, notify it about our own
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	734 # capabilities.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	735 if b'protocaps' in peer.capabilities():
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	736 try:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	737 peer._call(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	738 b"protocaps", caps=b' '.join(sorted(_clientcapabilities()))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 39565 diff changeset	739 )
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	740 except IOError:
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	741 peer._cleanup()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	742 raise error.RepoError(_(b'capability exchange failed'))
37393 afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	743
afcfdf53e4b5 wireproto: provide accessors for client capabilities Joerg Sonnenberger <joerg@bec.de> parents: 37321 diff changeset	744 return peer

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/sshpeer.py @ 52276:7aec18bded6d stable