This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10182

wireprotoserver: convert ErrorResponse to bytes
ClosedPublic

Authored by mharbison72 on Mar 12 2021, 1:09 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG71443f742886: wireprotoserver: convert ErrorResponse to bytes
Summary

Caught by pytype:

File "/mnt/c/Users/Matt/hg/mercurial/wireprotoserver.py", line 236, in handlewsgirequest: Function _bytestr.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, ints: Iterable[int])
  Actually passed: (self, ints: mercurial.hgweb.common.ErrorResponse)
  The following methods aren't implemented on mercurial.hgweb.common.ErrorResponse:
  __iter__
File "/mnt/c/Users/Matt/hg/mercurial/wireprotoserver.py", line 239, in handlewsgirequest: Function _bytestr.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, ints: Iterable[int])
  Actually passed: (self, ints: mercurial.hgweb.common.ErrorResponse)
  The following methods aren't implemented on mercurial.hgweb.common.ErrorResponse:
  __iter__
File "/mnt/c/Users/Matt/hg/mercurial/wireprotov2server.py", line 91, in handlehttpv2request: Function _bytestr.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, ints: Iterable[int])
  Actually passed: (self, ints: mercurial.hgweb.common.ErrorResponse)
  The following methods aren't implemented on mercurial.hgweb.common.ErrorResponse:
  __iter__

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.

Revision Contents
Changeset List

Diff 26472

mercurial/wireprotoserver.py

wireprototypes, wireprototypes,
wireprotov1server, wireprotov1server,
wireprotov2server, wireprotov2server,
) )
from .interfaces import util as interfaceutil from .interfaces import util as interfaceutil
from .utils import ( from .utils import (
cborutil, cborutil,
compression, compression,
stringutil,
) )
stringio = util.stringio stringio = util.stringio
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
HTTP_OK = 200 HTTP_OK = 200
# ErrorResponse. It is kind of a layer violation to catch an hgweb # ErrorResponse. It is kind of a layer violation to catch an hgweb
# exception here. So consider refactoring into a exception type that # exception here. So consider refactoring into a exception type that
# is associated with the wire protocol. # is associated with the wire protocol.
try: try:
_callhttp(repo, req, res, proto, cmd) _callhttp(repo, req, res, proto, cmd)
except hgwebcommon.ErrorResponse as e: except hgwebcommon.ErrorResponse as e:
for k, v in e.headers: for k, v in e.headers:
res.headers[k] = v res.headers[k] = v
res.status = hgwebcommon.statusmessage(e.code, pycompat.bytestr(e)) res.status = hgwebcommon.statusmessage(
e.code, stringutil.forcebytestr(e)
)
# 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.
res.setbodybytes(b'0\n%s\n' % pycompat.bytestr(e)) res.setbodybytes(b'0\n%s\n' % stringutil.forcebytestr(e))
return True return True
def _availableapis(repo): def _availableapis(repo):
apis = set() apis = set()
# Registered APIs are made available via config options of the name of # Registered APIs are made available via config options of the name of

mercurial/wireprotov2server.py

# At some point we'll want to use our own API instead of recycling the # At some point we'll want to use our own API instead of recycling the
# behavior of version 1 of the wire protocol... # behavior of version 1 of the wire protocol...
# TODO return reasonable responses - not responses that overload the # TODO return reasonable responses - not responses that overload the
# HTTP status line message for error reporting. # HTTP status line message for error reporting.
try: try:
checkperm(rctx, req, b'pull' if permission == b'ro' else b'push') checkperm(rctx, req, b'pull' if permission == b'ro' else b'push')
except hgwebcommon.ErrorResponse as e: except hgwebcommon.ErrorResponse as e:
res.status = hgwebcommon.statusmessage(e.code, pycompat.bytestr(e)) res.status = hgwebcommon.statusmessage(
e.code, stringutil.forcebytestr(e)
)
for k, v in e.headers: for k, v in e.headers:
res.headers[k] = v res.headers[k] = v
res.setbodybytes(b'permission denied') res.setbodybytes(b'permission denied')
return return
# We have a special endpoint to reflect the request back at the client. # We have a special endpoint to reflect the request back at the client.
if command == b'debugreflect': if command == b'debugreflect':
_processhttpv2reflectrequest(rctx.repo.ui, rctx.repo, req, res) _processhttpv2reflectrequest(rctx.repo.ui, rctx.repo, req, res)