This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10073

sshpeer: don't fail forwarding output from closed connections
ClosedPublic

Authored by valentin.gatienbaron on Feb 25 2021, 10:37 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfa30292b680b: sshpeer: don't fail forwarding output from closed connections
Summary

The test still shows an internal error, but one that happens
further along.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/sshpeer.py (2 lines)
Mtests/test-ssh-batch.t (2 lines)

Diff 26234

mercurial/sshpeer.py

return s return s
return b"'%s'" % s.replace(b"'", b"'\\''") return b"'%s'" % s.replace(b"'", b"'\\''")
def _forwardoutput(ui, pipe, warn=False): 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 and not pipe.closed:
s = procutil.readpipe(pipe) s = procutil.readpipe(pipe)
if s: if s:
display = ui.warn if warn else ui.status display = ui.warn if warn else ui.status
for l in s.splitlines(): for l in s.splitlines():
display(_(b"remote: "), l, b'\n') display(_(b"remote: "), l, b'\n')
class doublepipe(object): class doublepipe(object):

tests/test-ssh-batch.t

$ hg init a $ hg init a
$ cd a $ cd a
$ touch a; hg commit -qAm_ $ touch a; hg commit -qAm_
$ hg bookmark $(for i in $($TESTDIR/seq.py 0 20); do echo b$i; done) $ hg bookmark $(for i in $($TESTDIR/seq.py 0 20); do echo b$i; done)
$ hg clone . ../b -q $ hg clone . ../b -q
$ cd ../b $ cd ../b
Checking that when lookup multiple bookmarks in one go, if one of them Checking that when lookup multiple bookmarks in one go, if one of them
fails (thus causing the sshpeer to be stopped), the errors from the fails (thus causing the sshpeer to be stopped), the errors from the
further lookups don't result in tracebacks. further lookups don't result in tracebacks.
$ hg pull -r b0 -r nosuchbookmark $(for i in $($TESTDIR/seq.py 1 20); do echo -r b$i; done) -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/$(pwd)/../a |& tail -n 1 $ hg pull -r b0 -r nosuchbookmark $(for i in $($TESTDIR/seq.py 1 20); do echo -r b$i; done) -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/$(pwd)/../a |& tail -n 1
ValueError: I/O operation on closed file StopIteration