This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4399

stringutil: teach pprint() to indent
ClosedPublic

Authored by indygreg on Aug 27 2018, 12:15 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG0f549da54379: stringutil: teach pprint() to indent
Summary

This will make data structure dumping in various places a bit
easier to read and diff. Since I wanted this for hg debugwireproto
output, I added indentation to it.

A more advanced pretty printer implementation would conditionally
add newlines if output is too long. But it is vastly simpler to
be consistent and always add newlines when indenting.

Again, I'm not crazy about the verbosity of the code and there is
room to consolidate logic for "print a collection." But this isn't
the most complicated code in the world and I'm not convinced it is
worth doing.

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 27 2018, 12:15 PM
martinvonz accepted this revision.Aug 30 2018, 6:40 PM
martinvonz added a subscriber: martinvonz.

Again, I'm not crazy about the verbosity of the code and there is
room to consolidate logic for "print a collection." But this isn't
the most complicated code in the world and I'm not convinced it is
worth doing.

I agree :)

This revision is now accepted and ready to land.Aug 30 2018, 6:40 PM
Closed by commit rHG0f549da54379: stringutil: teach pprint() to indent (authored by indygreg). · Explain WhyAug 30 2018, 8:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 10681

mercurial/debugcommands.py

stringutil.escapestr(output)) stringutil.escapestr(output))
else: else:
with peer.commandexecutor() as e: with peer.commandexecutor() as e:
res = e.callcommand(command, args).result() res = e.callcommand(command, args).result()
if isinstance(res, wireprotov2peer.commandresponse): if isinstance(res, wireprotov2peer.commandresponse):
val = list(res.cborobjects()) val = list(res.cborobjects())
ui.status(_('response: %s\n') % ui.status(_('response: %s\n') %
stringutil.pprint(val, bprefix=True)) stringutil.pprint(val, bprefix=True, indent=2))
else: else:
ui.status(_('response: %s\n') % ui.status(_('response: %s\n') %
stringutil.pprint(res, bprefix=True)) stringutil.pprint(res, bprefix=True, indent=2))
elif action == 'batchbegin': elif action == 'batchbegin':
if batchedcommands is not None: if batchedcommands is not None:
raise error.Abort(_('nested batchbegin not allowed')) raise error.Abort(_('nested batchbegin not allowed'))
batchedcommands = [] batchedcommands = []
elif action == 'batchsubmit': elif action == 'batchsubmit':
# There is a batching API we could go through. But it would be # There is a batching API we could go through. But it would be
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(cbor.loads(body), bprefix=True,
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'))
stdin.close() stdin.close()

mercurial/utils/stringutil.py

if isinstance(pat, bytes): if isinstance(pat, bytes):
wantuni = False wantuni = False
pat = pat.decode('latin1') pat = pat.decode('latin1')
pat = pat.translate(_regexescapemap) pat = pat.translate(_regexescapemap)
if wantuni: if wantuni:
return pat return pat
return pat.encode('latin1') return pat.encode('latin1')
def pprint(o, bprefix=False): def pprint(o, bprefix=False, indent=0):
"""Pretty print an object.""" """Pretty print an object."""
return b''.join(pprintgen(o, bprefix=bprefix)) return b''.join(pprintgen(o, bprefix=bprefix, indent=indent))
def pprintgen(o, bprefix=False): def pprintgen(o, bprefix=False, indent=0, _level=1):
"""Pretty print an object to a generator of atoms.""" """Pretty print an object to a generator of atoms.
``bprefix`` is a flag influencing whether bytestrings are preferred with
a ``b''`` prefix.
``indent`` controls whether collections and nested data structures
span multiple lines via the indentation amount in spaces. By default,
no newlines are emitted.
"""
if isinstance(o, bytes): if isinstance(o, bytes):
if bprefix: if bprefix:
yield "b'%s'" % escapestr(o) yield "b'%s'" % escapestr(o)
else: else:
yield "'%s'" % escapestr(o) yield "'%s'" % escapestr(o)
elif isinstance(o, bytearray): elif isinstance(o, bytearray):
# codecs.escape_encode() can't handle bytearray, so escapestr fails # codecs.escape_encode() can't handle bytearray, so escapestr fails
# without coercion. # without coercion.
yield "bytearray['%s']" % escapestr(bytes(o)) yield "bytearray['%s']" % escapestr(bytes(o))
elif isinstance(o, list): elif isinstance(o, list):
if not o: if not o:
yield '[]' yield '[]'
return return
yield '[' yield '['
if indent:
yield '\n'
yield ' ' * (_level * indent)
for i, a in enumerate(o): for i, a in enumerate(o):
for chunk in pprintgen(a, bprefix=bprefix): for chunk in pprintgen(a, bprefix=bprefix, indent=indent,
_level=_level + 1):
yield chunk yield chunk
if i + 1 < len(o): if i + 1 < len(o):
if indent:
yield ',\n'
yield ' ' * (_level * indent)
else:
yield ', ' yield ', '
if indent:
yield '\n'
yield ' ' * ((_level - 1) * indent)
yield ']' yield ']'
elif isinstance(o, dict): elif isinstance(o, dict):
if not o: if not o:
yield '{}' yield '{}'
return return
yield '{' yield '{'
if indent:
yield '\n'
yield ' ' * (_level * indent)
for i, (k, v) in enumerate(sorted(o.items())): for i, (k, v) in enumerate(sorted(o.items())):
for chunk in pprintgen(k, bprefix=bprefix): for chunk in pprintgen(k, bprefix=bprefix, indent=indent,
_level=_level + 1):
yield chunk yield chunk
yield ': ' yield ': '
for chunk in pprintgen(v, bprefix=bprefix): for chunk in pprintgen(v, bprefix=bprefix, indent=indent,
_level=_level + 1):
yield chunk yield chunk
if i + 1 < len(o): if i + 1 < len(o):
if indent:
yield ',\n'
yield ' ' * (_level * indent)
else:
yield ', ' yield ', '
if indent:
yield '\n'
yield ' ' * ((_level - 1) * indent)
yield '}' yield '}'
elif isinstance(o, set): elif isinstance(o, set):
if not o: if not o:
yield 'set([])' yield 'set([])'
return return
yield 'set([' yield 'set(['
if indent:
yield '\n'
yield ' ' * (_level * indent)
for i, k in enumerate(sorted(o)): for i, k in enumerate(sorted(o)):
for chunk in pprintgen(k, bprefix=bprefix): for chunk in pprintgen(k, bprefix=bprefix, indent=indent,
_level=_level + 1):
yield chunk yield chunk
if i + 1 < len(o): if i + 1 < len(o):
if indent:
yield ',\n'
yield ' ' * (_level * indent)
else:
yield ', ' yield ', '
if indent:
yield '\n'
yield ' ' * ((_level - 1) * indent)
yield '])' yield '])'
elif isinstance(o, tuple): elif isinstance(o, tuple):
if not o: if not o:
yield '()' yield '()'
return return
yield '(' yield '('
if indent:
yield '\n'
yield ' ' * (_level * indent)
for i, a in enumerate(o): for i, a in enumerate(o):
for chunk in pprintgen(a, bprefix=bprefix): for chunk in pprintgen(a, bprefix=bprefix, indent=indent,
_level=_level + 1):
yield chunk yield chunk
if i + 1 < len(o): if i + 1 < len(o):
if indent:
yield ',\n'
yield ' ' * (_level * indent)
else:
yield ', ' yield ', '
if indent:
yield '\n'
yield ' ' * ((_level - 1) * indent)
yield ')' yield ')'
elif isinstance(o, types.GeneratorType): elif isinstance(o, types.GeneratorType):
# Special case of empty generator. # Special case of empty generator.
try: try:
nextitem = next(o) nextitem = next(o)
except StopIteration: except StopIteration:
yield 'gen[]' yield 'gen[]'
return return
yield 'gen[' yield 'gen['
if indent:
yield '\n'
yield ' ' * (_level * indent)
last = False last = False
while not last: while not last:
current = nextitem current = nextitem
try: try:
nextitem = next(o) nextitem = next(o)
except StopIteration: except StopIteration:
last = True last = True
for chunk in pprintgen(current, bprefix=bprefix): for chunk in pprintgen(current, bprefix=bprefix, indent=indent,
_level=_level + 1):
yield chunk yield chunk
if not last: if not last:
if indent:
yield ',\n'
yield ' ' * (_level * indent)
else:
yield ', ' yield ', '
if indent:
yield '\n'
yield ' ' * ((_level -1) * indent)
yield ']' yield ']'
else: else:
yield pycompat.byterepr(o) yield pycompat.byterepr(o)
def prettyrepr(o): def prettyrepr(o):
"""Pretty print a representation of a possibly-nested object""" """Pretty print a representation of a possibly-nested object"""
lines = [] lines = []
rs = pycompat.byterepr(o) rs = pycompat.byterepr(o)

tests/test-http-api-httpv2.t

s> \r\n s> \r\n
s> 32\r\n s> 32\r\n
s> *\x00\x00\x01\x00\x02\x012 s> *\x00\x00\x01\x00\x02\x012
s> \xa1FstatusBokX\x1dcustomreadonly bytes response s> \xa1FstatusBokX\x1dcustomreadonly bytes response
s> \r\n s> \r\n
received frame(size=42; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) received frame(size=42; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
s> 0\r\n s> 0\r\n
s> \r\n s> \r\n
response: [{b'status': b'ok'}, b'customreadonly bytes response'] response: [
{
b'status': b'ok'
},
b'customreadonly bytes response'
]
Request to read-write command fails because server is read-only by default Request to read-write command fails because server is read-only by default
GET to read-write request yields 405 GET to read-write request yields 405
$ sendhttpraw << EOF $ sendhttpraw << EOF
> httprequest GET api/$HTTPV2/rw/customreadonly > httprequest GET api/$HTTPV2/rw/customreadonly
> user-agent: test > user-agent: test

tests/test-http-protocol.t

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-0.1\r\n s> Content-Type: application/mercurial-0.1\r\n
s> Content-Length: 30\r\n s> Content-Length: 30\r\n
s> \r\n s> \r\n
s> bookmarks\t\n s> bookmarks\t\n
s> namespaces\t\n s> namespaces\t\n
s> phases\t s> phases\t
response: {b'bookmarks': b'', b'namespaces': b'', b'phases': b''} response: {
b'bookmarks': b'',
b'namespaces': b'',
b'phases': b''
}
Same thing, but with "httprequest" command Same thing, but with "httprequest" command
$ hg --verbose debugwireproto --peer raw http://$LOCALIP:$HGPORT << EOF $ hg --verbose debugwireproto --peer raw http://$LOCALIP:$HGPORT << EOF
> httprequest GET ?cmd=listkeys > httprequest GET ?cmd=listkeys
> user-agent: test > user-agent: test
> x-hgarg-1: namespace=namespaces > x-hgarg-1: namespace=namespaces
> EOF > EOF
s> makefile('rb', None) s> makefile('rb', None)
s> HTTP/1.1 200 Script output follows\r\n s> HTTP/1.1 200 Script output follows\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-0.1\r\n s> Content-Type: application/mercurial-0.1\r\n
s> Content-Length: 41\r\n s> Content-Length: 41\r\n
s> \r\n s> \r\n
s> 0000000000000000000000000000000000000000\n s> 0000000000000000000000000000000000000000\n
response: [b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'] response: [
b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
]
$ killdaemons.py $ killdaemons.py
$ enablehttpv2 empty $ enablehttpv2 empty
$ hg --config server.compressionengines=zlib -R empty serve -p $HGPORT -d --pid-file hg.pid $ hg --config server.compressionengines=zlib -R empty serve -p $HGPORT -d --pid-file hg.pid
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
Client with HTTPv2 enabled automatically upgrades if the server supports it Client with HTTPv2 enabled automatically upgrades if the server supports it
s> \r\n s> \r\n
s> 29\r\n s> 29\r\n
s> !\x00\x00\x01\x00\x02\x012 s> !\x00\x00\x01\x00\x02\x012
s> \xa1FstatusBok\x81T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 s> \xa1FstatusBok\x81T\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
s> \r\n s> \r\n
received frame(size=33; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) received frame(size=33; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
s> 0\r\n s> 0\r\n
s> \r\n s> \r\n
response: [b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'] response: [
b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
]
$ killdaemons.py $ killdaemons.py
HTTP client follows HTTP redirect on handshake to new repo HTTP client follows HTTP redirect on handshake to new repo
$ cd $TESTTMP $ cd $TESTTMP
$ hg init redirector $ hg init redirector
s> makefile('rb', None) s> makefile('rb', None)
s> HTTP/1.1 200 Script output follows\r\n s> HTTP/1.1 200 Script output follows\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-0.1\r\n s> Content-Type: application/mercurial-0.1\r\n
s> Content-Length: 41\r\n s> Content-Length: 41\r\n
s> \r\n s> \r\n
s> 96ee1d7354c4ad7372047672c36a1f561e3a6a4c\n s> 96ee1d7354c4ad7372047672c36a1f561e3a6a4c\n
response: [b'\x96\xee\x1dsT\xc4\xadsr\x04vr\xc3j\x1fV\x1e:jL'] response: [
b'\x96\xee\x1dsT\xc4\xadsr\x04vr\xc3j\x1fV\x1e:jL'
]
$ killdaemons.py $ killdaemons.py
Now test a variation where we strip the query string from the redirect URL. Now test a variation where we strip the query string from the redirect URL.
(SCM Manager apparently did this and clients would recover from it) (SCM Manager apparently did this and clients would recover from it)
$ hg --config extensions.redirect=$TESTTMP/redirectext.py \ $ hg --config extensions.redirect=$TESTTMP/redirectext.py \
> --config server.compressionengines=zlib \ > --config server.compressionengines=zlib \
s> makefile('rb', None) s> makefile('rb', None)
s> HTTP/1.1 200 Script output follows\r\n s> HTTP/1.1 200 Script output follows\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-0.1\r\n s> Content-Type: application/mercurial-0.1\r\n
s> Content-Length: 41\r\n s> Content-Length: 41\r\n
s> \r\n s> \r\n
s> 96ee1d7354c4ad7372047672c36a1f561e3a6a4c\n s> 96ee1d7354c4ad7372047672c36a1f561e3a6a4c\n
response: [b'\x96\xee\x1dsT\xc4\xadsr\x04vr\xc3j\x1fV\x1e:jL'] response: [
b'\x96\xee\x1dsT\xc4\xadsr\x04vr\xc3j\x1fV\x1e:jL'
]

tests/test-ssh-proto.t

i> write(10) -> 10: namespaces i> write(10) -> 10: namespaces
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 30\n o> 30\n
o> bufferedread(30) -> 30: o> bufferedread(30) -> 30:
o> bookmarks\t\n o> bookmarks\t\n
o> namespaces\t\n o> namespaces\t\n
o> phases\t o> phases\t
response: {b'bookmarks': b'', b'namespaces': b'', b'phases': b''} response: {
b'bookmarks': b'',
b'namespaces': b'',
b'phases': b''
}
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0001\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> write(10) -> 10: namespaces i> write(10) -> 10: namespaces
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 30\n o> 30\n
o> bufferedread(30) -> 30: o> bufferedread(30) -> 30:
o> bookmarks\t\n o> bookmarks\t\n
o> namespaces\t\n o> namespaces\t\n
o> phases\t o> phases\t
response: {b'bookmarks': b'', b'namespaces': b'', b'phases': b''} response: {
b'bookmarks': b'',
b'namespaces': b'',
b'phases': b''
}
$ cd .. $ cd ..
Test listkeys for bookmarks Test listkeys for bookmarks
$ hg init bookmarkrepo $ hg init bookmarkrepo
$ cd bookmarkrepo $ cd bookmarkrepo
$ echo 0 > foo $ echo 0 > foo
i> listkeys\n i> listkeys\n
i> write(12) -> 12: i> write(12) -> 12:
i> namespace 9\n i> namespace 9\n
i> write(9) -> 9: bookmarks i> write(9) -> 9: bookmarks
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 46\n o> 46\n
o> bufferedread(46) -> 46: bookA\t68986213bd4485ea51533535e3fc9e78007a711f o> bufferedread(46) -> 46: bookA\t68986213bd4485ea51533535e3fc9e78007a711f
response: {b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f'} response: {
b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f'
}
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0001\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> listkeys\n i> listkeys\n
i> write(12) -> 12: i> write(12) -> 12:
i> namespace 9\n i> namespace 9\n
i> write(9) -> 9: bookmarks i> write(9) -> 9: bookmarks
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 46\n o> 46\n
o> bufferedread(46) -> 46: bookA\t68986213bd4485ea51533535e3fc9e78007a711f o> bufferedread(46) -> 46: bookA\t68986213bd4485ea51533535e3fc9e78007a711f
response: {b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f'} response: {
b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f'
}
With multiple bookmarks set With multiple bookmarks set
$ hg book -r 1 bookB $ hg book -r 1 bookB
$ debugwireproto << EOF $ debugwireproto << EOF
> command listkeys > command listkeys
> namespace bookmarks > namespace bookmarks
> EOF > EOF
i> namespace 9\n i> namespace 9\n
i> write(9) -> 9: bookmarks i> write(9) -> 9: bookmarks
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 93\n o> 93\n
o> bufferedread(93) -> 93: o> bufferedread(93) -> 93:
o> bookA\t68986213bd4485ea51533535e3fc9e78007a711f\n o> bookA\t68986213bd4485ea51533535e3fc9e78007a711f\n
o> bookB\t1880f3755e2e52e3199e0ee5638128b08642f34d o> bookB\t1880f3755e2e52e3199e0ee5638128b08642f34d
response: {b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f', b'bookB': b'1880f3755e2e52e3199e0ee5638128b08642f34d'} response: {
b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f',
b'bookB': b'1880f3755e2e52e3199e0ee5638128b08642f34d'
}
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0001\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> namespace 9\n i> namespace 9\n
i> write(9) -> 9: bookmarks i> write(9) -> 9: bookmarks
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 93\n o> 93\n
o> bufferedread(93) -> 93: o> bufferedread(93) -> 93:
o> bookA\t68986213bd4485ea51533535e3fc9e78007a711f\n o> bookA\t68986213bd4485ea51533535e3fc9e78007a711f\n
o> bookB\t1880f3755e2e52e3199e0ee5638128b08642f34d o> bookB\t1880f3755e2e52e3199e0ee5638128b08642f34d
response: {b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f', b'bookB': b'1880f3755e2e52e3199e0ee5638128b08642f34d'} response: {
b'bookA': b'68986213bd4485ea51533535e3fc9e78007a711f',
b'bookB': b'1880f3755e2e52e3199e0ee5638128b08642f34d'
}
Test pushkey for bookmarks Test pushkey for bookmarks
$ debugwireproto << EOF $ debugwireproto << EOF
> command pushkey > command pushkey
> namespace bookmarks > namespace bookmarks
> key remote > key remote
> old > old
i> listkeys\n i> listkeys\n
i> write(12) -> 12: i> write(12) -> 12:
i> namespace 6\n i> namespace 6\n
i> write(6) -> 6: phases i> write(6) -> 6: phases
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 15\n o> 15\n
o> bufferedread(15) -> 15: publishing\tTrue o> bufferedread(15) -> 15: publishing\tTrue
response: {b'publishing': b'True'} response: {
b'publishing': b'True'
}
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0001\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> listkeys\n i> listkeys\n
i> write(12) -> 12: i> write(12) -> 12:
i> namespace 6\n i> namespace 6\n
i> write(6) -> 6: phases i> write(6) -> 6: phases
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 15\n o> 15\n
o> bufferedread(15) -> 15: publishing\tTrue o> bufferedread(15) -> 15: publishing\tTrue
response: {b'publishing': b'True'} response: {
b'publishing': b'True'
}
Create some commits Create some commits
$ echo 0 > foo $ echo 0 > foo
$ hg add foo $ hg add foo
$ hg -q commit -m initial $ hg -q commit -m initial
$ hg phase --public $ hg phase --public
$ echo 1 > foo $ echo 1 > foo
i> write(6) -> 6: phases i> write(6) -> 6: phases
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 4: o> bufferedreadline() -> 4:
o> 101\n o> 101\n
o> bufferedread(101) -> 101: o> bufferedread(101) -> 101:
o> 20b8a89289d80036e6c4e87c2083e3bea1586637\t1\n o> 20b8a89289d80036e6c4e87c2083e3bea1586637\t1\n
o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n
o> publishing\tTrue o> publishing\tTrue
response: {b'20b8a89289d80036e6c4e87c2083e3bea1586637': b'1', b'c4750011d906c18ea2f0527419cbc1a544435150': b'1', b'publishing': b'True'} response: {
b'20b8a89289d80036e6c4e87c2083e3bea1586637': b'1',
b'c4750011d906c18ea2f0527419cbc1a544435150': b'1',
b'publishing': b'True'
}
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0001\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> write(6) -> 6: phases i> write(6) -> 6: phases
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 4: o> bufferedreadline() -> 4:
o> 101\n o> 101\n
o> bufferedread(101) -> 101: o> bufferedread(101) -> 101:
o> 20b8a89289d80036e6c4e87c2083e3bea1586637\t1\n o> 20b8a89289d80036e6c4e87c2083e3bea1586637\t1\n
o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n
o> publishing\tTrue o> publishing\tTrue
response: {b'20b8a89289d80036e6c4e87c2083e3bea1586637': b'1', b'c4750011d906c18ea2f0527419cbc1a544435150': b'1', b'publishing': b'True'} response: {
b'20b8a89289d80036e6c4e87c2083e3bea1586637': b'1',
b'c4750011d906c18ea2f0527419cbc1a544435150': b'1',
b'publishing': b'True'
}
Single draft head Single draft head
$ hg phase --public -r 2 $ hg phase --public -r 2
$ debugwireproto << EOF $ debugwireproto << EOF
> command listkeys > command listkeys
> namespace phases > namespace phases
> EOF > EOF
i> namespace 6\n i> namespace 6\n
i> write(6) -> 6: phases i> write(6) -> 6: phases
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 58\n o> 58\n
o> bufferedread(58) -> 58: o> bufferedread(58) -> 58:
o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n
o> publishing\tTrue o> publishing\tTrue
response: {b'c4750011d906c18ea2f0527419cbc1a544435150': b'1', b'publishing': b'True'} response: {
b'c4750011d906c18ea2f0527419cbc1a544435150': b'1',
b'publishing': b'True'
}
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0001\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> namespace 6\n i> namespace 6\n
i> write(6) -> 6: phases i> write(6) -> 6: phases
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 58\n o> 58\n
o> bufferedread(58) -> 58: o> bufferedread(58) -> 58:
o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n o> c4750011d906c18ea2f0527419cbc1a544435150\t1\n
o> publishing\tTrue o> publishing\tTrue
response: {b'c4750011d906c18ea2f0527419cbc1a544435150': b'1', b'publishing': b'True'} response: {
b'c4750011d906c18ea2f0527419cbc1a544435150': b'1',
b'publishing': b'True'
}
All public heads All public heads
$ hg phase --public -r 4 $ hg phase --public -r 4
$ debugwireproto << EOF $ debugwireproto << EOF
> command listkeys > command listkeys
> namespace phases > namespace phases
> EOF > EOF
i> listkeys\n i> listkeys\n
i> write(12) -> 12: i> write(12) -> 12:
i> namespace 6\n i> namespace 6\n
i> write(6) -> 6: phases i> write(6) -> 6: phases
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 15\n o> 15\n
o> bufferedread(15) -> 15: publishing\tTrue o> bufferedread(15) -> 15: publishing\tTrue
response: {b'publishing': b'True'} response: {
b'publishing': b'True'
}
testing ssh2 testing ssh2
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(171) -> 171: i> write(171) -> 171:
i> upgrade * proto=exp-ssh-v2-0001\n (glob) i> upgrade * proto=exp-ssh-v2-0001\n (glob)
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> listkeys\n i> listkeys\n
i> write(12) -> 12: i> write(12) -> 12:
i> namespace 6\n i> namespace 6\n
i> write(6) -> 6: phases i> write(6) -> 6: phases
i> flush() -> None i> flush() -> None
o> bufferedreadline() -> 3: o> bufferedreadline() -> 3:
o> 15\n o> 15\n
o> bufferedread(15) -> 15: publishing\tTrue o> bufferedread(15) -> 15: publishing\tTrue
response: {b'publishing': b'True'} response: {
b'publishing': b'True'
}
Setting public phase via pushkey Setting public phase via pushkey
$ hg phase --draft --force -r . $ hg phase --draft --force -r .
$ debugwireproto << EOF $ debugwireproto << EOF
> command pushkey > command pushkey
> namespace phases > namespace phases

tests/test-wireproto-command-branchmap.t

s> 83\r\n s> 83\r\n
s> {\x00\x00\x01\x00\x02\x012 s> {\x00\x00\x01\x00\x02\x012
s> \xa1FstatusBok\xa3Gbranch1\x81T\xb5\xfa\xac\xdf\xd2c7h\xcb1R3l\xc0\x953\x81&f\x88Gbranch2\x81T"Aa\xc7X\x9a\xa4\x8f\xa8:H\xfe\xff^\x95\xb5j\xe3\'\xfcGdefault\x82T&\x80Z\xba\x1e`\n s> \xa1FstatusBok\xa3Gbranch1\x81T\xb5\xfa\xac\xdf\xd2c7h\xcb1R3l\xc0\x953\x81&f\x88Gbranch2\x81T"Aa\xc7X\x9a\xa4\x8f\xa8:H\xfe\xff^\x95\xb5j\xe3\'\xfcGdefault\x82T&\x80Z\xba\x1e`\n
s> \x82\xe96a\x14\x9f#\x13\x86j"\x1a{T\xbe\x0e\xf7<\x17\xad\xe3\xfc\x89\xdcAp\x1e\xb9\xfc:\x91\xb5\x82\x82 s> \x82\xe96a\x14\x9f#\x13\x86j"\x1a{T\xbe\x0e\xf7<\x17\xad\xe3\xfc\x89\xdcAp\x1e\xb9\xfc:\x91\xb5\x82\x82
s> \r\n s> \r\n
received frame(size=123; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) received frame(size=123; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
s> 0\r\n s> 0\r\n
s> \r\n s> \r\n
response: {b'branch1': [b'\xb5\xfa\xac\xdf\xd2c7h\xcb1R3l\xc0\x953\x81&f\x88'], b'branch2': [b'"Aa\xc7X\x9a\xa4\x8f\xa8:H\xfe\xff^\x95\xb5j\xe3\'\xfc'], b'default': [b'&\x80Z\xba\x1e`\n\x82\xe96a\x14\x9f#\x13\x86j"\x1a{', b'\xbe\x0e\xf7<\x17\xad\xe3\xfc\x89\xdcAp\x1e\xb9\xfc:\x91\xb5\x82\x82']} response: {
b'branch1': [
b'\xb5\xfa\xac\xdf\xd2c7h\xcb1R3l\xc0\x953\x81&f\x88'
],
b'branch2': [
b'"Aa\xc7X\x9a\xa4\x8f\xa8:H\xfe\xff^\x95\xb5j\xe3\'\xfc'
],
b'default': [
b'&\x80Z\xba\x1e`\n\x82\xe96a\x14\x9f#\x13\x86j"\x1a{',
b'\xbe\x0e\xf7<\x17\xad\xe3\xfc\x89\xdcAp\x1e\xb9\xfc:\x91\xb5\x82\x82'
]
}
$ cat error.log $ cat error.log

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> \xa3Dapis\xa0GapibaseDapi/Nv1capabilitiesY\x01\xc5batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ 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> \xa3Dapis\xa0GapibaseDapi/Nv1capabilitiesY\x01\xc5batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ 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> {b'apibase': b'api/', b'apis': {}, b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ 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> {
b'apibase': b'api/',
b'apis': {},
b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ 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> \xa3Dapis\xa0GapibaseDapi/Nv1capabilitiesY\x01\xc5batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ 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> \xa3Dapis\xa0GapibaseDapi/Nv1capabilitiesY\x01\xc5batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ 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> {b'apibase': b'api/', b'apis': {}, b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ 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> {
b'apibase': b'api/',
b'apis': {},
b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ 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-0001 foo bar > x-hgupgrade-1: exp-http-v2-0001 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> \xa3Dapis\xa1Pexp-http-v2-0001\xa4Hcommands\xa7Eheads\xa2Dargs\xa1Jpubliconly\xf4Kpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\x81HdeadbeefKpermissions\x81DpullFlookup\xa2Dargs\xa1CkeyCfooKpermissions\x81DpullGpushkey\xa2Dargs\xa4CkeyCkeyCnewCnewColdColdInamespaceBnsKpermissions\x81DpushHlistkeys\xa2Dargs\xa1InamespaceBnsKpermissions\x81DpullIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullKcompression\x81\xa1DnameDzlibNrawrepoformats\x82LgeneraldeltaHrevlogv1Qframingmediatypes\x81X&application/mercurial-exp-framing-0005GapibaseDapi/Nv1capabilitiesY\x01\xc5batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ 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> \xa3Dapis\xa1Pexp-http-v2-0001\xa4Hcommands\xa7Eheads\xa2Dargs\xa1Jpubliconly\xf4Kpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\x81HdeadbeefKpermissions\x81DpullFlookup\xa2Dargs\xa1CkeyCfooKpermissions\x81DpullGpushkey\xa2Dargs\xa4CkeyCkeyCnewCnewColdColdInamespaceBnsKpermissions\x81DpushHlistkeys\xa2Dargs\xa1InamespaceBnsKpermissions\x81DpullIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullKcompression\x81\xa1DnameDzlibNrawrepoformats\x82LgeneraldeltaHrevlogv1Qframingmediatypes\x81X&application/mercurial-exp-framing-0005GapibaseDapi/Nv1capabilitiesY\x01\xc5batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ 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> {b'apibase': b'api/', b'apis': {b'exp-http-v2-0001': {b'commands': {b'branchmap': {b'args': {}, b'permissions': [b'pull']}, b'capabilities': {b'args': {}, b'permissions': [b'pull']}, b'heads': {b'args': {b'publiconly': False}, b'permissions': [b'pull']}, b'known': {b'args': {b'nodes': [b'deadbeef']}, b'permissions': [b'pull']}, b'listkeys': {b'args': {b'namespace': b'ns'}, b'permissions': [b'pull']}, b'lookup': {b'args': {b'key': b'foo'}, b'permissions': [b'pull']}, b'pushkey': {b'args': {b'key': b'key', b'namespace': b'ns', b'new': b'new', b'old': b'old'}, b'permissions': [b'push']}}, b'compression': [{b'name': b'zlib'}], b'framingmediatypes': [b'application/mercurial-exp-framing-0005'], b'rawrepoformats': [b'generaldelta', b'revlogv1']}}, b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ 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> {
b'apibase': b'api/',
b'apis': {
b'exp-http-v2-0001': {
b'commands': {
b'branchmap': {
b'args': {},
b'permissions': [
b'pull'
]
},
b'capabilities': {
b'args': {},
b'permissions': [
b'pull'
]
},
b'heads': {
b'args': {
b'publiconly': False
},
b'permissions': [
b'pull'
]
},
b'known': {
b'args': {
b'nodes': [
b'deadbeef'
]
},
b'permissions': [
b'pull'
]
},
b'listkeys': {
b'args': {
b'namespace': b'ns'
},
b'permissions': [
b'pull'
]
},
b'lookup': {
b'args': {
b'key': b'foo'
},
b'permissions': [
b'pull'
]
},
b'pushkey': {
b'args': {
b'key': b'key',
b'namespace': b'ns',
b'new': b'new',
b'old': b'old'
},
b'permissions': [
b'push'
]
}
},
b'compression': [
{
b'name': b'zlib'
}
],
b'framingmediatypes': [
b'application/mercurial-exp-framing-0005'
],
b'rawrepoformats': [
b'generaldelta',
b'revlogv1'
]
}
},
b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS_SERVER$ 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
s> \r\n s> \r\n
s> 1d7\r\n s> 1d7\r\n
s> \xcf\x01\x00\x01\x00\x02\x012 s> \xcf\x01\x00\x01\x00\x02\x012
s> \xa1FstatusBok\xa4Hcommands\xa7Eheads\xa2Dargs\xa1Jpubliconly\xf4Kpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\x81HdeadbeefKpermissions\x81DpullFlookup\xa2Dargs\xa1CkeyCfooKpermissions\x81DpullGpushkey\xa2Dargs\xa4CkeyCkeyCnewCnewColdColdInamespaceBnsKpermissions\x81DpushHlistkeys\xa2Dargs\xa1InamespaceBnsKpermissions\x81DpullIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullKcompression\x81\xa1DnameDzlibNrawrepoformats\x82LgeneraldeltaHrevlogv1Qframingmediatypes\x81X&application/mercurial-exp-framing-0005 s> \xa1FstatusBok\xa4Hcommands\xa7Eheads\xa2Dargs\xa1Jpubliconly\xf4Kpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\x81HdeadbeefKpermissions\x81DpullFlookup\xa2Dargs\xa1CkeyCfooKpermissions\x81DpullGpushkey\xa2Dargs\xa4CkeyCkeyCnewCnewColdColdInamespaceBnsKpermissions\x81DpushHlistkeys\xa2Dargs\xa1InamespaceBnsKpermissions\x81DpullIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullKcompression\x81\xa1DnameDzlibNrawrepoformats\x82LgeneraldeltaHrevlogv1Qframingmediatypes\x81X&application/mercurial-exp-framing-0005
s> \r\n s> \r\n
received frame(size=463; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) received frame(size=463; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
s> 0\r\n s> 0\r\n
s> \r\n s> \r\n
response: [{b'status': b'ok'}, {b'commands': {b'branchmap': {b'args': {}, b'permissions': [b'pull']}, b'capabilities': {b'args': {}, b'permissions': [b'pull']}, b'heads': {b'args': {b'publiconly': False}, b'permissions': [b'pull']}, b'known': {b'args': {b'nodes': [b'deadbeef']}, b'permissions': [b'pull']}, b'listkeys': {b'args': {b'namespace': b'ns'}, b'permissions': [b'pull']}, b'lookup': {b'args': {b'key': b'foo'}, b'permissions': [b'pull']}, b'pushkey': {b'args': {b'key': b'key', b'namespace': b'ns', b'new': b'new', b'old': b'old'}, b'permissions': [b'push']}}, b'compression': [{b'name': b'zlib'}], b'framingmediatypes': [b'application/mercurial-exp-framing-0005'], b'rawrepoformats': [b'generaldelta', b'revlogv1']}] response: [
{
b'status': b'ok'
},
{
b'commands': {
b'branchmap': {
b'args': {},
b'permissions': [
b'pull'
]
},
b'capabilities': {
b'args': {},
b'permissions': [
b'pull'
]
},
b'heads': {
b'args': {
b'publiconly': False
},
b'permissions': [
b'pull'
]
},
b'known': {
b'args': {
b'nodes': [
b'deadbeef'
]
},
b'permissions': [
b'pull'
]
},
b'listkeys': {
b'args': {
b'namespace': b'ns'
},
b'permissions': [
b'pull'
]
},
b'lookup': {
b'args': {
b'key': b'foo'
},
b'permissions': [
b'pull'
]
},
b'pushkey': {
b'args': {
b'key': b'key',
b'namespace': b'ns',
b'new': b'new',
b'old': b'old'
},
b'permissions': [
b'push'
]
}
},
b'compression': [
{
b'name': b'zlib'
}
],
b'framingmediatypes': [
b'application/mercurial-exp-framing-0005'
],
b'rawrepoformats': [
b'generaldelta',
b'revlogv1'
]
}
]
$ cat error.log $ cat error.log

tests/test-wireproto-command-heads.t

s> \r\n s> \r\n
s> 53\r\n s> 53\r\n
s> K\x00\x00\x01\x00\x02\x012 s> K\x00\x00\x01\x00\x02\x012
s> \xa1FstatusBok\x83T\x1dok\x91\xd4J\xab\xa6\xd5\xe5\x80\xbc0\xa9\x94\x850\xdb\xe0\x0bT\xaeI.6\xb0\xc83\x9f\xfa\xf3(\xd0\x0b\x85\xb4R]\xe1\x16^T)Dm-\xc5A\x9c_\x97Dz\x8b\xc0b\xe4\xcc2\x8b\xf2A s> \xa1FstatusBok\x83T\x1dok\x91\xd4J\xab\xa6\xd5\xe5\x80\xbc0\xa9\x94\x850\xdb\xe0\x0bT\xaeI.6\xb0\xc83\x9f\xfa\xf3(\xd0\x0b\x85\xb4R]\xe1\x16^T)Dm-\xc5A\x9c_\x97Dz\x8b\xc0b\xe4\xcc2\x8b\xf2A
s> \r\n s> \r\n
received frame(size=75; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) received frame(size=75; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
s> 0\r\n s> 0\r\n
s> \r\n s> \r\n
response: [b'\x1dok\x91\xd4J\xab\xa6\xd5\xe5\x80\xbc0\xa9\x94\x850\xdb\xe0\x0b', b'\xaeI.6\xb0\xc83\x9f\xfa\xf3(\xd0\x0b\x85\xb4R]\xe1\x16^', b')Dm-\xc5A\x9c_\x97Dz\x8b\xc0b\xe4\xcc2\x8b\xf2A'] response: [
b'\x1dok\x91\xd4J\xab\xa6\xd5\xe5\x80\xbc0\xa9\x94\x850\xdb\xe0\x0b',
b'\xaeI.6\xb0\xc83\x9f\xfa\xf3(\xd0\x0b\x85\xb4R]\xe1\x16^',
b')Dm-\xc5A\x9c_\x97Dz\x8b\xc0b\xe4\xcc2\x8b\xf2A'
]
Requesting just the public heads works Requesting just the public heads works
$ sendhttpv2peer << EOF $ sendhttpv2peer << EOF
> command heads > command heads
> publiconly 1 > publiconly 1
> EOF > EOF
creating http peer for wire protocol version 2 creating http peer for wire protocol version 2
s> \r\n s> \r\n
s> 29\r\n s> 29\r\n
s> !\x00\x00\x01\x00\x02\x012 s> !\x00\x00\x01\x00\x02\x012
s> \xa1FstatusBok\x81Tx\xd2\xdc\xa46\xb2\xf5\xb1\x88\xac&~)\xb8\x1e\x07&m8\xfc s> \xa1FstatusBok\x81Tx\xd2\xdc\xa46\xb2\xf5\xb1\x88\xac&~)\xb8\x1e\x07&m8\xfc
s> \r\n s> \r\n
received frame(size=33; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) received frame(size=33; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
s> 0\r\n s> 0\r\n
s> \r\n s> \r\n
response: [b'x\xd2\xdc\xa46\xb2\xf5\xb1\x88\xac&~)\xb8\x1e\x07&m8\xfc'] response: [
b'x\xd2\xdc\xa46\xb2\xf5\xb1\x88\xac&~)\xb8\x1e\x07&m8\xfc'
]
$ cat error.log $ cat error.log

tests/test-wireproto-command-known.t

s> \r\n s> \r\n
s> 15\r\n s> 15\r\n
s> \r\x00\x00\x01\x00\x02\x012 s> \r\x00\x00\x01\x00\x02\x012
s> \xa1FstatusBokA1 s> \xa1FstatusBokA1
s> \r\n s> \r\n
received frame(size=13; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) received frame(size=13; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
s> 0\r\n s> 0\r\n
s> \r\n s> \r\n
response: [True] response: [
True
]
Multiple nodes works Multiple nodes works
$ sendhttpv2peer << EOF $ sendhttpv2peer << EOF
> command known > command known
> nodes eval:[b'\x42\x6b\xad\xa5\xc6\x75\x98\xca\x65\x03\x6d\x57\xd9\xe4\xb6\x4b\x0c\x1c\xe7\xa0', b'00000000000000000000', b'\x11\x24\x78\x96\x29\x61\x14\x71\x24\xed\xd4\x35\x49\xae\xdd\x1a\x33\x5e\x44\xbf'] > nodes eval:[b'\x42\x6b\xad\xa5\xc6\x75\x98\xca\x65\x03\x6d\x57\xd9\xe4\xb6\x4b\x0c\x1c\xe7\xa0', b'00000000000000000000', b'\x11\x24\x78\x96\x29\x61\x14\x71\x24\xed\xd4\x35\x49\xae\xdd\x1a\x33\x5e\x44\xbf']
> EOF > EOF
creating http peer for wire protocol version 2 creating http peer for wire protocol version 2
s> \r\n s> \r\n
s> 17\r\n s> 17\r\n
s> \x0f\x00\x00\x01\x00\x02\x012 s> \x0f\x00\x00\x01\x00\x02\x012
s> \xa1FstatusBokC101 s> \xa1FstatusBokC101
s> \r\n s> \r\n
received frame(size=15; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) received frame(size=15; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
s> 0\r\n s> 0\r\n
s> \r\n s> \r\n
response: [True, False, True] response: [
True,
False,
True
]
$ cat error.log $ cat error.log

tests/test-wireproto-command-listkeys.t

s> \r\n s> \r\n
s> 33\r\n s> 33\r\n
s> +\x00\x00\x01\x00\x02\x012 s> +\x00\x00\x01\x00\x02\x012
s> \xa1FstatusBok\xa3Fphases@Ibookmarks@Jnamespaces@ s> \xa1FstatusBok\xa3Fphases@Ibookmarks@Jnamespaces@
s> \r\n s> \r\n
received frame(size=43; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) received frame(size=43; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
s> 0\r\n s> 0\r\n
s> \r\n s> \r\n
response: {b'bookmarks': b'', b'namespaces': b'', b'phases': b''} response: {
b'bookmarks': b'',
b'namespaces': b'',
b'phases': b''
}
Request for phases works Request for phases works
$ sendhttpv2peer << EOF $ sendhttpv2peer << EOF
> command listkeys > command listkeys
> namespace phases > namespace phases
> EOF > EOF
creating http peer for wire protocol version 2 creating http peer for wire protocol version 2
s> \r\n s> \r\n
s> 50\r\n s> 50\r\n
s> H\x00\x00\x01\x00\x02\x012 s> H\x00\x00\x01\x00\x02\x012
s> \xa1FstatusBok\xa2JpublishingDTrueX(be0ef73c17ade3fc89dc41701eb9fc3a91b58282A1 s> \xa1FstatusBok\xa2JpublishingDTrueX(be0ef73c17ade3fc89dc41701eb9fc3a91b58282A1
s> \r\n s> \r\n
received frame(size=72; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) received frame(size=72; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
s> 0\r\n s> 0\r\n
s> \r\n s> \r\n
response: {b'be0ef73c17ade3fc89dc41701eb9fc3a91b58282': b'1', b'publishing': b'True'} response: {
b'be0ef73c17ade3fc89dc41701eb9fc3a91b58282': b'1',
b'publishing': b'True'
}
Request for bookmarks works Request for bookmarks works
$ sendhttpv2peer << EOF $ sendhttpv2peer << EOF
> command listkeys > command listkeys
> namespace bookmarks > namespace bookmarks
> EOF > EOF
creating http peer for wire protocol version 2 creating http peer for wire protocol version 2
s> \r\n s> \r\n
s> 40\r\n s> 40\r\n
s> 8\x00\x00\x01\x00\x02\x012 s> 8\x00\x00\x01\x00\x02\x012
s> \xa1FstatusBok\xa1A@X(26805aba1e600a82e93661149f2313866a221a7b s> \xa1FstatusBok\xa1A@X(26805aba1e600a82e93661149f2313866a221a7b
s> \r\n s> \r\n
received frame(size=56; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) received frame(size=56; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
s> 0\r\n s> 0\r\n
s> \r\n s> \r\n
response: {b'@': b'26805aba1e600a82e93661149f2313866a221a7b'} response: {
b'@': b'26805aba1e600a82e93661149f2313866a221a7b'
}
$ cat error.log $ cat error.log

tests/test-wireproto-command-pushkey.t

s> \r\n s> \r\n
s> 40\r\n s> 40\r\n
s> 8\x00\x00\x01\x00\x02\x012 s> 8\x00\x00\x01\x00\x02\x012
s> \xa1FstatusBok\xa1A@X(426bada5c67598ca65036d57d9e4b64b0c1ce7a0 s> \xa1FstatusBok\xa1A@X(426bada5c67598ca65036d57d9e4b64b0c1ce7a0
s> \r\n s> \r\n
received frame(size=56; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos) received frame(size=56; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=eos)
s> 0\r\n s> 0\r\n
s> \r\n s> \r\n
response: {b'@': b'426bada5c67598ca65036d57d9e4b64b0c1ce7a0'} response: {
b'@': b'426bada5c67598ca65036d57d9e4b64b0c1ce7a0'
}
$ cat error.log $ cat error.log