comparison hglib/client.py @ 196:c586d02f7cda

_readchannel: if a read failure is due to a broken server, report that

We can end up in this codepath if the specified hg binary fails to
start, and we're better off reporting that than the fact that we got
no response.

195:7c37f08d303d

                                      ", got %r" % msg[1])

    def _readchannel(self):
        data = self.server.stdout.read(hgclient.outputfmtsize)
        if not data:
            self.close()
            raise error.ResponseError('no response received from server')
        channel, length = struct.unpack(hgclient.outputfmt, data)
        if channel in b('IL'):
            return channel, length
        else:

            self._readhello()
        except error.ResponseError:
            self.close()
            raise
        except error.ServerError:
            ret, serr = self._close()
            raise error.ServerError('server exited with status %d: %s'
                                    % (ret, serr.strip()))
        return self

196:c586d02f7cda

                                      ", got %r" % msg[1])

    def _readchannel(self):
        data = self.server.stdout.read(hgclient.outputfmtsize)
        if not data:
            ret, serr = self._close()
            if ret != 0:
                raise error.ServerError('server exited with status %d: %s'
                                        % (ret, serr.strip()))
            raise error.ResponseError('no response received from server')
        channel, length = struct.unpack(hgclient.outputfmt, data)
        if channel in b('IL'):
            return channel, length
        else:

            self._readhello()
        except error.ResponseError:
            self.close()
            raise
        except error.ServerError:
            if self.server is None:
                # server is already closed, hopefully the ServerError
                # we got has enough information.
                raise
            ret, serr = self._close()
            raise error.ServerError('server exited with status %d: %s'
                                    % (ret, serr.strip()))
        return self