This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11474

typing: drop annotations on `mercurial/logcmdutil.walkopts` attributes
ClosedPublic

Authored by mharbison72 on Sep 21 2021, 11:38 AM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG0dc4cc654d96: typing: drop annotations on `mercurial/logcmdutil.walkopts` attributes

Summary

Pytype 2021-09-09 must have learned some things about @attr, because while
these were presumably required to help it before (c1d0f83d62c4::9a26fea2b518 and
c11099cc1de4::224c786f4fce), these instances now get flagged as an assignment
mismatch:

File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 717, in walkopts: Type annotation for pats does not match type of assignment [annotation-type-mismatch]
  Annotation: List[bytes]
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 718, in walkopts: Type annotation for opts does not match type of assignment [annotation-type-mismatch]
  Annotation: Dict[bytes, Any]
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 722, in walkopts: Type annotation for revspec does not match type of assignment [annotation-type-mismatch]
  Annotation: List[bytes]
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 725, in walkopts: Type annotation for bookmarks does not match type of assignment [annotation-type-mismatch]
  Annotation: List[bytes]
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 726, in walkopts: Type annotation for branches does not match type of assignment [annotation-type-mismatch]
  Annotation: List[bytes]
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 727, in walkopts: Type annotation for date does not match type of assignment [annotation-type-mismatch]
  Annotation: Optional[bytes]
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 728, in walkopts: Type annotation for keywords does not match type of assignment [annotation-type-mismatch]
  Annotation: List[bytes]
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 729, in walkopts: Type annotation for no_merges does not match type of assignment [annotation-type-mismatch]
  Annotation: bool
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 730, in walkopts: Type annotation for only_merges does not match type of assignment [annotation-type-mismatch]
  Annotation: bool
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 731, in walkopts: Type annotation for prune_ancestors does not match type of assignment [annotation-type-mismatch]
  Annotation: List[bytes]
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 732, in walkopts: Type annotation for users does not match type of assignment [annotation-type-mismatch]
  Annotation: List[bytes]
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 735, in walkopts: Type annotation for include_pats does not match type of assignment [annotation-type-mismatch]
  Annotation: List[bytes]
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 736, in walkopts: Type annotation for exclude_pats does not match type of assignment [annotation-type-mismatch]
  Annotation: List[bytes]
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 739, in walkopts: Type annotation for follow does not match type of assignment [annotation-type-mismatch]
  Annotation: int
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 743, in walkopts: Type annotation for force_changelog_traversal does not match type of assignment [annotation-type-mismatch]
  Annotation: bool
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 747, in walkopts: Type annotation for filter_revisions_by_pats does not match type of assignment [annotation-type-mismatch]
  Annotation: bool
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 750, in walkopts: Type annotation for sort_revisions does not match type of assignment [annotation-type-mismatch]
  Annotation: Optional[bytes]
  Assignment: mercurial.thirdparty.attr._make._CountingAttr
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 753, in walkopts: Type annotation for limit does not match type of assignment [annotation-type-mismatch]
  Annotation: Optional[int]
  Assignment: mercurial.thirdparty.attr._make._CountingAttr

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.Sep 21 2021, 11:38 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 21 2021, 11:38 AM

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

mharbison72 added a child revision: D11475: extensions: prevent a crash on py3 when testing a bad extension minimum.Sep 21 2021, 11:38 AM

Nice!

This revision is now accepted and ready to land.Sep 22 2021, 3:51 AM

mharbison72 added a commit: rHG0dc4cc654d96: typing: drop annotations on `mercurial/logcmdutil.walkopts` attributes.Sep 22 2021, 3:56 AM

Closed by commit rHG0dc4cc654d96: typing: drop annotations on `mercurial/logcmdutil.walkopts` attributes (authored by mharbison72). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/logcmdutil.py (39 lines)

Status	Author	Revision
Closed	mharbison72	D11476 extensions: prevent a crash on py3 with a `minimumhgversion` str value
Closed	mharbison72	D11475 extensions: prevent a crash on py3 when testing a bad extension minimum
Closed	mharbison72	D11474 typing: drop annotations on `mercurial/logcmdutil.walkopts` attributes
Closed	mharbison72	D11473 util: eliminate the possibility of returning None from `versiontuple()`
Closed	mharbison72	D11472 archival: force a `CompressionError` to bytes before passing to `error.Abort`
Closed	mharbison72	D11471 parser: force a `ValueError` to bytes before passing to `error.ParseError`
Closed	mharbison72	D11470 util: avoid a name-error warning in the `mmapread` exception handler
Closed	mharbison72	D11469 typing: suppress an name-error warning in `mercurial/windows.py`
Closed	mharbison72	D11468 typing: suppress an import-error warning in `mercurial/utils/resourceutil.py`
Closed	mharbison72	D11467 encoding: force a few Errors to bytes before passing to `error.Abort`
Closed	mharbison72	D11466 typing: add a fake `__init__()` to bytestr to distract pytype

Diff 30366

