git-review-rebase: fix linters warnings.

Signed-off-by: Quentin Casasnovas <quentin.casasnovas@vates.tech>

Author: casasnovas

scripts/git-review-rebase/pyproject.toml

@@ -33,6 +33,7 @@ dependencies = [
 
 [dependency-groups]
 dev = [
+    "pyright>=1.1.408",
     "pytest>=9.0.2",
     "pytest-asyncio>=1.3.0",
     "black>=24.10.0",

scripts/git-review-rebase/requirements/dev.txt

@@ -1,4 +1,5 @@
 # generated with update_requirements.py, do not edit manually
+pyright>=1.1.408
 pytest>=9.0.2
 pytest-asyncio>=1.3.0
 black>=24.10.0

scripts/git-review-rebase/requirements/update_requirements.py

@@ -4,25 +4,27 @@
 import tomllib
 from pathlib import Path
 
-parser = argparse.ArgumentParser(description="Convert the dependencies from pyproject.toml in requirements.txt files")
+parser = argparse.ArgumentParser(
+    description="Convert the dependencies from pyproject.toml in requirements.txt files"
+)
 args = parser.parse_args()
 
 PROJECT_DIR = Path(__file__).parent.parent
 HEADER = "# generated with update_requirements.py, do not edit manually"
 
-with open(f'{PROJECT_DIR}/pyproject.toml', 'rb') as f:
+with open(f"{PROJECT_DIR}/pyproject.toml", "rb") as f:
     pyproject = tomllib.load(f)
 
 
-main_deps = pyproject['project']['dependencies']
-with open(f'{PROJECT_DIR}/requirements/base.txt', 'w') as f:
+main_deps = pyproject["project"]["dependencies"]
+with open(f"{PROJECT_DIR}/requirements/base.txt", "w") as f:
     print(HEADER, file=f)
     for dep in main_deps:
         print(dep, file=f)
 
-dev_deps = pyproject['dependency-groups']['dev']
-with open(f'{PROJECT_DIR}/requirements/dev.txt', 'w') as f:
+dev_deps = pyproject["dependency-groups"]["dev"]
+with open(f"{PROJECT_DIR}/requirements/dev.txt", "w") as f:
     print(HEADER, file=f)
     for dep in dev_deps:
         print(dep, file=f)
-    print('-r base.txt', file=f)
+    print("-r base.txt", file=f)

scripts/git-review-rebase/src/git_review_rebase/commit_matching.py

@@ -77,6 +77,6 @@ def init_matches(self) -> None:
             right_commit = self.repo.get(right_commit_id)
             assert isinstance(right_commit, pygit2.Commit)
             self.commit_matches[right_commit_id] = RebasedCommitMatch(
-                None, self.repo.get(right_commit_id), CommitMatchInfoFlag.Added
+                None, right_commit, CommitMatchInfoFlag.Added
             )
         self.commit_matches.update(left_commit_matches)

scripts/git-review-rebase/src/git_review_rebase/git_utils.py

@@ -1,6 +1,7 @@
 """Git utility functions for repository operations."""
 
 import multiprocessing
+from multiprocessing.managers import DictProxy
 
 import pygit2
 from pygit2 import Walker
@@ -42,13 +43,12 @@ def cached_patchid_ref(revision: str) -> str:
     return f"refs/patchids/from_revision/" f"{revision[:2]}/{revision[2:4]}/{revision[4:]}"
 
 
-_repo = None
-_commit_by_patchid_str = None
+_repo: None | pygit2.Repository = None
+_commit_by_patchid_str: None | DictProxy = None
 
 
 def patchid(repo: pygit2.Repository, commit: pygit2.Commit, cache_flags: CacheFlags) -> pygit2.Oid:
-    if cache_flags:
-        cached_ref = cached_patchid_ref(str(commit.id))
+    cached_ref = cached_patchid_ref(str(commit.id))
     try:
         if CacheFlags.READ_FROM_CACHE not in cache_flags:
             raise KeyError("Do not use the cache")
@@ -70,7 +70,10 @@ def patchid_map_fn(
     """Given a revision stuff the commits_patchid dict with its patchid."""
     if _repo is None:
         raise RuntimeError("_repo needs to be defined")
+    if _commit_by_patchid_str is None:
+        raise RuntimeError("_commit_by_patchid_str needs to be defined")
     commit = _repo.get(pygit2.Oid(hex=revision))
+    assert isinstance(commit, pygit2.Commit)
     _commit_by_patchid_str[str(patchid(_repo, commit, cache_flags))] = revision
 
 

scripts/git-review-rebase/src/git_review_rebase/ui/diff_table.py

@@ -161,7 +161,7 @@ async def add_blame_info(
                 assert self.right_commit is not None
                 right = await self.prefix(self.right_diff, self.right_commit, right_text)
                 left = await self.prefix(self.left_diff, self.left_commit, left_text)
-        return left, right
+        return left, right  # pyright: ignore[reportPossiblyUnboundVariable]
 
     async def get_row_from_line(self, line: str) -> tuple[Text, Text, Text]:
         if not line:

scripts/git-review-rebase/src/git_review_rebase/ui/rebase_table.py

@@ -139,5 +139,5 @@ def commit_filtered_out():
                 left_cell,
                 markers_from_match_type(rebased_commit_match.match_info),
                 right_cell,
-                key=commit_oid, # type: ignore
+                key=commit_oid,  # type: ignore
             )