comparison mercurial/httppeer.py @ 38239:ead71b15efd5

merge with stable
author Augie Fackler <augie@google.com>
date Wed, 06 Jun 2018 13:31:24 -0400
parents aac4be30e250 13b2812cff2b
children 2279d90eed9a
comparison
equal deleted inserted replaced
38238:2b8c8b8d1a06 38239:ead71b15efd5
274 def sendrequest(ui, opener, req): 274 def sendrequest(ui, opener, req):
275 """Send a prepared HTTP request. 275 """Send a prepared HTTP request.
276 276
277 Returns the response object. 277 Returns the response object.
278 """ 278 """
279 dbg = ui.debug
279 if (ui.debugflag 280 if (ui.debugflag
280 and ui.configbool('devel', 'debug.peer-request')): 281 and ui.configbool('devel', 'debug.peer-request')):
281 dbg = ui.debug
282 line = 'devel-peer-request: %s\n' 282 line = 'devel-peer-request: %s\n'
283 dbg(line % '%s %s' % (pycompat.bytesurl(req.get_method()), 283 dbg(line % '%s %s' % (pycompat.bytesurl(req.get_method()),
284 pycompat.bytesurl(req.get_full_url()))) 284 pycompat.bytesurl(req.get_full_url())))
285 hgargssize = None 285 hgargssize = None
286 286
316 ui.debug('http error requesting %s\n' % 316 ui.debug('http error requesting %s\n' %
317 util.hidepassword(req.get_full_url())) 317 util.hidepassword(req.get_full_url()))
318 ui.traceback() 318 ui.traceback()
319 raise IOError(None, inst) 319 raise IOError(None, inst)
320 finally: 320 finally:
321 if ui.configbool('devel', 'debug.peer-request'): 321 if ui.debugflag and ui.configbool('devel', 'debug.peer-request'):
322 dbg(line % ' finished in %.4f seconds (%d)' 322 dbg(line % ' finished in %.4f seconds (%d)'
323 % (util.timer() - start, res.code)) 323 % (util.timer() - start, res.code))
324 324
325 # Insert error handlers for common I/O failures. 325 # Insert error handlers for common I/O failures.
326 _wraphttpresponse(res) 326 _wraphttpresponse(res)