Handle a case where a stack is partially merged #624
Conversation
There's a case where a stack is partially merged and not `av sync`ed. In this case, the parent branch of the not-yet-merged branch no longer exists on GitHub in many cases (but we can get the PR info via GraphQL API). The current implementation fails on git-fetch as the branch doesn't exist. This change skips those merged branches and adopt only branches that are still open. The branch metadata is (locally) updated to have a trunk branch as the parent. There was an issue that we couldn't restack those branches, but with a series of changes around the branching point (such as e3a2206) makes it possible to support this case.
Current Aviator status
This PR was merged using Aviator.
See the real-time status of this PR on the
Aviator webapp.
Use the Aviator Chrome Extension
to see the status of your PR within GitHub.
|
✅ FlexReview StatusCommon Owner:
Review SLO: |
Summary of ChangesHello @draftcode, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request significantly enhances the Highlights
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
There was a problem hiding this comment.
Code Review
This pull request addresses an issue with adopting partially merged stacks where parent branches of open PRs might have been deleted from the remote after being merged. The changes introduce a fallback for PRs without av metadata, treating them as stack roots, and modify the adoption logic to correctly re-parent branches whose parents are merged or closed.
The introduction of ErrNoPRMetadata and handling it in get_remote_stacked_pr.go is a clean way to support adopting branches not created by av. The logic to filter only open PRs for adoption in adopt.go is also correct.
However, I've found a critical issue in cmd/av/adopt.go within the initAdoption function. The logic to find the new parent for a branch in a partially merged stack has a bug where the updated parent is not assigned to the branch being adopted. Additionally, it could lead to an infinite loop if a parent branch is not found in the provided map. I've left a detailed comment with a suggested fix.
There's a case where a stack is partially merged and not
av synced. Inthis case, the parent branch of the not-yet-merged branch no longer
exists on GitHub in many cases (but we can get the PR info via GraphQL
API). The current implementation fails on git-fetch as the branch
doesn't exist.
This change skips those merged branches and adopt only branches that are
still open. The branch metadata is (locally) updated to have a trunk
branch as the parent.
There was an issue that we couldn't restack those branches, but with a
series of changes around the branching point (such as
e3a2206)
makes it possible to support this case.