Add types to Remote. fetch() pull() push())

Author: Yobmod

git/remote.py

@@ -59,7 +59,7 @@
 #{ Utilities
 
 
-def add_progress(kwargs: Any, git: Git, progress: Optional[Callable[..., Any]]) -> Any:
+def add_progress(kwargs: Any, git: Git, progress: Union[Callable[..., Any], None]) -> Any:
     """Add the --progress flag to the given kwargs dict if supported by the
     git command. If the actual progress in the given progress instance is not
     given, we do not request any progress
@@ -741,15 +741,15 @@ def _get_fetch_info_from_stderr(self, proc: TBD,
         return output
 
     def _get_push_info(self, proc: TBD,
-                       progress: Union[Callable[..., Any], RemoteProgress, None]) -> List[PushInfo]:
+                       progress: Union[Callable[..., Any], RemoteProgress, None]) -> IterableList:
         progress = to_progress_instance(progress)
 
         # read progress information from stderr
         # we hope stdout can hold all the data, it should ...
         # read the lines manually as it will use carriage returns between the messages
         # to override the previous one. This is why we read the bytes manually
         progress_handler = progress.new_message_handler()
-        output = []
+        output = IterableList('push_infos')
 
         def stdout_handler(line: str) -> None:
             try:
@@ -783,7 +783,9 @@ def _assert_refspec(self) -> None:
         finally:
             config.release()
 
-    def fetch(self, refspec=None, progress=None, verbose=True, **kwargs):
+    def fetch(self, refspec: Union[str, List[str], None] = None,
+              progress: Union[Callable[..., Any], None] = None,
+              verbose: bool = True, **kwargs: Any) -> IterableList:
         """Fetch the latest changes for this remote
 
         :param refspec:
@@ -814,10 +816,12 @@ def fetch(self, refspec=None, progress=None, verbose=True, **kwargs):
         if refspec is None:
             # No argument refspec, then ensure the repo's config has a fetch refspec.
             self._assert_refspec()
+        assert refspec is not None  # for typing
         kwargs = add_progress(kwargs, self.repo.git, progress)
         if isinstance(refspec, list):
             args = refspec
         else:
+            
             args = [refspec]
 
         proc = self.repo.git.fetch(self, *args, as_process=True, with_stdout=False,
@@ -827,7 +831,9 @@ def fetch(self, refspec=None, progress=None, verbose=True, **kwargs):
             self.repo.odb.update_cache()
         return res
 
-    def pull(self, refspec=None, progress=None, **kwargs):
+    def pull(self, refspec: Union[str, List[str], None] = None,
+             progress: Union[Callable[..., Any], None] = None,
+             **kwargs: Any) -> IterableList:
         """Pull changes from the given branch, being the same as a fetch followed
         by a merge of branch with your local branch.
 
@@ -846,7 +852,9 @@ def pull(self, refspec=None, progress=None, **kwargs):
             self.repo.odb.update_cache()
         return res
 
-    def push(self, refspec=None, progress=None, **kwargs):
+    def push(self, refspec: Union[str, List[str], None] = None,
+             progress: Union[Callable[..., Any], None] = None,
+             **kwargs: Any) -> IterableList:
         """Push changes from source branch in refspec to target branch in refspec.
 
         :param refspec: see 'fetch' method