This is an archive of the discontinued Mercurial Phabricator instance.

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

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

Download Raw Diff

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

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

durin42 created this revision.Nov 14 2019, 4:10 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptNov 14 2019, 4:10 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

durin42 added a child revision: D7408: extensions: hide two confusing import statements from pytype.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

durin42 added a commit: rHG23ad4f0c1578: debugcommands: add assertions to convince pytype peer is not None.Nov 18 2019, 10:50 PM

Closed by commit rHG23ad4f0c1578: debugcommands: add assertions to convince pytype peer is not None (authored by durin42). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/debugcommands.py (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	18100		Nov 14 2019, 4:10 PM	★	★
Diff 2	18158		Nov 15 2019, 11:32 AM	★	★
Diff 3	18227	rHG23ad4f0c1578b2c1048ade3629291cd819e83784	Nov 14 2019, 1:27 PM	★	★

Commit	Parents	Author	Summary	Date
a2f5e084aefd	e55a5a246b86	Augie Fackler		Nov 14 2019, 1:27 PM

Status	Author	Revision
Closed	durin42	D7406 scmutil: convert status data object from a tuple to an attrs (API)
Closed	durin42	D7405 perf: bool() elements of dirstate.status return instead of len()
Closed	durin42	D7404 tags: use field names instead of field numbers on scmutil.status
Closed	durin42	D7403 subrepo: use field names instead of field numbers on scmutil.status
Closed	durin42	D7402 revset: use field names instead of field numbers on scmutil.status
Closed	durin42	D7401 patch: use field names instead of field numbers on scmutil.status
Closed	durin42	D7400 logcmdutil: use field names instead of field numbers on scmutil.status
Closed	durin42	D7399 context: use field names instead of field numbers on scmutil.status
Closed	durin42	D7398 commands: use field names instead of field numbers on scmutil.status
Closed	durin42	D7397 cmdutil: convert terse status result back to an scmutil.status
Closed	durin42	D7396 cmdutil: use field names instead of field numbers on scmutil.status
Closed	durin42	D7395 uncommit: use field names instead of field numbers on scmutil.status
Closed	durin42	D7394 transplant: use field names instead of field numbers on scmutil.status
Closed	durin42	D7393 split: use field names instead of field numbers on scmutil.status
Closed	durin42	D7392 mq: use field names instead of field numbers on scmutil.status
Closed	durin42	D7391 hgk: use field names instead of field numbers on scmutil.status
Closed	durin42	D7390 extdiff: use field names instead of field numbers on scmutil.status
Closed	durin42	D7294 cmdutil: suppress bogus pytype errors
Closed	durin42	D7293 changegroup: suppress pytype error that's wrong
Closed	durin42	D7292 changegroup: avoid shadowing a set with an int
Closed	durin42	D7291 bundle2: more pytype suppressions around bytestring
Closed	durin42	D7290 branchmap: pytype is confused about bytestr
Closed	durin42	D7383 state: add a pytype annotation
Closed	durin42	D7382 logcmdutil: add a type annotation
Closed	durin42	D7381 cmdutil: add a pytype annotation to help out some callsites
Abandoned	durin42	D7297 cleanup: remove now-obsolete wrong-arg-type annotations
Abandoned	durin42	D7380 encoding: define per-use identity functions only in typechecking mode
Closed	durin42	D7410 extensions: suppress a pytype failure due to a typeshed bug
Closed	durin42	D7409 dispatch: add some assertions to give pytype a helping hand
Closed	durin42	D7408 extensions: hide two confusing import statements from pytype
Closed	durin42	D7407 debugcommands: add assertions to convince pytype peer is not None
Closed	durin42	D7385 debugcommands: suppress import errors for pytype
Changes Planned	mharbison72	D7515 pytype: [WIP] suppress various warnings inline to get a clean run
Needs Revision	durin42	D7295 pytype: add a (very slow) test that executes pytype
Needs Revision	durin42	D7384 commands: necessary annotations and suppresssions to pass pytype
Changes Planned	durin42	D7296 pycompat: kludge around pytype being confused by __new__
Closed	durin42	D7379 encoding: fix bad type annotation
Closed	durin42	D7389 branchmap: annotate constructor type for branchcache
Closed	durin42	D7378 debugcommands: don't shadow the error module
Closed	durin42	D7289 branchmap: correctly set()-ify list argument

Diff 18158

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()