This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7407

debugcommands: add assertions to convince pytype peer is not None
ClosedPublic

Authored by durin42 on Nov 14 2019, 4:10 PM.

Details

Reviewers
dlax
indygreg
Group Reviewers
hg-reviewers
Commits
rHG23ad4f0c1578: debugcommands: add assertions to convince pytype peer is not None
Summary

This function is moderately annoyingly defined, and peer is set up iff we're
not in raw-proto mode. That's fine, but it confuses pytype. Adding these
assertions is a low-overhead way to convince pytype we're doing reasonable
things.

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

durin42 created this revision.Nov 14 2019, 4:10 PM
dlax accepted this revision.Nov 15 2019, 6:11 AM
durin42 updated this revision to Diff 18158.Nov 15 2019, 11:32 AM
indygreg accepted this revision.Nov 18 2019, 10:45 PM
This revision is now accepted and ready to land.Nov 18 2019, 10:45 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (2 lines)

Diff 18227

mercurial/debugcommands.py

elif action == b'batchsubmit': elif action == b'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
# difficult to normalize requests into function calls. It is easier # difficult to normalize requests into function calls. It is easier
# to bypass this layer and normalize to commands + args. # to bypass this layer and normalize to commands + args.
ui.status( ui.status(
_(b'sending batch with %d sub-commands\n') _(b'sending batch with %d sub-commands\n')
% len(batchedcommands) % len(batchedcommands)
) )
assert peer is not None
for i, chunk in enumerate(peer._submitbatch(batchedcommands)): for i, chunk in enumerate(peer._submitbatch(batchedcommands)):
ui.status( ui.status(
_(b'response #%d: %s\n') % (i, stringutil.escapestr(chunk)) _(b'response #%d: %s\n') % (i, stringutil.escapestr(chunk))
) )
batchedcommands = None batchedcommands = None
elif action.startswith(b'httprequest '): elif action.startswith(b'httprequest '):
ui.write( ui.write(
_(b'cbor> %s\n') _(b'cbor> %s\n')
% stringutil.pprint( % stringutil.pprint(
cborutil.decodeall(body), bprefix=True, indent=2 cborutil.decodeall(body), bprefix=True, indent=2
) )
) )
elif action == b'close': elif action == b'close':
assert peer is not None
peer.close() peer.close()
elif action == b'readavailable': elif action == b'readavailable':
if not stdout or not stderr: if not stdout or not stderr:
raise error.Abort( raise error.Abort(
_(b'readavailable not available on this peer') _(b'readavailable not available on this peer')
) )
stdin.close() stdin.close()