Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sshpeer: don't fail forwarding output from closed connections
authorValentin Gatien-Baron <vgatien-baron@janestreet.com>
Thu, 25 Feb 2021 10:00:08 -0500
changeset 46671 fa30292b680b
parent 46670 fe36ce0fbcdd
child 46672 aa2e38147e8b
sshpeer: don't fail forwarding output from closed connections The test still shows an internal error, but one that happens further along. Differential Revision: https://phab.mercurial-scm.org/D10073
mercurial/sshpeer.py file | annotate | diff | comparison | revisions
tests/test-ssh-batch.t file | annotate | diff | comparison | revisions 
--- a/mercurial/sshpeer.py	Thu Feb 25 09:59:23 2021 -0500
+++ b/mercurial/sshpeer.py	Thu Feb 25 10:00:08 2021 -0500
@@ -40,7 +40,7 @@
     """display all data currently available on pipe as remote output.
 
     This is non blocking."""
-    if pipe:
+    if pipe and not pipe.closed:
         s = procutil.readpipe(pipe)
         if s:
             display = ui.warn if warn else ui.status
--- a/tests/test-ssh-batch.t	Thu Feb 25 09:59:23 2021 -0500
+++ b/tests/test-ssh-batch.t	Thu Feb 25 10:00:08 2021 -0500
@@ -10,4 +10,4 @@
 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
-  ValueError: I/O operation on closed file
+  StopIteration
Mercurial