This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3233

httppeer: extract code for performing an HTTP request
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG8e7a4435ab6d: httppeer: extract code for performing an HTTP request
Summary

This is generic and doesn't need to live as a method of httppeer.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Apr 10 2018, 9:28 PM
durin42 accepted this revision.Apr 11 2018, 12:40 PM
This revision is now accepted and ready to land.Apr 11 2018, 12:40 PM
Closed by commit rHG8e7a4435ab6d: httppeer: extract code for performing an HTTP request (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 (77 lines)

Diff 7951

mercurial/httppeer.py

if offset != 0: if offset != 0:
raise NotImplementedError( raise NotImplementedError(
'_multifile only supports seeking to start, but that ' '_multifile only supports seeking to start, but that '
'could be fixed if you need it') 'could be fixed if you need it')
for f in self._fileobjs: for f in self._fileobjs:
f.seek(0) f.seek(0)
self._index = 0 self._index = 0
class httppeer(wireproto.wirepeer): def sendrequest(ui, opener, req):
def __init__(self, ui, path, url, opener, requestbuilder): """Send a prepared HTTP request.
self.ui = ui
self._path = path
self._url = url
self._caps = None
self._urlopener = opener
self._requestbuilder = requestbuilder
def __del__(self): Returns the response object.
for h in self._urlopener.handlers: """
h.close() if (ui.debugflag
getattr(h, "close_all", lambda: None)() and ui.configbool('devel', 'debug.peer-request')):
dbg = ui.debug
def _openurl(self, req):
if (self.ui.debugflag
and self.ui.configbool('devel', 'debug.peer-request')):
dbg = self.ui.debug
line = 'devel-peer-request: %s\n' line = 'devel-peer-request: %s\n'
dbg(line % '%s %s' % (req.get_method(), req.get_full_url())) dbg(line % '%s %s' % (req.get_method(), req.get_full_url()))
hgargssize = None hgargssize = None
for header, value in sorted(req.header_items()): for header, value in sorted(req.header_items()):
if header.startswith('X-hgarg-'): if header.startswith('X-hgarg-'):
if hgargssize is None: if hgargssize is None:
hgargssize = 0 hgargssize = 0
hgargssize += len(value) hgargssize += len(value)
else: else:
dbg(line % ' %s %s' % (header, value)) dbg(line % ' %s %s' % (header, value))
if hgargssize is not None: if hgargssize is not None:
dbg(line % ' %d bytes of commands arguments in headers' dbg(line % ' %d bytes of commands arguments in headers'
% hgargssize) % hgargssize)
if req.has_data(): if req.has_data():
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()
ret = self._urlopener.open(req) res = opener.open(req)
if self.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, ret.code)) % (util.timer() - start, res.code))
return ret
return res
class httppeer(wireproto.wirepeer):
def __init__(self, ui, path, url, opener, requestbuilder):
self.ui = ui
self._path = path
self._url = url
self._caps = None
self._urlopener = opener
self._requestbuilder = requestbuilder
def __del__(self):
for h in self._urlopener.handlers:
h.close()
getattr(h, "close_all", lambda: None)()
# Begin of ipeerconnection interface. # Begin of ipeerconnection interface.
def url(self): def url(self):
return self._path return self._path
def local(self): def local(self):
return None return None
headers[r'Vary'] = r','.join(varyheaders) headers[r'Vary'] = r','.join(varyheaders)
req = self._requestbuilder(pycompat.strurl(cu), data, headers) req = self._requestbuilder(pycompat.strurl(cu), data, headers)
if data is not None: if data is not None:
self.ui.debug("sending %d bytes\n" % size) self.ui.debug("sending %d bytes\n" % size)
req.add_unredirected_header(r'Content-Length', r'%d' % size) req.add_unredirected_header(r'Content-Length', r'%d' % size)
try: try:
resp = self._openurl(req) resp = sendrequest(self.ui, self._urlopener, req)
except urlerr.httperror as inst: except urlerr.httperror as inst:
if inst.code == 401: if inst.code == 401:
raise error.Abort(_('authorization failed')) raise error.Abort(_('authorization failed'))
raise raise
except httplib.HTTPException as inst: except httplib.HTTPException as inst:
self.ui.debug('http error while sending %s command\n' % cmd) self.ui.debug('http error while sending %s command\n' % cmd)
self.ui.traceback() self.ui.traceback()
raise IOError(None, inst) raise IOError(None, inst)