mercurial/logcmdutil.py

	)			)


	if pycompat.TYPE_CHECKING:			if pycompat.TYPE_CHECKING:
	from typing import (			from typing import (
	Any,			Any,
	Callable,			Callable,
	Dict,			Dict,
	List,
	Optional,			Optional,
	Sequence,			Sequence,
	Tuple,			Tuple,
	)			)

	for t in (Any, Callable, Dict, List, Optional, Tuple):			for t in (Any, Callable, Dict, Optional, Tuple):
	assert t			assert t


	def getlimit(opts):			def getlimit(opts):
	"""get the log limit according to option -l/--limit"""			"""get the log limit according to option -l/--limit"""
	limit = opts.get(b'limit')			limit = opts.get(b'limit')
	if limit:			if limit:
	try:			try:

	@attr.s			@attr.s
	class walkopts(object):			class walkopts(object):
	"""Options to configure a set of revisions and file matcher factory			"""Options to configure a set of revisions and file matcher factory
	to scan revision/file history			to scan revision/file history
	"""			"""

	# raw command-line parameters, which a matcher will be built from			# raw command-line parameters, which a matcher will be built from
	pats = attr.ib() # type: List[bytes]			pats = attr.ib()
	opts = attr.ib() # type: Dict[bytes, Any]			opts = attr.ib()

	# a list of revset expressions to be traversed; if follow, it specifies			# a list of revset expressions to be traversed; if follow, it specifies
	# the start revisions			# the start revisions
	revspec = attr.ib() # type: List[bytes]			revspec = attr.ib()

	# miscellaneous queries to filter revisions (see "hg help log" for details)			# miscellaneous queries to filter revisions (see "hg help log" for details)
	bookmarks = attr.ib(default=attr.Factory(list)) # type: List[bytes]			bookmarks = attr.ib(default=attr.Factory(list))
	branches = attr.ib(default=attr.Factory(list)) # type: List[bytes]			branches = attr.ib(default=attr.Factory(list))
	date = attr.ib(default=None) # type: Optional[bytes]			date = attr.ib(default=None)
	keywords = attr.ib(default=attr.Factory(list)) # type: List[bytes]			keywords = attr.ib(default=attr.Factory(list))
	no_merges = attr.ib(default=False) # type: bool			no_merges = attr.ib(default=False)
	only_merges = attr.ib(default=False) # type: bool			only_merges = attr.ib(default=False)
	prune_ancestors = attr.ib(default=attr.Factory(list)) # type: List[bytes]			prune_ancestors = attr.ib(default=attr.Factory(list))
	users = attr.ib(default=attr.Factory(list)) # type: List[bytes]			users = attr.ib(default=attr.Factory(list))

	# miscellaneous matcher arguments			# miscellaneous matcher arguments
	include_pats = attr.ib(default=attr.Factory(list)) # type: List[bytes]			include_pats = attr.ib(default=attr.Factory(list))
	exclude_pats = attr.ib(default=attr.Factory(list)) # type: List[bytes]			exclude_pats = attr.ib(default=attr.Factory(list))

	# 0: no follow, 1: follow first, 2: follow both parents			# 0: no follow, 1: follow first, 2: follow both parents
	follow = attr.ib(default=0) # type: int			follow = attr.ib(default=0)

	# do not attempt filelog-based traversal, which may be fast but cannot			# do not attempt filelog-based traversal, which may be fast but cannot
	# include revisions where files were removed			# include revisions where files were removed
	force_changelog_traversal = attr.ib(default=False) # type: bool			force_changelog_traversal = attr.ib(default=False)

	# filter revisions by file patterns, which should be disabled only if			# filter revisions by file patterns, which should be disabled only if
	# you want to include revisions where files were unmodified			# you want to include revisions where files were unmodified
	filter_revisions_by_pats = attr.ib(default=True) # type: bool			filter_revisions_by_pats = attr.ib(default=True)

	# sort revisions prior to traversal: 'desc', 'topo', or None			# sort revisions prior to traversal: 'desc', 'topo', or None
	sort_revisions = attr.ib(default=None) # type: Optional[bytes]			sort_revisions = attr.ib(default=None)

	# limit number of changes displayed; None means unlimited			# limit number of changes displayed; None means unlimited
	limit = attr.ib(default=None) # type: Optional[int]			limit = attr.ib(default=None)


	def parseopts(ui, pats, opts):			def parseopts(ui, pats, opts):
	# type: (Any, Sequence[bytes], Dict[bytes, Any]) -> walkopts			# type: (Any, Sequence[bytes], Dict[bytes, Any]) -> walkopts
	"""Parse log command options into walkopts			"""Parse log command options into walkopts

	The returned walkopts will be passed in to getrevs() or makewalker().			The returned walkopts will be passed in to getrevs() or makewalker().
	"""			"""

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30348		Sep 21 2021, 11:38 AM	★	★
Diff 2	30366	rHG0dc4cc654d96a73568daad2e9b04235eb224cd5f	Sep 20 2021, 11:22 AM	★	★