Merge pull request #1244 from Yobmod/main

Added types to Index submodule

Author: Byron

git/cmd.py

@@ -615,7 +615,7 @@ def _set_cache_(self, attr: str) -> None:
 # END handle version info
 
 @property
-defworking_dir(self) ->Union[None, str]:
+defworking_dir(self) ->Union[None, PathLike]:
 """:return: Git directory we are working on"""
 returnself._working_dir
 
@@ -1187,7 +1187,7 @@ def __get_object_header(self, cmd, ref: AnyStr) -> Tuple[str, str, int]:
 cmd.stdin.flush()
 returnself._parse_object_header(cmd.stdout.readline())
 
-defget_object_header(self, ref: AnyStr) ->Tuple[str, str, int]:
+defget_object_header(self, ref: str) ->Tuple[str, str, int]:
 """ Use this method to quickly examine the type and size of the object behind
  the given ref.
 
@@ -1198,7 +1198,7 @@ def get_object_header(self, ref: AnyStr) -> Tuple[str, str, int]:
 cmd=self._get_persistent_cmd("cat_file_header", "cat_file", batch_check=True)
 returnself.__get_object_header(cmd, ref)
 
-defget_object_data(self, ref: AnyStr) ->Tuple[str, str, int, bytes]:
+defget_object_data(self, ref: str) ->Tuple[str, str, int, bytes]:
 """ As get_object_header, but returns object data as well
  :return: (hexsha, type_string, size_as_int,data_string)
  :note: not threadsafe"""
@@ -1207,7 +1207,7 @@ def get_object_data(self, ref: AnyStr) -> Tuple[str, str, int, bytes]:
 del(stream)
 return (hexsha, typename, size, data)
 
-defstream_object_data(self, ref: AnyStr) ->Tuple[str, str, int, 'Git.CatFileContentStream']:
+defstream_object_data(self, ref: str) ->Tuple[str, str, int, 'Git.CatFileContentStream']:
 """ As get_object_header, but returns the data as a stream
 
  :return: (hexsha, type_string, size_as_int, stream)

git/db.py

@@ -12,7 +12,7 @@
 
 # typing-------------------------------------------------
 
-fromtypingimportTYPE_CHECKING, AnyStr
+fromtypingimportTYPE_CHECKING
 fromgit.typesimportPathLike
 
 ifTYPE_CHECKING:
@@ -39,18 +39,18 @@ def __init__(self, root_path: PathLike, git: 'Git') -> None:
 super(GitCmdObjectDB, self).__init__(root_path)
 self._git=git
 
-definfo(self, sha: bytes) ->OInfo:
-hexsha, typename, size=self._git.get_object_header(bin_to_hex(sha))
+definfo(self, binsha: bytes) ->OInfo:
+hexsha, typename, size=self._git.get_object_header(bin_to_hex(binsha))
 returnOInfo(hex_to_bin(hexsha), typename, size)
 
-defstream(self, sha: bytes) ->OStream:
+defstream(self, binsha: bytes) ->OStream:
 """For now, all lookup is done by git itself"""
-hexsha, typename, size, stream=self._git.stream_object_data(bin_to_hex(sha))
+hexsha, typename, size, stream=self._git.stream_object_data(bin_to_hex(binsha))
 returnOStream(hex_to_bin(hexsha), typename, size, stream)
 
 #{Interface
 
-defpartial_to_complete_sha_hex(self, partial_hexsha: AnyStr) ->bytes:
+defpartial_to_complete_sha_hex(self, partial_hexsha: str) ->bytes:
 """:return: Full binary 20 byte sha from the given partial hexsha
  :raise AmbiguousObjectName:
  :raise BadObject:

git/diff.py

@@ -16,7 +16,7 @@
 # typing ------------------------------------------------------------------
 
 fromtypingimportAny, Iterator, List, Match, Optional, Tuple, Type, Union, TYPE_CHECKING
-fromgit.typesimportTBD, Final, Literal
+fromgit.typesimportPathLike, TBD, Final, Literal
 
 ifTYPE_CHECKING:
 from .objects.treeimportTree
@@ -84,7 +84,7 @@ def _process_diff_args(self, args: List[Union[str, 'Diffable', object]]) -> List
 returnargs
 
 defdiff(self, other: Union[Type[Index], Type['Tree'], object, None, str] =Index,
-paths: Union[str, List[str], Tuple[str, ...], None] =None,
+paths: Union[PathLike, List[PathLike], Tuple[PathLike, ...], None] =None,
 create_patch: bool=False, **kwargs: Any) ->'DiffIndex':
 """Creates diffs between two items being trees, trees and index or an
  index and the working tree. It will detect renames automatically.

git/exc.py

@@ -11,7 +11,7 @@
 
 # typing ----------------------------------------------------
 
-fromtypingimportList, Optional, Tuple, Union, TYPE_CHECKING
+fromtypingimportList, Sequence, Tuple, Union, TYPE_CHECKING
 fromgit.typesimportPathLike
 
 ifTYPE_CHECKING:
@@ -113,7 +113,7 @@ class CheckoutError(GitError):
  were checked out successfully and hence match the version stored in the
  index"""
 
-def__init__(self, message: str, failed_files: List[PathLike], valid_files: List[PathLike],
+def__init__(self, message: str, failed_files: Sequence[PathLike], valid_files: Sequence[PathLike],
 failed_reasons: List[str]) ->None:
 
 Exception.__init__(self, message)
@@ -139,8 +139,11 @@ class HookExecutionError(CommandError):
 """Thrown if a hook exits with a non-zero exit code. It provides access to the exit code and the string returned
  via standard output"""
 
-def__init__(self, command: Union[List[str], Tuple[str, ...], str], status: Optional[str],
-stderr: Optional[str] =None, stdout: Optional[str] =None) ->None:
+def__init__(self, command: Union[List[str], Tuple[str, ...], str],
+status: Union[str, int, None, Exception],
+stderr: Union[bytes, str, None] =None,
+stdout: Union[bytes, str, None] =None) ->None:
+
 super(HookExecutionError, self).__init__(command, status, stderr, stdout)
 self._msg="Hook('%s') failed%s"