| pulkit |
| hg-reviewers |
Specifically, when the peer is closed in the middle of a batch of rpcs.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/scmutil.py (4 lines) | |||
| M | mercurial/wireprotov1peer.py (31 lines) | |||
| M | tests/test-ssh-batch.t (6 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | valentin.gatienbaron | ||
| Closed | valentin.gatienbaron | ||
| Closed | valentin.gatienbaron |
| ui.error(_(b"abort: %s\n") % inst) | ui.error(_(b"abort: %s\n") % inst) | ||||
| if inst.hint: | if inst.hint: | ||||
| ui.error(_(b"(%s)\n") % inst.hint) | ui.error(_(b"(%s)\n") % inst.hint) | ||||
| except error.ResponseError as inst: | except error.ResponseError as inst: | ||||
| ui.error(_(b"abort: %s") % inst.args[0]) | ui.error(_(b"abort: %s") % inst.args[0]) | ||||
| msg = inst.args[1] | msg = inst.args[1] | ||||
| if isinstance(msg, type(u'')): | if isinstance(msg, type(u'')): | ||||
| msg = pycompat.sysbytes(msg) | msg = pycompat.sysbytes(msg) | ||||
| if not isinstance(msg, bytes): | if msg is None: | ||||
| ui.error(b"\n") | |||||
| elif not isinstance(msg, bytes): | |||||
| ui.error(b" %r\n" % (msg,)) | ui.error(b" %r\n" % (msg,)) | ||||
| elif not msg: | elif not msg: | ||||
| ui.error(_(b" empty string\n")) | ui.error(_(b" empty string\n")) | ||||
| else: | else: | ||||
| ui.error(b"\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg))) | ui.error(b"\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg))) | ||||
| except error.CensoredNodeError as inst: | except error.CensoredNodeError as inst: | ||||
| ui.error(_(b"abort: file censored %s\n") % inst) | ui.error(_(b"abort: file censored %s\n") % inst) | ||||
| except error.StorageError as inst: | except error.StorageError as inst: | ||||
| self._responseexecutor = None | self._responseexecutor = None | ||||
| # If any of our futures are still in progress, mark them as | # If any of our futures are still in progress, mark them as | ||||
| # errored. Otherwise a result() could wait indefinitely. | # errored. Otherwise a result() could wait indefinitely. | ||||
| for f in self._futures: | for f in self._futures: | ||||
| if not f.done(): | if not f.done(): | ||||
| f.set_exception( | f.set_exception( | ||||
| error.ResponseError( | error.ResponseError( | ||||
| _(b'unfulfilled batch command response') | _(b'unfulfilled batch command response'), None | ||||
| ) | ) | ||||
| ) | ) | ||||
| self._futures = None | self._futures = None | ||||
| def _readbatchresponse(self, states, wireresults): | def _readbatchresponse(self, states, wireresults): | ||||
| # Executes in a thread to read data off the wire. | # Executes in a thread to read data off the wire. | ||||
| for command, f, batchable, fremote in states: | for command, f, batchable, fremote in states: | ||||
| # Grab raw result off the wire and teach the internal future | # Grab raw result off the wire and teach the internal future | ||||
| # about it. | # about it. | ||||
| try: | |||||
| remoteresult = next(wireresults) | remoteresult = next(wireresults) | ||||
| except StopIteration: | |||||
| # This can happen in particular because next(batchable) | |||||
| # in the previous iteration can call peer._abort, which | |||||
| # may close the peer. | |||||
| f.set_exception( | |||||
| error.ResponseError( | |||||
| _(b'unfulfilled batch command response'), None | |||||
| ) | |||||
| ) | |||||
| else: | |||||
| fremote.set(remoteresult) | fremote.set(remoteresult) | ||||
| # And ask the coroutine to decode that value. | # And ask the coroutine to decode that value. | ||||
| try: | try: | ||||
| result = next(batchable) | result = next(batchable) | ||||
| except Exception: | except Exception: | ||||
| pycompat.future_set_exception_info(f, sys.exc_info()[1:]) | pycompat.future_set_exception_info(f, sys.exc_info()[1:]) | ||||
| else: | else: | ||||
| f.set_result(result) | f.set_result(result) | ||||
| @interfaceutil.implementer( | @interfaceutil.implementer( | ||||
| repository.ipeercommands, repository.ipeerlegacycommands | repository.ipeercommands, repository.ipeerlegacycommands | ||||
| ) | ) | ||||
| class wirepeer(repository.peer): | class wirepeer(repository.peer): | ||||
| """Client-side interface for communicating with a peer repository. | """Client-side interface for communicating with a peer repository. | ||||
| $ 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 | ||||
| StopIteration | pulling from ssh://user@dummy/$TESTTMP/b/../a | ||||
| abort: unknown revision 'nosuchbookmark' | |||||
| [255] | |||||