This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4470

wireprotov2peer: use our CBOR decoder
ClosedPublic

Authored by indygreg on Sep 4 2018, 2:28 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9f51fd22ed50: wireprotov2peer: use our CBOR decoder
Summary

Behavior should be the same in order to preserve backwards
compatibility. We obviously want to stream values in this code.
We'll do that in subsequent commits.

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.Sep 4 2018, 2:28 PM
pulkit accepted this revision.Sep 5 2018, 8:00 AM
Closed by commit rHG9f51fd22ed50: wireprotov2peer: use our CBOR decoder (authored by indygreg). · Explain WhySep 5 2018, 8:23 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireprotov2peer.py (13 lines)

Diff 10787

mercurial/wireprotov2peer.py

# wireprotov2peer.py - client side code for wire protocol version 2 # wireprotov2peer.py - client side code for wire protocol version 2
# #
# Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com> # Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from .i18n import _ from .i18n import _
from .thirdparty import (
cbor,
)
from . import ( from . import (
encoding, encoding,
error, error,
util, util,
wireprotoframing, wireprotoframing,
) )
from .utils import (
cborutil,
)
def formatrichmessage(atoms): def formatrichmessage(atoms):
"""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'])
def __init__(self, requestid, command): def __init__(self, requestid, command):
self.requestid = requestid self.requestid = requestid
self.command = command self.command = command
self.b = util.bytesio() self.b = util.bytesio()
def cborobjects(self): def cborobjects(self):
"""Obtain decoded CBOR objects from this response.""" """Obtain decoded CBOR objects from this response."""
size = self.b.tell()
self.b.seek(0) self.b.seek(0)
decoder = cbor.CBORDecoder(self.b) for v in cborutil.decodeall(self.b.getvalue()):
yield v
while self.b.tell() < size:
yield decoder.decode()
class clienthandler(object): class clienthandler(object):
"""Object to handle higher-level client activities. """Object to handle higher-level client activities.
The ``clientreactor`` is used to hold low-level state about the frame-based The ``clientreactor`` is used to hold low-level state about the frame-based
protocol, such as which requests and streams are active. This type is used protocol, such as which requests and streams are active. This type is used
for higher-level operations, such as reading frames from a socket, exposing for higher-level operations, such as reading frames from a socket, exposing
and managing a higher-level primitive for representing command responses, and managing a higher-level primitive for representing command responses,