feat: make backport.py more flexible for complex pull requests
#7260
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
legoktm
requested changes
Oct 17, 2024
| branch = f"backport-{args.pr}" | ||
| base = f"release/{args.version}" | ||
| remote = args.remote | ||
| subprocess.check_call(["git", "fetch", remote]) | ||
| subprocess.check_call(["git", "checkout", "-b", branch, f"{remote}/{base}"]) | ||
| subprocess.check_call(["git", "cherry-pick", "-x"] + [commit["sha"] for commit in commits]) | ||
| subprocess.check_call(["git", "cherry-pick", "-x"] + commit_hashes) | ||
| if input("OK to push and create PR? [y/N]").lower() != "y": | ||
| sys.exit() | ||
| subprocess.check_call(["git", "push", "-u", remote, branch]) |
There was a problem hiding this comment.
In the message body below, let's mention the skipped commits? E.g. Only contains changes from #{args.pr}, except {commits}.?
There was a problem hiding this comment.
Good idea. Added in 234d5bf, but do let me know if you see a nicer way to build up the conditional skip_message without fancier templating.
cfm
added a commit
that referenced
this pull request
Oct 18, 2024
cfm
force-pushed
the
backport-many-but-not-all-the-things
branch
from
9b3123e
to
234d5bf
Compare
For example, Weblate-side merge commits from "develop" require "git cherry-pick -m" and therefore can't be merged en masse even if we wanted their contents.
Otherwise only the first 30 commits are returned.
Co-authored-by: Kunal Mehta <legoktm@debian.org>
cfm
force-pushed
the
backport-many-but-not-all-the-things
branch
from
234d5bf
to
ae00ff7
Compare
|
Currently blocked on #7339. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status
Ready for review
Description of Changes
The much-loved
backport.pyscript makes 2.5 assumptions that do not hold for complex pull requests like #7143, which we fix here:gh api) in the pull request.git cherry-pick -x(i.e., there are no merge commits requiringgit [cherry-pick → merge] -m).Testing
Depending on the state of your local
release/2.10.1branch, you can replicate #7257 with:Deployment
Development-only; no deployment considerations.