This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4769

debugcommands: print all CBOR objects
ClosedPublic

Authored by indygreg on Sep 26 2018, 9:09 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG426cb2859013: debugcommands: print all CBOR objects
Summary

application/mercurial-cbor may contain multiple objects. Let's print
all of them.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Sep 26 2018, 9:09 PM
Closed by commit rHG426cb2859013: debugcommands: print all CBOR objects (authored by indygreg). · Explain WhyOct 3 2018, 11:29 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 11440

mercurial/debugcommands.py

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(cborutil.decodeall(body)[0], stringutil.pprint(cborutil.decodeall(body),
bprefix=True, 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'))

tests/test-wireproto-command-capabilities.t

s> makefile('rb', None) s> makefile('rb', None)
s> HTTP/1.1 200 OK\r\n s> HTTP/1.1 200 OK\r\n
s> Server: testing stub value\r\n s> Server: testing stub value\r\n
s> Date: $HTTP_DATE$\r\n s> Date: $HTTP_DATE$\r\n
s> Content-Type: application/mercurial-cbor\r\n s> Content-Type: application/mercurial-cbor\r\n
s> Content-Length: *\r\n (glob) s> Content-Length: *\r\n (glob)
s> \r\n s> \r\n
s> \xa3GapibaseDapi/Dapis\xa0Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash s> \xa3GapibaseDapi/Dapis\xa0Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
cbor> { cbor> [
{
b'apibase': b'api/', b'apibase': b'api/',
b'apis': {}, b'apis': {},
b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash' b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash'
} }
]
Restart server to enable HTTPv2 Restart server to enable HTTPv2
$ killdaemons.py $ killdaemons.py
$ enablehttpv2 server $ enablehttpv2 server
$ hg -R server serve -p $HGPORT -d --pid-file hg.pid -E error.log $ hg -R server serve -p $HGPORT -d --pid-file hg.pid -E error.log
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
s> makefile('rb', None) s> makefile('rb', None)
s> HTTP/1.1 200 OK\r\n s> HTTP/1.1 200 OK\r\n
s> Server: testing stub value\r\n s> Server: testing stub value\r\n
s> Date: $HTTP_DATE$\r\n s> Date: $HTTP_DATE$\r\n
s> Content-Type: application/mercurial-cbor\r\n s> Content-Type: application/mercurial-cbor\r\n
s> Content-Length: *\r\n (glob) s> Content-Length: *\r\n (glob)
s> \r\n s> \r\n
s> \xa3GapibaseDapi/Dapis\xa0Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash s> \xa3GapibaseDapi/Dapis\xa0Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
cbor> { cbor> [
{
b'apibase': b'api/', b'apibase': b'api/',
b'apis': {}, b'apis': {},
b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash' b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash'
} }
]
Request for HTTPv2 service returns information about it Request for HTTPv2 service returns information about it
$ sendhttpraw << EOF $ sendhttpraw << EOF
> httprequest GET ?cmd=capabilities > httprequest GET ?cmd=capabilities
> user-agent: test > user-agent: test
> x-hgupgrade-1: exp-http-v2-0002 foo bar > x-hgupgrade-1: exp-http-v2-0002 foo bar
> x-hgproto-1: cbor > x-hgproto-1: cbor
s> makefile('rb', None) s> makefile('rb', None)
s> HTTP/1.1 200 OK\r\n s> HTTP/1.1 200 OK\r\n
s> Server: testing stub value\r\n s> Server: testing stub value\r\n
s> Date: $HTTP_DATE$\r\n s> Date: $HTTP_DATE$\r\n
s> Content-Type: application/mercurial-cbor\r\n s> Content-Type: application/mercurial-cbor\r\n
s> Content-Length: *\r\n (glob) s> Content-Length: *\r\n (glob)
s> \r\n s> \r\n
s> \xa3GapibaseDapi/Dapis\xa1Pexp-http-v2-0002\xa5Hcommands\xaaIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullMchangesetdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x84IbookmarksGparentsEphaseHrevisionInoderange\xa3Gdefault\xf6Hrequired\xf4DtypeDlistEnodes\xa3Gdefault\xf6Hrequired\xf4DtypeDlistJnodesdepth\xa3Gdefault\xf6Hrequired\xf4DtypeCintKpermissions\x81DpullHfiledata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDpath\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullEheads\xa2Dargs\xa1Jpubliconly\xa3Gdefault\xf4Hrequired\xf4DtypeDboolKpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\xa3Gdefault\x80Hrequired\xf4DtypeDlistKpermissions\x81DpullHlistkeys\xa2Dargs\xa1Inamespace\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullFlookup\xa2Dargs\xa1Ckey\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullLmanifestdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDtree\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullGpushkey\xa2Dargs\xa4Ckey\xa2Hrequired\xf5DtypeEbytesInamespace\xa2Hrequired\xf5DtypeEbytesCnew\xa2Hrequired\xf5DtypeEbytesCold\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpushKcompression\x81\xa1DnameDzlibQframingmediatypes\x81X&application/mercurial-exp-framing-0005Rpathfilterprefixes\xd9\x01\x02\x82Epath:Lrootfilesin:Nrawrepoformats\x82LgeneraldeltaHrevlogv1Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash s> \xa3GapibaseDapi/Dapis\xa1Pexp-http-v2-0002\xa5Hcommands\xaaIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullMchangesetdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x84IbookmarksGparentsEphaseHrevisionInoderange\xa3Gdefault\xf6Hrequired\xf4DtypeDlistEnodes\xa3Gdefault\xf6Hrequired\xf4DtypeDlistJnodesdepth\xa3Gdefault\xf6Hrequired\xf4DtypeCintKpermissions\x81DpullHfiledata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDpath\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullEheads\xa2Dargs\xa1Jpubliconly\xa3Gdefault\xf4Hrequired\xf4DtypeDboolKpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\xa3Gdefault\x80Hrequired\xf4DtypeDlistKpermissions\x81DpullHlistkeys\xa2Dargs\xa1Inamespace\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullFlookup\xa2Dargs\xa1Ckey\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullLmanifestdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDtree\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullGpushkey\xa2Dargs\xa4Ckey\xa2Hrequired\xf5DtypeEbytesInamespace\xa2Hrequired\xf5DtypeEbytesCnew\xa2Hrequired\xf5DtypeEbytesCold\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpushKcompression\x81\xa1DnameDzlibQframingmediatypes\x81X&application/mercurial-exp-framing-0005Rpathfilterprefixes\xd9\x01\x02\x82Epath:Lrootfilesin:Nrawrepoformats\x82LgeneraldeltaHrevlogv1Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
cbor> { cbor> [
{
b'apibase': b'api/', b'apibase': b'api/',
b'apis': { b'apis': {
b'exp-http-v2-0002': { b'exp-http-v2-0002': {
b'commands': { b'commands': {
b'branchmap': { b'branchmap': {
b'args': {}, b'args': {},
b'permissions': [ b'permissions': [
b'pull' b'pull'
] ]
}, },
b'capabilities': { b'capabilities': {
b'args': {}, b'args': {},
b'permissions': [ b'permissions': [
b'pull' b'pull'
] ]
}, },
b'changesetdata': { b'changesetdata': {
b'args': { b'args': {
b'fields': { b'fields': {
b'default': set([]), b'default': set([]),
b'required': False, b'required': False,
b'type': b'set', b'type': b'set',
b'validvalues': set([ b'validvalues': set([
b'bookmarks', b'bookmarks',
b'parents', b'parents',
b'phase', b'phase',
b'revision' b'revision'
]) ])
}, },
b'noderange': { b'noderange': {
b'default': None, b'default': None,
b'required': False, b'required': False,
b'type': b'list' b'type': b'list'
}, },
b'nodes': { b'nodes': {
b'default': None, b'default': None,
b'required': False, b'required': False,
b'type': b'list' b'type': b'list'
}, },
b'nodesdepth': { b'nodesdepth': {
b'default': None, b'default': None,
b'required': False, b'required': False,
b'type': b'int' b'type': b'int'
} }
}, },
b'permissions': [ b'permissions': [
b'pull' b'pull'
] ]
}, },
b'filedata': { b'filedata': {
b'args': { b'args': {
b'fields': { b'fields': {
b'default': set([]), b'default': set([]),
b'required': False, b'required': False,
b'type': b'set', b'type': b'set',
b'validvalues': set([ b'validvalues': set([
b'parents', b'parents',
b'revision' b'revision'
]) ])
}, },
b'haveparents': { b'haveparents': {
b'default': False, b'default': False,
b'required': False, b'required': False,
b'type': b'bool' b'type': b'bool'
}, },
b'nodes': { b'nodes': {
b'required': True, b'required': True,
b'type': b'list' b'type': b'list'
}, },
b'path': { b'path': {
b'required': True, b'required': True,
b'type': b'bytes' b'type': b'bytes'
} }
}, },
b'permissions': [ b'permissions': [
b'pull' b'pull'
] ]
}, },
b'heads': { b'heads': {
b'args': { b'args': {
b'publiconly': { b'publiconly': {
b'default': False, b'default': False,
b'required': False, b'required': False,
b'type': b'bool' b'type': b'bool'
} }
}, },
b'permissions': [ b'permissions': [
b'pull' b'pull'
] ]
}, },
b'known': { b'known': {
b'args': { b'args': {
b'nodes': { b'nodes': {
b'default': [], b'default': [],
b'required': False, b'required': False,
b'type': b'list' b'type': b'list'
} }
}, },
b'permissions': [ b'permissions': [
b'pull' b'pull'
] ]
}, },
b'listkeys': { b'listkeys': {
b'args': { b'args': {
b'namespace': { b'namespace': {
b'required': True, b'required': True,
b'type': b'bytes' b'type': b'bytes'
} }
}, },
b'permissions': [ b'permissions': [
b'pull' b'pull'
] ]
}, },
b'lookup': { b'lookup': {
b'args': { b'args': {
b'key': { b'key': {
b'required': True, b'required': True,
b'type': b'bytes' b'type': b'bytes'
} }
}, },
b'permissions': [ b'permissions': [
b'pull' b'pull'
] ]
}, },
b'manifestdata': { b'manifestdata': {
b'args': { b'args': {
b'fields': { b'fields': {
b'default': set([]), b'default': set([]),
b'required': False, b'required': False,
b'type': b'set', b'type': b'set',
b'validvalues': set([ b'validvalues': set([
b'parents', b'parents',
b'revision' b'revision'
]) ])
}, },
b'haveparents': { b'haveparents': {
b'default': False, b'default': False,
b'required': False, b'required': False,
b'type': b'bool' b'type': b'bool'
}, },
b'nodes': { b'nodes': {
b'required': True, b'required': True,
b'type': b'list' b'type': b'list'
}, },
b'tree': { b'tree': {
b'required': True, b'required': True,
b'type': b'bytes' b'type': b'bytes'
} }
}, },
b'permissions': [ b'permissions': [
b'pull' b'pull'
] ]
}, },
b'pushkey': { b'pushkey': {
b'args': { b'args': {
b'key': { b'key': {
b'required': True, b'required': True,
b'type': b'bytes' b'type': b'bytes'
}, },
b'namespace': { b'namespace': {
b'required': True, b'required': True,
b'type': b'bytes' b'type': b'bytes'
}, },
b'new': { b'new': {
b'required': True, b'required': True,
b'type': b'bytes' b'type': b'bytes'
}, },
b'old': { b'old': {
b'required': True, b'required': True,
b'type': b'bytes' b'type': b'bytes'
} }
}, },
b'permissions': [ b'permissions': [
b'push' b'push'
] ]
} }
}, },
b'compression': [ b'compression': [
{ {
b'name': b'zlib' b'name': b'zlib'
} }
], ],
b'framingmediatypes': [ b'framingmediatypes': [
b'application/mercurial-exp-framing-0005' b'application/mercurial-exp-framing-0005'
], ],
b'pathfilterprefixes': set([ b'pathfilterprefixes': set([
b'path:', b'path:',
b'rootfilesin:' b'rootfilesin:'
]), ]),
b'rawrepoformats': [ b'rawrepoformats': [
b'generaldelta', b'generaldelta',
b'revlogv1' b'revlogv1'
] ]
} }
}, },
b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash' b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash'
} }
]
capabilities command returns expected info capabilities command returns expected info
$ sendhttpv2peerhandshake << EOF $ sendhttpv2peerhandshake << EOF
> command capabilities > command capabilities
> EOF > EOF
creating http peer for wire protocol version 2 creating http peer for wire protocol version 2
s> GET /?cmd=capabilities HTTP/1.1\r\n s> GET /?cmd=capabilities HTTP/1.1\r\n