comparison hglib/client.py @ 197:6949fc164439 2.5

hgclient: look for an open server before closing it in ResponseError block

At least some of the codepaths that can throw a ResponseError close
the server first (the one in _readchannel does so in order to detect
server startup failures, for example), so we have to verify we have a
server to close before doing so, otherwise we can lose the
ResponseError and the user sees an AttributeError when we try to use
.close() on a NoneType.

196:c586d02f7cda

        self.server = util.popen(self._args, self._env)
        try:
            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.

197:6949fc164439

        self.server = util.popen(self._args, self._env)
        try:
            self._readhello()
        except error.ResponseError:
            if self.server is not None:
                self._close()
            raise
        except error.ServerError:
            if self.server is None:
                # server is already closed, hopefully the ServerError
                # we got has enough information.