Patchwork D11911: pytype: stop excluding upgrade.py

login
register
mail settings
Submitter phabricator
Date Dec. 14, 2021, 9:10 p.m.
Message ID <differential-rev-PHID-DREV-k7maqu5tseplrjn5ggst-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50237/
State New
Headers show

Comments

phabricator - Dec. 14, 2021, 9:10 p.m.
mharbison72 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  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]]

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11911

AFFECTED FILES
  mercurial/upgrade.py
  tests/test-check-pytype.t

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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/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 @@ 
   >    -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 \
diff --git a/mercurial/upgrade.py b/mercurial/upgrade.py
--- a/mercurial/upgrade.py
+++ b/mercurial/upgrade.py
@@ -42,7 +42,7 @@ 
 ):
     """Upgrade a repository in place."""
     if optimize is None:
-        optimize = {}
+        optimize = set()
     repo = repo.unfiltered()
 
     specified_revlogs = {}