Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions git/remote.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -517,6 +517,9 @@ def iter_items(cls, repo: "Repo", *args: Any, **kwargs: Any) -> NoReturn: # ->
raise NotImplementedError


Progress = Union[RemoteProgress, "UpdateProgress", Callable[..., RemoteProgress], None]


class Remote(LazyMixin, IterableObj):
"""Provides easy read and write access to a git remote.

Expand DownExpand Up@@ -872,7 +875,7 @@ def update(self, **kwargs: Any) -> "Remote":
def _get_fetch_info_from_stderr(
self,
proc: "Git.AutoInterrupt",
progress: Union[Callable[..., Any], RemoteProgress, None],
progress: Progress,
kill_after_timeout: Union[None, float] = None,
) -> IterableList["FetchInfo"]:
progress = to_progress_instance(progress)
Expand DownExpand Up@@ -1000,7 +1003,7 @@ def _assert_refspec(self) -> None:
def fetch(
self,
refspec: Union[str, List[str], None] = None,
progress: Union[RemoteProgress, None, "UpdateProgress"] = None,
progress: Progress = None,
verbose: bool = True,
kill_after_timeout: Union[None, float] = None,
allow_unsafe_protocols: bool = False,
Expand DownExpand Up@@ -1081,7 +1084,7 @@ def fetch(
def pull(
self,
refspec: Union[str, List[str], None] = None,
progress: Union[RemoteProgress, "UpdateProgress", None] = None,
progress: Progress = None,
kill_after_timeout: Union[None, float] = None,
allow_unsafe_protocols: bool = False,
allow_unsafe_options: bool = False,
Expand DownExpand Up@@ -1135,7 +1138,7 @@ def pull(
def push(
self,
refspec: Union[str, List[str], None] = None,
progress: Union[RemoteProgress, "UpdateProgress", Callable[..., RemoteProgress], None] = None,
progress: Progress = None,
kill_after_timeout: Union[None, float] = None,
allow_unsafe_protocols: bool = False,
allow_unsafe_options: bool = False,
Expand Down
Loading