This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4441

wireprotov2peer: properly format errors
ClosedPublic

Authored by indygreg on Aug 31 2018, 6:57 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG43d92d68ac88: wireprotov2peer: properly format errors
Summary

formatrichmessage() expects an iterable containing dicts with
well-defined keys. We were passing in something else. This caused
an exception.

Change the code to call formatrichmessage() with the proper argument.

And add a TODO to potentially emit the proper data structure from
the server in the first place.

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.

Event Timeline

indygreg created this revision.Aug 31 2018, 6:57 PM
indygreg updated this revision to Diff 10790.Sep 5 2018, 12:20 PM
Closed by commit rHG43d92d68ac88: wireprotov2peer: properly format errors (authored by indygreg). · Explain WhySep 10 2018, 7:43 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 10858

mercurial/wireprotoframing.py

flags ^= FLAG_COMMAND_RESPONSE_CONTINUATION flags ^= FLAG_COMMAND_RESPONSE_CONTINUATION
flags |= FLAG_COMMAND_RESPONSE_EOS flags |= FLAG_COMMAND_RESPONSE_EOS
yield stream.makeframe(requestid=requestid, yield stream.makeframe(requestid=requestid,
typeid=FRAME_TYPE_COMMAND_RESPONSE, typeid=FRAME_TYPE_COMMAND_RESPONSE,
flags=flags, flags=flags,
payload=b'') payload=b'')
def createcommanderrorresponse(stream, requestid, message, args=None): def createcommanderrorresponse(stream, requestid, message, args=None):
# TODO should this be using a list of {'msg': ..., 'args': {}} so atom
# formatting works consistently?
m = { m = {
b'status': b'error', b'status': b'error',
b'error': { b'error': {
b'message': message, b'message': message,
} }
} }
if args: if args:

mercurial/wireprotov2peer.py

"""Format an encoded message from the framing protocol.""" """Format an encoded message from the framing protocol."""
chunks = [] chunks = []
for atom in atoms: for atom in atoms:
msg = _(atom[b'msg']) msg = _(atom[b'msg'])
if b'args' in atom: if b'args' in atom:
msg = msg % atom[b'args'] msg = msg % tuple(atom[b'args'])
chunks.append(msg) chunks.append(msg)
return b''.join(chunks) return b''.join(chunks)
class commandresponse(object): class commandresponse(object):
"""Represents the response to a command request.""" """Represents the response to a command request."""
if decoder: if decoder:
objs = response.cborobjects() objs = response.cborobjects()
overall = next(objs) overall = next(objs)
if overall['status'] == 'ok': if overall['status'] == 'ok':
self._futures[frame.requestid].set_result(decoder(objs)) self._futures[frame.requestid].set_result(decoder(objs))
else: else:
e = error.RepoError( atoms = [{'msg': overall['error']['message']}]
formatrichmessage(overall['error']['message'])) if 'args' in overall['error']:
atoms[0]['args'] = overall['error']['args']
e = error.RepoError(formatrichmessage(atoms))
self._futures[frame.requestid].set_exception(e) self._futures[frame.requestid].set_exception(e)
else: else:
self._futures[frame.requestid].set_result(response) self._futures[frame.requestid].set_result(response)
del self._requests[frame.requestid] del self._requests[frame.requestid]
del self._futures[frame.requestid] del self._futures[frame.requestid]
def decodebranchmap(objs): def decodebranchmap(objs):