Merge pull request #1925 from Andrej730/main

typing fixes - DiffIndex generic type and IndexFile items

Author: Byron

git/diff.py

@@ -187,7 +187,7 @@ def diff(
 paths: Union[PathLike, List[PathLike], Tuple[PathLike, ...], None] =None,
 create_patch: bool=False,
 **kwargs: Any,
- ) ->"DiffIndex":
+ ) ->"DiffIndex[Diff]":
 """Create diffs between two items being trees, trees and index or an index and
  the working tree. Detects renames automatically.
 
@@ -581,7 +581,7 @@ def _pick_best_path(cls, path_match: bytes, rename_match: bytes, path_fallback_m
 returnNone
 
 @classmethod
-def_index_from_patch_format(cls, repo: "Repo", proc: Union["Popen", "Git.AutoInterrupt"]) ->DiffIndex:
+def_index_from_patch_format(cls, repo: "Repo", proc: Union["Popen", "Git.AutoInterrupt"]) ->DiffIndex["Diff"]:
 """Create a new :class:`DiffIndex` from the given process output which must be
  in patch format.
 
@@ -674,7 +674,7 @@ def _index_from_patch_format(cls, repo: "Repo", proc: Union["Popen", "Git.AutoIn
 returnindex
 
 @staticmethod
-def_handle_diff_line(lines_bytes: bytes, repo: "Repo", index: DiffIndex) ->None:
+def_handle_diff_line(lines_bytes: bytes, repo: "Repo", index: DiffIndex["Diff"]) ->None:
 lines=lines_bytes.decode(defenc)
 
 # Discard everything before the first colon, and the colon itself.
@@ -747,7 +747,7 @@ def _handle_diff_line(lines_bytes: bytes, repo: "Repo", index: DiffIndex) -> Non
 index.append(diff)
 
 @classmethod
-def_index_from_raw_format(cls, repo: "Repo", proc: "Popen") ->"DiffIndex":
+def_index_from_raw_format(cls, repo: "Repo", proc: "Popen") ->"DiffIndex[Diff]":
 """Create a new :class:`DiffIndex` from the given process output which must be
  in raw format.
 

git/index/base.py

@@ -658,7 +658,7 @@ def _to_relative_path(self, path: PathLike) -> PathLike:
 returnos.path.relpath(path, self.repo.working_tree_dir)
 
 def_preprocess_add_items(
-self, items: Sequence[Union[PathLike, Blob, BaseIndexEntry, "Submodule"]]
+self, items: Union[PathLike, Sequence[Union[PathLike, Blob, BaseIndexEntry, "Submodule"]]]
  ) ->Tuple[List[PathLike], List[BaseIndexEntry]]:
 """Split the items into two lists of path strings and BaseEntries."""
 paths= []
@@ -749,7 +749,7 @@ def _entries_for_paths(
 
 defadd(
 self,
-items: Sequence[Union[PathLike, Blob, BaseIndexEntry, "Submodule"]],
+items: Union[PathLike, Sequence[Union[PathLike, Blob, BaseIndexEntry, "Submodule"]]],
 force: bool=True,
 fprogress: Callable=lambda*args: None,
 path_rewriter: Union[Callable[..., PathLike], None] =None,
@@ -976,7 +976,7 @@ def _items_to_rela_paths(
 @default_index
 defremove(
 self,
-items: Sequence[Union[PathLike, Blob, BaseIndexEntry, "Submodule"]],
+items: Union[PathLike, Sequence[Union[PathLike, Blob, BaseIndexEntry, "Submodule"]]],
 working_tree: bool=False,
 **kwargs: Any,
  ) ->List[str]:
@@ -1036,7 +1036,7 @@ def remove(
 @default_index
 defmove(
 self,
-items: Sequence[Union[PathLike, Blob, BaseIndexEntry, "Submodule"]],
+items: Union[PathLike, Sequence[Union[PathLike, Blob, BaseIndexEntry, "Submodule"]]],
 skip_errors: bool=False,
 **kwargs: Any,
  ) ->List[Tuple[str, str]]:
@@ -1478,7 +1478,7 @@ def diff(
 paths: Union[PathLike, List[PathLike], Tuple[PathLike, ...], None] =None,
 create_patch: bool=False,
 **kwargs: Any,
- ) ->git_diff.DiffIndex:
+ ) ->git_diff.DiffIndex[git_diff.Diff]:
 """Diff this index against the working copy or a :class:`~git.objects.tree.Tree`
  or :class:`~git.objects.commit.Commit` object.