# HG changeset patch # User Matt Harbison # Date 2021-12-13 01:01:05 # Node ID a4d8de93023c40b952d902ec9eaefe892b063f69 # Parent b005d07ded7dc0944d8133bb710436e5a2be62bc pytype: stop excluding upgrade.py The sole failure here was this, which is fixed by simply creating a set like the caller, instead of a dict: File "/mnt/c/Users/Matt/hg/mercurial/upgrade.py", line 73, in upgraderepo: No attribute 'discard' on Dict[nothing, nothing] [attribute-error] In Union[Any, Dict[nothing, nothing]] Differential Revision: https://phab.mercurial-scm.org/D11911 diff --git a/mercurial/upgrade.py b/mercurial/upgrade.py --- a/mercurial/upgrade.py +++ b/mercurial/upgrade.py @@ -42,7 +42,7 @@ def upgraderepo( ): """Upgrade a repository in place.""" if optimize is None: - optimize = {} + optimize = set() repo = repo.unfiltered() specified_revlogs = {} diff --git a/tests/test-check-pytype.t b/tests/test-check-pytype.t --- a/tests/test-check-pytype.t +++ b/tests/test-check-pytype.t @@ -40,7 +40,6 @@ mercurial/statprof.py # bytes vs mercurial/testing/storage.py # tons of [attribute-error] mercurial/ui.py # [attribute-error], [wrong-arg-types] mercurial/unionrepo.py # ui, svfs, unfiltered [attribute-error] -mercurial/upgrade.py # line 84, in upgraderepo: No attribute 'discard' on Dict[nothing, nothing] [attribute-error] mercurial/util.py # [attribute-error], [wrong-arg-count] mercurial/utils/procutil.py # [attribute-error], [module-attr], [bad-return-type] mercurial/utils/stringutil.py # [module-attr], [wrong-arg-count] @@ -88,7 +87,6 @@ development, but may be a hinderance for > -x mercurial/thirdparty \ > -x mercurial/ui.py \ > -x mercurial/unionrepo.py \ - > -x mercurial/upgrade.py \ > -x mercurial/utils/procutil.py \ > -x mercurial/utils/stringutil.py \ > -x mercurial/utils/memorytop.py \