Skip to content

tree: push: also retry 10 times #125

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
matttbe merged 1 commit into from
Oct 25, 2026
Merged

tree: push: also retry 10 times #125

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
22 changes: 13 additions & 9 deletions core/tree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,17 @@ def git(self, args: List[str]):
finally:
self.lock.release()

def git_retry(self, cmd, err_msg, n=10, sleep=30):
last = n - 1
for i in range(n):
try:
return self.git(cmd)
except CMD.CmdError as e:
core.log(f"{err_msg} (attempt {i + 1})", repr(e))
if i == last:
raise
time.sleep(sleep)

def git_am(self, patch):
return self.git(["am", "-s", "--", patch])

Expand All @@ -101,7 +112,7 @@ def git_pull(self, pull_url, ff=None):

def git_push(self, remote, spec):
cmd = ["push", remote, spec]
return self.git(cmd)
return self.git_retry(cmd, "Pushing failed")

def git_status(self, untracked=None, short=False):
cmd = ["status"]
Expand All @@ -118,14 +129,7 @@ def git_merge_base(self, c1, c2, is_ancestor=False):
return self.git(cmd)

def git_fetch(self, remote):
for i in range(10):
try:
return self.git(['fetch', remote])
except CMD.CmdError as e:
core.log(f"Fetching failed (attempt {i + 1})", repr(e))
time.sleep(30)
if i >= 9:
raise
return self.git_retry(['fetch', remote], "Fetching failed")

def git_reset(self, target, hard=False):
cmd = ['reset', target]
Expand Down
Loading