This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4469

debugcommands: use our CBOR decoder
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe5eb67dea6e8: debugcommands: use our CBOR decoder
Summary

It implements the set of CBOR needed for the wire protocol.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Sep 4 2018, 2:28 PM
pulkit accepted this revision.Sep 5 2018, 7:59 AM
Closed by commit rHGe5eb67dea6e8: debugcommands: 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/debugcommands.py (7 lines)

Diff 10766

mercurial/debugcommands.py

from .node import ( from .node import (
bin, bin,
hex, hex,
nullhex, nullhex,
nullid, nullid,
nullrev, nullrev,
short, short,
) )
from .thirdparty import (
cbor,
)
from . import ( from . import (
bundle2, bundle2,
changegroup, changegroup,
cmdutil, cmdutil,
color, color,
context, context,
dagparser, dagparser,
encoding, encoding,
url as urlmod, url as urlmod,
util, util,
vfs as vfsmod, vfs as vfsmod,
wireprotoframing, wireprotoframing,
wireprotoserver, wireprotoserver,
wireprotov2peer, wireprotov2peer,
) )
from .utils import ( from .utils import (
cborutil,
dateutil, dateutil,
procutil, procutil,
stringutil, stringutil,
) )
from .revlogutils import ( from .revlogutils import (
deltas as deltautil deltas as deltautil
) )
body = res.read() body = res.read()
except util.urlerr.urlerror as e: except util.urlerr.urlerror as e:
# read() method must be called, but only exists in Python 2 # read() method must be called, but only exists in Python 2
getattr(e, 'read', lambda: None)() getattr(e, 'read', lambda: None)()
continue continue
if res.headers.get('Content-Type') == 'application/mercurial-cbor': if res.headers.get('Content-Type') == 'application/mercurial-cbor':
ui.write(_('cbor> %s\n') % ui.write(_('cbor> %s\n') %
stringutil.pprint(cbor.loads(body), bprefix=True, stringutil.pprint(cborutil.decodeall(body)[0],
bprefix=True,
indent=2)) indent=2))
elif action == 'close': elif action == 'close':
peer.close() peer.close()
elif action == 'readavailable': elif action == 'readavailable':
if not stdout or not stderr: if not stdout or not stderr:
raise error.Abort(_('readavailable not available on this peer')) raise error.Abort(_('readavailable not available on this peer'))