Skip to content

fix: Abort stuck rebase before pulling from remote #8

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

Draft
petergaultney wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: Abort stuck rebase before pulling from remote #8

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
18 changes: 18 additions & 0 deletions persistence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,6 +1012,21 @@ def _repair_tracking_branch_if_obvious(self, repo_key: str, git_repo: git.Repo,
logger.warning(f"Failed to repair upstream tracking for {repo_key}: {e}")
return None

def _abort_stuck_rebase(self, git_repo: git.Repo, repo_key: str):
"""Abort any in-progress rebase so subsequent git operations don't wedge."""
rebase_merge_dir = os.path.join(git_repo.git_dir, "rebase-merge")
rebase_apply_dir = os.path.join(git_repo.git_dir, "rebase-apply")
if os.path.isdir(rebase_merge_dir) or os.path.isdir(rebase_apply_dir):
logger.warning(f"Aborting stuck rebase for {repo_key}")
try:
git_repo.git.rebase("--abort")
except git.exc.GitCommandError as e:
logger.warning(
f"rebase --abort failed for {repo_key}, removing rebase state manually: {e}"
)
shutil.rmtree(rebase_merge_dir, ignore_errors=True)
shutil.rmtree(rebase_apply_dir, ignore_errors=True)

def _pull_from_remote(self, repo_key: str, git_repo: git.Repo):
"""Pull latest changes from remote repository using rebase"""
try:
Expand All @@ -1022,6 +1037,8 @@ def _pull_from_remote(self, repo_key: str, git_repo: git.Repo):
logger.debug(f"No remotes configured for repository {repo_key}, skipping pull")
return

self._abort_stuck_rebase(git_repo, repo_key)

# Get the default remote (usually 'origin')
origin = (
git_repo.remotes.origin
Expand Down Expand Up @@ -1108,6 +1125,7 @@ def _pull_from_remote(self, repo_key: str, git_repo: git.Repo):
f"Merged remote changes with conflicts resolved for {repo_key}"
)
else:
self._abort_stuck_rebase(git_repo, repo_key)
raise rebase_error
else:
# Only behind - fast-forward pull
Expand Down