This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2406

debugcommands: allow sending of simple commands with debugwireproto
ClosedPublic

Authored by indygreg on Feb 23 2018, 2:01 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGbde0bd50f368: debugcommands: allow sending of simple commands with debugwireproto
rHG2aeacc6b479d: debugcommands: allow sending of simple commands with debugwireproto
Summary

Previously, we only had support for low-level "raw" operations.

A goal of hg debugwireproto is to allow easily performing
higher-level primitives, such as sending a wire protocol command
and reading its response.

We implement a "command" action that does just this.

Currently, we only support simple commands (those without payloads).
We have basic support for sending command arguments. We don't yet
support sending dictionary arguments. This will be implemented later.

To prove it works, we add tests to test-ssh-proto.t that send some
"listkeys" commands.

Note: we don't observe/report os.read() events because these may not be
deterministic. We instead observe/report the read() and readline()
operations on the bufferedinputpipe. These *should* be deterministic.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 23 2018, 2:01 PM
indygreg edited the summary of this revision. (Show Details)Feb 23 2018, 3:51 PM
indygreg added a child revision: D2408: debugcommands: support for sending "batch" requests.
indygreg updated this revision to Diff 6026.
indygreg updated this revision to Diff 6141.Feb 26 2018, 4:16 PM
indygreg updated this revision to Diff 6252.Mar 1 2018, 11:30 AM
durin42 accepted this revision.Mar 1 2018, 4:37 PM
This revision is now accepted and ready to land.Mar 1 2018, 4:37 PM
Closed by commit rHG2aeacc6b479d: debugcommands: allow sending of simple commands with debugwireproto (authored by indygreg). · Explain WhyMar 1 2018, 4:55 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (33 lines)

Diff 6023

mercurial/debugcommands.py

value is evaluated as a Python b'' literal. This allows the use of value is evaluated as a Python b'' literal. This allows the use of
backslash escaping, etc. backslash escaping, etc.
raw+ raw+
---- ----
Behaves like ``raw`` except flushes output afterwards. Behaves like ``raw`` except flushes output afterwards.
command <X>
-----------
Send a request to run a named command, whose name follows the ``command``
string.
Arguments to the command are defined as lines in this block. The format of
each line is ``<key> <value>``. e.g.::
command listkeys
namespace bookmarks
Values are interpreted as Python b'' literals. This allows encoding
special byte sequences via backslash escaping.
close close
----- -----
Close the connection to the server. Close the connection to the server.
flush flush
----- -----
data = ''.join(l.lstrip() for l in lines) data = ''.join(l.lstrip() for l in lines)
data = ast.literal_eval(b'''b"%s"''' % data) data = ast.literal_eval(b'''b"%s"''' % data)
stdin.write(data) stdin.write(data)
if action == 'raw+': if action == 'raw+':
stdin.flush() stdin.flush()
elif action == 'flush': elif action == 'flush':
stdin.flush() stdin.flush()
elif action.startswith('command'):
if not peer:
raise error.Abort(_('cannot send commands unless peer instance '
'is available'))
command = action.split(' ', 1)[1]
args = {}
for line in lines:
fields = line.lstrip().split()
if len(fields) == 2:
key, value = fields
args[key] = ast.literal_eval(b'b"%s"' % value)
else:
raise error.Abort(_('value-less arguments not supported'))
peer._call(command, **args)
elif action == 'close': elif action == 'close':
peer.close() peer.close()
elif action == 'readavailable': elif action == 'readavailable':
fds = util.poll([stdout.fileno(), stderr.fileno()]) fds = util.poll([stdout.fileno(), stderr.fileno()])
if stdout.fileno() in fds: if stdout.fileno() in fds:
util.readpipe(stdout) util.readpipe(stdout)
if stderr.fileno() in fds: if stderr.fileno() in fds: