Skip to content

upload: Don't crash when a relative PR has no remote commits #291

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
jerry-skydio merged 1 commit into from
Sep 11, 2026
Merged

upload: Don't crash when a relative PR has no remote commits #291

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
16 changes: 11 additions & 5 deletions revup/topic_stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,11 +864,17 @@ async def mark_rebases(self, skip_rebase: bool) -> None:
# For a relative series of reviews, revup will only ever upload them directly
# on top of each other. If this relationship is ever broken, we always reupload
# This ensures predictable and consistent CI behavior between the branches.
is_on_correct_base = (
topic.relative_topic.reviews[base_branch].pr_info is None
or review.remote_commits[0].parents[0]
== topic.relative_topic.reviews[base_branch].remote_commits[-1].commit_id
)
relative_review = topic.relative_topic.reviews[base_branch]
if relative_review.pr_info is None:
is_on_correct_base = True
elif not relative_review.remote_commits:
# We can't verify the relationship so reupload
is_on_correct_base = False
else:
is_on_correct_base = (
review.remote_commits[0].parents[0]
== relative_review.remote_commits[-1].commit_id
)

relative_topic_is_nochange = (
topic.relative_topic is not None
Expand Down
Loading