This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4439

wireprotov2peer: split responsedata handling into separate function
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc734a5c82f38: wireprotov2peer: split responsedata handling into separate function
Summary

So we don't have so much logic inside an if/elif block.

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

PathPackages
Mmercurial/wireprotov2peer.py (58 lines)

Diff 10759

mercurial/wireprotov2peer.py

raise error.ProgrammingError( raise error.ProgrammingError(
'received frame for unknown request; this is either a bug in ' 'received frame for unknown request; this is either a bug in '
'the clientreactor not screening for this or this instance was ' 'the clientreactor not screening for this or this instance was '
'never told about this request: %r' % frame) 'never told about this request: %r' % frame)
response = self._responses[frame.requestid] response = self._responses[frame.requestid]
if action == 'responsedata': if action == 'responsedata':
self._processresponsedata(frame, meta, response)
else:
raise error.ProgrammingError(
'unhandled action from clientreactor: %s' % action)
def _processresponsedata(self, frame, meta, response):
# This buffers all data until end of stream is received. This # This buffers all data until end of stream is received. This
# is bad for performance. # is bad for performance.
# TODO make response data streamable # TODO make response data streamable
response.b.write(meta['data']) response.b.write(meta['data'])
if meta['eos']: if meta['eos']:
# If the command has a decoder, resolve the future to the # If the command has a decoder, resolve the future to the
# decoded value. Otherwise resolve to the rich response object. # decoded value. Otherwise resolve to the rich response object.
decoder = COMMAND_DECODERS.get(response.command) decoder = COMMAND_DECODERS.get(response.command)
# TODO consider always resolving the overall status map. # TODO consider always resolving the overall status map.
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( e = error.RepoError(
formatrichmessage(overall['error']['message'])) formatrichmessage(overall['error']['message']))
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]
else:
raise error.ProgrammingError(
'unhandled action from clientreactor: %s' % action)
def decodebranchmap(objs): def decodebranchmap(objs):
# Response should be a single CBOR map of branch name to array of nodes. # Response should be a single CBOR map of branch name to array of nodes.
bm = next(objs) bm = next(objs)
return {encoding.tolocal(k): v for k, v in bm.items()} return {encoding.tolocal(k): v for k, v in bm.items()}
def decodeheads(objs): def decodeheads(objs):
# Array of node bytestrings. # Array of node bytestrings.