This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2295

py3: get bytes-repr of network errors portably
ClosedPublic

Authored by durin42 on Feb 17 2018, 1:41 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGaf0a19d8812b: py3: get bytes-repr of network errors portably
rHGc57892ccbb41: py3: get bytes-repr of network errors portably
Summary

This resolves a lot of weird issues in Python 3 around error strings.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Feb 17 2018, 1:41 AM
pulkit added a subscriber: pulkit.Feb 17 2018, 4:43 AM

For converting error messages to bytes, util.forcebytestr() is preferred. https://phab.mercurial-scm.org/D2269#inline-5791

mercurial/hgweb/request.py
125

This one looks like an unrelated change.

Closed by commit rHGc57892ccbb41: py3: get bytes-repr of network errors portably (authored by durin42). · Explain WhyFeb 17 2018, 4:54 AM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Feb 17 2018, 4:57 AM

Here the exception type is limited, so using bytestr() should be okay.

Revision Contents
Changeset List

Diff 5800

mercurial/hgweb/hgweb_mod.py

else: else:
content = getattr(webcommands, cmd)(rctx, req, tmpl) content = getattr(webcommands, cmd)(rctx, req, tmpl)
req.respond(HTTP_OK, ctype) req.respond(HTTP_OK, ctype)
return content return content
except (error.LookupError, error.RepoLookupError) as err: except (error.LookupError, error.RepoLookupError) as err:
req.respond(HTTP_NOT_FOUND, ctype) req.respond(HTTP_NOT_FOUND, ctype)
msg = str(err) msg = pycompat.bytestr(err)
if (util.safehasattr(err, 'name') and if (util.safehasattr(err, 'name') and
not isinstance(err, error.ManifestLookupError)): not isinstance(err, error.ManifestLookupError)):
msg = 'revision not found: %s' % err.name msg = 'revision not found: %s' % err.name
return tmpl('error', error=msg) return tmpl('error', error=msg)
except (error.RepoError, error.RevlogError) as inst: except (error.RepoError, error.RevlogError) as inst:
req.respond(HTTP_SERVER_ERROR, ctype) req.respond(HTTP_SERVER_ERROR, ctype)
return tmpl('error', error=str(inst)) return tmpl('error', error=pycompat.bytestr(inst))
except ErrorResponse as inst: except ErrorResponse as inst:
req.respond(inst, ctype) req.respond(inst, ctype)
if inst.code == HTTP_NOT_MODIFIED: if inst.code == HTTP_NOT_MODIFIED:
# Not allowed to return a body on a 304 # Not allowed to return a body on a 304
return [''] return ['']
return tmpl('error', error=str(inst)) return tmpl('error', error=pycompat.bytestr(inst))
def check_perm(self, rctx, req, op): def check_perm(self, rctx, req, op):
for permhook in permhooks: for permhook in permhooks:
permhook(rctx, req, op) permhook(rctx, req, op)
def getwebview(repo): def getwebview(repo):
"""The 'web.view' config controls changeset filter to hgweb. Possible """The 'web.view' config controls changeset filter to hgweb. Possible
values are ``served``, ``visible`` and ``all``. Default is ``served``. values are ``served``, ``visible`` and ``all``. Default is ``served``.

mercurial/hgweb/request.py

k in ('Date', 'ETag', 'Expires', k in ('Date', 'ETag', 'Expires',
'Cache-Control', 'Vary')] 'Cache-Control', 'Vary')]
status = statusmessage(status.code, pycompat.bytestr(status)) status = statusmessage(status.code, pycompat.bytestr(status))
elif status == 200: elif status == 200:
status = '200 Script output follows' status = '200 Script output follows'
elif isinstance(status, int): elif isinstance(status, int):
status = statusmessage(status) status = statusmessage(status)
self.server_write = self._start_response(status, self.headers) self.server_write = self._start_response(
pycompat.sysstr(status), self.headers)
pulkitUnsubmitted
Not Done

This one looks like an unrelated change.

