Skip to content

refactor: seperate out Progress type #2157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Byron merged 1 commit into from
May 27, 2026
+7 −4
Merged

refactor: seperate out Progress type #2157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff 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 Down Expand 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 Down Expand 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 Down Expand 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 Down Expand 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