Mercurial > public > mercurial-scm > hg
diff mercurial/httppeer.py @ 39483:1fc39367eafd
httppeer: calculate total expected bytes correctly
User-facing error messages that handled httplib.IncompleteRead errors in
Mercurial used to look like this:
abort: HTTP request error (incomplete response; expected 3 bytes got 1)
But the errors that are being handled underneath the UI look like this:
IncompleteRead(1 bytes read, 3 more expected)
I.e. the error actually counts total number of expected bytes minus bytes
already received.
Before, users could see weird messages like "expected 10 bytes got 10", while
in reality httplib expected 10 _more_ bytes (20 in total).
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 08 Sep 2018 23:57:07 +0800 |
| parents | cdb56f295b03 |
| children | 98995b689e03 |
line wrap: on
line diff
--- a/mercurial/httppeer.py Fri Sep 07 23:36:09 2018 -0700 +++ b/mercurial/httppeer.py Sat Sep 08 23:57:07 2018 +0800 @@ -84,9 +84,10 @@ except httplib.IncompleteRead as e: # e.expected is an integer if length known or None otherwise. if e.expected: + got = len(e.partial) + total = e.expected + got msg = _('HTTP request error (incomplete response; ' - 'expected %d bytes got %d)') % (e.expected, - len(e.partial)) + 'expected %d bytes got %d)') % (total, got) else: msg = _('HTTP request error (incomplete response)')