diff --git a/git/diff.py b/git/diff.py
index f89b12d98..e9f7e209f 100644
--- a/git/diff.py
+++ b/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
return None
@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
return index
@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.
diff --git a/git/index/base.py b/git/index/base.py
index b8161ea52..28b60a880 100644
--- a/git/index/base.py
+++ b/git/index/base.py
@@ -658,7 +658,7 @@ def _to_relative_path(self, path: PathLike) -> PathLike:
return os.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(
def add(
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
def remove(
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
def move(
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.
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy