This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3235

httppeer: move error handling and response wrapping into sendrequest
ClosedPublic

Authored by indygreg on Apr 10 2018, 9:28 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGb5862ee01abe: httppeer: move error handling and response wrapping into sendrequest
Summary

This is common for all HTTP requests. It should be part of
sendrequest().

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.

Event Timeline

indygreg created this revision.Apr 10 2018, 9:28 PM
durin42 accepted this revision.Apr 11 2018, 12:47 PM
This revision is now accepted and ready to land.Apr 11 2018, 12:47 PM
Closed by commit rHGb5862ee01abe: httppeer: move error handling and response wrapping into sendrequest (authored by indygreg). · Explain WhyApr 11 2018, 1:00 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/httppeer.py (36 lines)

Diff 7996

mercurial/httppeer.py

data = req.get_data() data = req.get_data()
length = getattr(data, 'length', None) length = getattr(data, 'length', None)
if length is None: if length is None:
length = len(data) length = len(data)
dbg(line % ' %d bytes of data' % length) dbg(line % ' %d bytes of data' % length)
start = util.timer() start = util.timer()
try:
res = opener.open(req) res = opener.open(req)
except urlerr.httperror as inst:
if inst.code == 401:
raise error.Abort(_('authorization failed'))
raise
except httplib.HTTPException as inst:
ui.debug('http error requesting %s\n' %
util.hidepassword(req.get_full_url()))
ui.traceback()
raise IOError(None, inst)
finally:
if ui.configbool('devel', 'debug.peer-request'): if ui.configbool('devel', 'debug.peer-request'):
dbg(line % ' finished in %.4f seconds (%s)' dbg(line % ' finished in %.4f seconds (%s)'
% (util.timer() - start, res.code)) % (util.timer() - start, res.code))
# Insert error handlers for common I/O failures.
_wraphttpresponse(res)
return res return res
class httppeer(wireproto.wirepeer): class httppeer(wireproto.wirepeer):
def __init__(self, ui, path, url, opener, requestbuilder): def __init__(self, ui, path, url, opener, requestbuilder):
self.ui = ui self.ui = ui
self._path = path self._path = path
self._url = url self._url = url
self._caps = None self._caps = None
def _callstream(self, cmd, _compressible=False, **args): def _callstream(self, cmd, _compressible=False, **args):
args = pycompat.byteskwargs(args) args = pycompat.byteskwargs(args)
req, cu, qs = makev1commandrequest(self.ui, self._requestbuilder, req, cu, qs = makev1commandrequest(self.ui, self._requestbuilder,
self._caps, self.capable, self._caps, self.capable,
self._url, cmd, args) self._url, cmd, args)
try:
resp = sendrequest(self.ui, self._urlopener, req) resp = sendrequest(self.ui, self._urlopener, req)
except urlerr.httperror as inst:
if inst.code == 401:
raise error.Abort(_('authorization failed'))
raise
except httplib.HTTPException as inst:
self.ui.debug('http error while sending %s command\n' % cmd)
self.ui.traceback()
raise IOError(None, inst)
# Insert error handlers for common I/O failures.
_wraphttpresponse(resp)
# record the url we got redirected to # record the url we got redirected to
resp_url = pycompat.bytesurl(resp.geturl()) resp_url = pycompat.bytesurl(resp.geturl())
if resp_url.endswith(qs): if resp_url.endswith(qs):
resp_url = resp_url[:-len(qs)] resp_url = resp_url[:-len(qs)]
if self._url.rstrip('/') != resp_url.rstrip('/'): if self._url.rstrip('/') != resp_url.rstrip('/'):
if not self.ui.quiet: if not self.ui.quiet:
self.ui.warn(_('real URL is %s\n') % resp_url) self.ui.warn(_('real URL is %s\n') % resp_url)