pulkit: This one looks like an unrelated change.
self._start_response = None self._start_response = None
self.headers = [] self.headers = []
if body is not None: if body is not None:
self.write(body) self.write(body)
self.server_write = None self.server_write = None
def write(self, thing): def write(self, thing):
if thing: if thing:

mercurial/hgweb/webutil.py

try: try:
fromline, toline = map(int, linerange[0].split(':', 1)) fromline, toline = map(int, linerange[0].split(':', 1))
except ValueError: except ValueError:
raise ErrorResponse(HTTP_BAD_REQUEST, raise ErrorResponse(HTTP_BAD_REQUEST,
'invalid linerange parameter') 'invalid linerange parameter')
try: try:
return util.processlinerange(fromline, toline) return util.processlinerange(fromline, toline)
except error.ParseError as exc: except error.ParseError as exc:
raise ErrorResponse(HTTP_BAD_REQUEST, str(exc)) raise ErrorResponse(HTTP_BAD_REQUEST, pycompat.bytestr(exc))
def formatlinerange(fromline, toline): def formatlinerange(fromline, toline):
return '%d:%d' % (fromline + 1, toline) return '%d:%d' % (fromline + 1, toline)
def succsandmarkers(repo, ctx): def succsandmarkers(repo, ctx):
for item in templatekw.showsuccsandmarkers(repo, ctx): for item in templatekw.showsuccsandmarkers(repo, ctx):
item['successors'] = _siblings(repo[successor] item['successors'] = _siblings(repo[successor]
for successor in item['successors']) for successor in item['successors'])

mercurial/wireproto.py

info, chunks = exchange.getbundlechunks(repo, 'serve', info, chunks = exchange.getbundlechunks(repo, 'serve',
**pycompat.strkwargs(opts)) **pycompat.strkwargs(opts))
prefercompressed = info.get('prefercompressed', True) prefercompressed = info.get('prefercompressed', True)
except error.Abort as exc: except error.Abort as exc:
# cleanly forward Abort error to the client # cleanly forward Abort error to the client
if not exchange.bundle2requested(opts.get('bundlecaps')): if not exchange.bundle2requested(opts.get('bundlecaps')):
if proto.name == 'http-v1': if proto.name == 'http-v1':
return ooberror(str(exc) + '\n') return ooberror(pycompat.bytestr(exc) + '\n')
raise # cannot do better for bundle1 + ssh raise # cannot do better for bundle1 + ssh
# bundle2 request expect a bundle2 reply # bundle2 request expect a bundle2 reply
bundler = bundle2.bundle20(repo.ui) bundler = bundle2.bundle20(repo.ui)
manargs = [('message', str(exc))] manargs = [('message', pycompat.bytestr(exc))]
advargs = [] advargs = []
if exc.hint is not None: if exc.hint is not None:
advargs.append(('hint', exc.hint)) advargs.append(('hint', exc.hint))
bundler.addpart(bundle2.bundlepart('error:abort', bundler.addpart(bundle2.bundlepart('error:abort',
manargs, advargs)) manargs, advargs))
chunks = bundler.getchunks() chunks = bundler.getchunks()
prefercompressed = False prefercompressed = False

mercurial/wireprotoserver.py

# the client. # the client.
req.env.get('X-HgHttp2', '')): req.env.get('X-HgHttp2', '')):
req.drain() req.drain()
else: else:
req.headers.append((r'Connection', r'Close')) req.headers.append((r'Connection', r'Close'))
# TODO This response body assumes the failed command was # TODO This response body assumes the failed command was
# "unbundle." That assumption is not always valid. # "unbundle." That assumption is not always valid.
req.respond(e, HGTYPE, body='0\n%s\n' % e) req.respond(e, HGTYPE, body='0\n%s\n' % pycompat.bytestr(e))
return '' return ''
def _sshv1respondbytes(fout, value): def _sshv1respondbytes(fout, value):
"""Send a bytes response for protocol version 1.""" """Send a bytes response for protocol version 1."""
fout.write('%d\n' % len(value)) fout.write('%d\n' % len(value))
fout.write(value) fout.write(value)
fout.flush() fout.flush()