| marmoute |
| hg-reviewers |
so hg clone -q or hg pull -q don't print `abort: no suitable
response from remote hg!` with no indication of what went wrong.
There are other errors still silenced by -q (like failing to push due
to a server hook), but the current change covers a good fraction of
the problem (all errors setting up the ssh connection, no such remote
repository, no access to the repository).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
This should be flagged as (BC) in the changeset summary.
The change itself seems fine.
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/sshpeer.py (17 lines) | |||
| M | tests/test-ssh.t (1 line) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | valentin.gatienbaron | ||
| Closed | valentin.gatienbaron |
| """quote a string for the remote shell ... which we assume is sh""" | """quote a string for the remote shell ... which we assume is sh""" | ||||
| if not s: | if not s: | ||||
| return s | return s | ||||
| if re.match(b'[a-zA-Z0-9@%_+=:,./-]*$', s): | if re.match(b'[a-zA-Z0-9@%_+=:,./-]*$', s): | ||||
| return s | return s | ||||
| return b"'%s'" % s.replace(b"'", b"'\\''") | return b"'%s'" % s.replace(b"'", b"'\\''") | ||||
| def _forwardoutput(ui, pipe): | def _forwardoutput(ui, pipe, warn=False): | ||||
| """display all data currently available on pipe as remote output. | """display all data currently available on pipe as remote output. | ||||
| This is non blocking.""" | This is non blocking.""" | ||||
| if pipe: | if pipe: | ||||
| s = procutil.readpipe(pipe) | s = procutil.readpipe(pipe) | ||||
| if s: | if s: | ||||
| display = ui.warn if warn else ui.status | |||||
| for l in s.splitlines(): | for l in s.splitlines(): | ||||
| ui.status(_(b"remote: "), l, b'\n') | display(_(b"remote: "), l, b'\n') | ||||
| class doublepipe(object): | class doublepipe(object): | ||||
| """Operate a side-channel pipe in addition of a main one | """Operate a side-channel pipe in addition of a main one | ||||
| The side-channel pipe contains server output to be forwarded to the user | The side-channel pipe contains server output to be forwarded to the user | ||||
| input. The double pipe will behave as the "main" pipe, but will ensure the | input. The double pipe will behave as the "main" pipe, but will ensure the | ||||
| content of the "side" pipe is properly processed while we wait for blocking | content of the "side" pipe is properly processed while we wait for blocking | ||||
| for e in util.compengines.supportedwireengines(util.CLIENTROLE) | for e in util.compengines.supportedwireengines(util.CLIENTROLE) | ||||
| ] | ] | ||||
| protoparams.add(b'comp=%s' % b','.join(comps)) | protoparams.add(b'comp=%s' % b','.join(comps)) | ||||
| return protoparams | return protoparams | ||||
| def _performhandshake(ui, stdin, stdout, stderr): | def _performhandshake(ui, stdin, stdout, stderr): | ||||
| def badresponse(): | def badresponse(): | ||||
| # Flush any output on stderr. | # Flush any output on stderr. In general, the stderr contains errors | ||||
| _forwardoutput(ui, stderr) | # from the remote (ssh errors, some hg errors), and status indications | ||||
| # (like "adding changes"), with no current way to tell them apart. | |||||
| # Here we failed so early that it's almost certainly only errors, so | |||||
| # use warn=True so -q doesn't hide them. | |||||
| _forwardoutput(ui, stderr, warn=True) | |||||
| msg = _(b'no suitable response from remote hg') | msg = _(b'no suitable response from remote hg') | ||||
| hint = ui.config(b'ui', b'ssherrorhint') | hint = ui.config(b'ui', b'ssherrorhint') | ||||
| raise error.RepoError(msg, hint=hint) | raise error.RepoError(msg, hint=hint) | ||||
| # The handshake consists of sending wire protocol commands in reverse | # The handshake consists of sending wire protocol commands in reverse | ||||
| # order of protocol implementation and then sniffing for a response | # order of protocol implementation and then sniffing for a response | ||||
| # to one of them. | # to one of them. | ||||
| protoname = wireprototypes.SSHV1 | protoname = wireprototypes.SSHV1 | ||||
| reupgraded = re.compile(b'^upgraded %s (.*)$' % stringutil.reescape(token)) | reupgraded = re.compile(b'^upgraded %s (.*)$' % stringutil.reescape(token)) | ||||
| lines = [b'', b'dummy'] | lines = [b'', b'dummy'] | ||||
| max_noise = 500 | max_noise = 500 | ||||
| while lines[-1] and max_noise: | while lines[-1] and max_noise: | ||||
| try: | try: | ||||
| l = stdout.readline() | l = stdout.readline() | ||||
| _forwardoutput(ui, stderr) | _forwardoutput(ui, stderr, warn=True) | ||||
| # Look for reply to protocol upgrade request. It has a token | # Look for reply to protocol upgrade request. It has a token | ||||
| # in it, so there should be no false positives. | # in it, so there should be no false positives. | ||||
| m = reupgraded.match(l) | m = reupgraded.match(l) | ||||
| if m: | if m: | ||||
| protoname = m.group(1) | protoname = m.group(1) | ||||
| ui.debug(b'protocol upgraded to %s\n' % protoname) | ui.debug(b'protocol upgraded to %s\n' % protoname) | ||||
| # If an upgrade was handled, the ``hello`` and ``between`` | # If an upgrade was handled, the ``hello`` and ``between`` | ||||
| # 1. Remote isn't a Mercurial server | # 1. Remote isn't a Mercurial server | ||||
| # 2. Remote is a <0.9.1 Mercurial server | # 2. Remote is a <0.9.1 Mercurial server | ||||
| # 3. Remote is a future Mercurial server that dropped ``hello`` | # 3. Remote is a future Mercurial server that dropped ``hello`` | ||||
| # and other attempted handshake mechanisms. | # and other attempted handshake mechanisms. | ||||
| if not caps: | if not caps: | ||||
| badresponse() | badresponse() | ||||
| # Flush any output on stderr before proceeding. | # Flush any output on stderr before proceeding. | ||||
| _forwardoutput(ui, stderr) | _forwardoutput(ui, stderr, warn=True) | ||||
| return protoname, caps | return protoname, caps | ||||
| class sshv1peer(wireprotov1peer.wirepeer): | class sshv1peer(wireprotov1peer.wirepeer): | ||||
| def __init__( | def __init__( | ||||
| self, ui, url, proc, stdin, stdout, stderr, caps, autoreadstderr=True | self, ui, url, proc, stdin, stdout, stderr, caps, autoreadstderr=True | ||||
| ): | ): | ||||
| repo not found error | repo not found error | ||||
| $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local | $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local | ||||
| remote: abort: repository nonexistent not found! | remote: abort: repository nonexistent not found! | ||||
| abort: no suitable response from remote hg! | abort: no suitable response from remote hg! | ||||
| [255] | [255] | ||||
| $ hg clone -q -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local | $ hg clone -q -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent local | ||||
| remote: abort: repository nonexistent not found! | |||||
| abort: no suitable response from remote hg! | abort: no suitable response from remote hg! | ||||
| [255] | [255] | ||||
| non-existent absolute path | non-existent absolute path | ||||
| $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/nonexistent local | $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/nonexistent local | ||||
| remote: abort: repository $TESTTMP/nonexistent not found! | remote: abort: repository $TESTTMP/nonexistent not found! | ||||
| abort: no suitable response from remote hg! | abort: no suitable response from remote hg! | ||||