improve types according to test/test_cherrypick.py

Author: BenediktSeidl

pygit2/_pygit2.pyi

@@ -45,6 +45,7 @@ from .enums import (
     Option,
     ReferenceFilter,
     ReferenceType,
+    RepositoryState,
     ResetMode,
     SortMode,
 )
@@ -829,6 +830,7 @@ class Repository:
     def descendant_of(self, oid1: _OidArg, oid2: _OidArg) -> bool: ...
     def expand_id(self, hex: str) -> Oid: ...
     def free(self) -> None: ...
+    def get(self, key: str, default: Optional[Commit] = None) -> None | Object: ...
     def get_attr(
         self,
         path: str | bytes | Path,
@@ -857,6 +859,8 @@ class Repository:
     def merge_base(self, oid1: _OidArg, oid2: _OidArg) -> Oid: ...
     def merge_base_many(self, oids: list[_OidArg]) -> Oid: ...
     def merge_base_octopus(self, oids: list[_OidArg]) -> Oid: ...
+    @property
+    def message(self) -> str: ...
     def notes(self) -> Iterator[Note]: ...
     def path_is_ignored(self, path: str) -> bool: ...
     def raw_listall_branches(
@@ -880,6 +884,8 @@ class Repository:
         self, untracked_files: str = 'all', ignored: bool = False
     ) -> dict[str, int]: ...
     def status_file(self, path: str) -> int: ...
+    def state(self) -> RepositoryState: ...
+    def state_cleanup(self) -> None: ...
     def walk(
         self, oid: _OidArg | None, sort_mode: SortMode = SortMode.NONE
     ) -> Walker: ...

test/test_cherrypick.py

@@ -30,31 +30,34 @@
 import pytest
 
 import pygit2
+from pygit2 import Repository
 from pygit2.enums import RepositoryState
 
 
-def test_cherrypick_none(mergerepo):
+def test_cherrypick_none(mergerepo: Repository) -> None:
     with pytest.raises(TypeError):
-        mergerepo.cherrypick(None)
+        mergerepo.cherrypick(None)  # type: ignore
 
 
-def test_cherrypick_invalid_hex(mergerepo):
+def test_cherrypick_invalid_hex(mergerepo: Repository) -> None:
     branch_head_hex = '12345678'
     with pytest.raises(KeyError):
         mergerepo.cherrypick(branch_head_hex)
 
 
-def test_cherrypick_already_something_in_index(mergerepo):
+def test_cherrypick_already_something_in_index(mergerepo: Repository) -> None:
     branch_head_hex = '03490f16b15a09913edb3a067a3dc67fbb8d41f1'
-    branch_oid = mergerepo.get(branch_head_hex).id
+    branch_object = mergerepo.get(branch_head_hex)
+    assert branch_object is not None
+    branch_oid = branch_object.id
     with (Path(mergerepo.workdir) / 'inindex.txt').open('w') as f:
         f.write('new content')
     mergerepo.index.add('inindex.txt')
     with pytest.raises(pygit2.GitError):
         mergerepo.cherrypick(branch_oid)
 
 
-def test_cherrypick_remove_conflicts(mergerepo):
+def test_cherrypick_remove_conflicts(mergerepo: Repository) -> None:
     assert mergerepo.state() == RepositoryState.NONE
     assert not mergerepo.message