This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10211

typing: add an assertion to mercurial/hgweb/webcommands.py to help pytype
ClosedPublic

Authored by mharbison72 on Mar 13 2021, 2:33 PM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG914ca0a98518: typing: add an assertion to mercurial/hgweb/webcommands.py to help pytype

Summary

I have no idea why this is needed, given the check immediately above. But
without it, I'm getting this:

File "/mnt/c/Users/Matt/hg/mercurial/hgweb/webcommands.py", line 1164, in filelog: Missing parameter 'toline' in call to function mercurial.dagop.blockdescendants [missing-parameter]
         Expected: (fctx, fromline, toline)
  Actually passed: (fctx, fromline)
File "/mnt/c/Users/Matt/hg/mercurial/hgweb/webcommands.py", line 1166, in filelog: Missing parameter 'toline' in call to function mercurial.dagop.blockancestors [missing-parameter]
         Expected: (fctx, fromline, toline, followfirst)
  Actually passed: (fctx, fromline)

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

mharbison72 created this revision.Mar 13 2021, 2:33 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 13 2021, 2:33 PM

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

mharbison72 added a child revision: D10212: typing: add an assertion to verify.py to appease pytype.Mar 13 2021, 2:34 PM

pulkit accepted this revision.Mar 18 2021, 2:58 PM

This revision is now accepted and ready to land.Mar 18 2021, 2:58 PM

mharbison72 added a commit: rHG914ca0a98518: typing: add an assertion to mercurial/hgweb/webcommands.py to help pytype.Mar 18 2021, 5:06 PM

Closed by commit rHG914ca0a98518: typing: add an assertion to mercurial/hgweb/webcommands.py to help pytype (authored by mharbison72). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/hgweb/webcommands.py (1 line)

Status	Author	Revision
Closed	mharbison72	D10215 typing: rewrite a conditional assignment to unconfuse pytype
Closed	mharbison72	D10214 typing: add assertions to localrepo.py to appease pytype
Closed	mharbison72	D10213 obsutil: maintain a homogenous list when computing successors
Closed	mharbison72	D10212 typing: add an assertion to verify.py to appease pytype
Closed	mharbison72	D10211 typing: add an assertion to mercurial/hgweb/webcommands.py to help pytype
Closed	mharbison72	D10210 crecord: null out the curses attribute with `None` on failure to import
Closed	mharbison72	D10209 typing: fix directives mangled by black
Closed	mharbison72	D10208 typing: disable module attribute warnings for properly conditionalized code
Closed	mharbison72	D10207 typing: disable import error warnings that are already handled
Closed	mharbison72	D10206 typing: disable a few errors when accessing Windows specific attributes
Closed	mharbison72	D10205 typing: disable a few errors calling py3.7+ functions in resourceutil.py
Closed	mharbison72	D10204 wsgicgi: switch the default PATH_INFO back to str
Closed	mharbison72	D10203 crecord: convert an instance of bytes to str
Closed	mharbison72	D10202 crecord: change str literals to byte literals
Closed	mharbison72	D10201 bisect: replace a missing method on the list primitive
Closed	mharbison72	D10183 typing: disable a module-attr warning in the worker module's py2 code
Closed	mharbison72	D10182 wireprotoserver: convert ErrorResponse to bytes
Closed	mharbison72	D10181 verify: convert an exception to bytes before logging
Closed	mharbison72	D10180 typing: add an assertion to the upgrade engine to help pytype
Closed	mharbison72	D10179 subrepo: handle unexpected file types from git gracefully
Closed	mharbison72	D10178 patch: convert a UI message to bytes when editing a patch
Closed	mharbison72	D10177 merge: force an exception message to bytes before printing as a warning
Closed	mharbison72	D10176 hg: convert an exception to bytes in the repo creation exception handler
Closed	mharbison72	D10175 typing: add an assertion instead of blacklisting mercurial/extensions.py
Closed	mharbison72	D10174 debug: convert a few exceptions to bytes before wrapping in another error
Closed	mharbison72	D10173 grep: convert an exception to bytes for a warning message
Closed	mharbison72	D10172 morestatus: convert a UI message about merge conflicts to bytes
Closed	mharbison72	D10171 changegroup: convert a warning message to bytes
Closed	mharbison72	D10170 branchmap: force Exception to bytes before logging
Closed	mharbison72	D10169 nodemap: convert error message to bytes
Closed	mharbison72	D10168 mail: convert SMTPException to bytes before passing to error.Abort()
Closed	mharbison72	D10167 typing: switch an argument type to the generic form
Closed	mharbison72	D10166 typing: ensure that error.Abort is given bytes
Closed	mharbison72	D10165 typing: fix a suppression directive that was mangled by black formatting

Diff 26504

mercurial/hgweb/webcommands.py

	[path],			[path],
	diffstyle,			diffstyle,
	linerange=linerange,			linerange=linerange,
	lineidprefix=b'%s-' % ctx.hex()[:12],			lineidprefix=b'%s-' % ctx.hex()[:12],
	)			)

	linerange = None			linerange = None
	if lrange is not None:			if lrange is not None:
				assert lrange is not None # help pytype (!?)
	linerange = webutil.formatlinerange(*lrange)			linerange = webutil.formatlinerange(*lrange)
	# deactivate numeric nav links when linerange is specified as this			# deactivate numeric nav links when linerange is specified as this
	# would required a dedicated "revnav" class			# would required a dedicated "revnav" class
	nav = templateutil.mappinglist([])			nav = templateutil.mappinglist([])
	if descend:			if descend:
	it = dagop.blockdescendants(fctx, *lrange)			it = dagop.blockdescendants(fctx, *lrange)
	else:			else:
	it = dagop.blockancestors(fctx, *lrange)			it = dagop.blockancestors(fctx, *lrange)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26325		Mar 13 2021, 2:33 PM	★	★
Diff 2	26504	rHG914ca0a9851833043f2820d8a85c6a38742087ec	Mar 12 2021, 8:25 PM	★	★