zhengruifeng opened a new pull request, #56467:
URL: https://github.com/apache/spark/pull/56467
### What changes were proposed in this pull request?
Two prompt improvements in `dev/merge_spark_pr.py`:
1. The backport path (re-running the script on an already-merged, closed PR)
now asks for an explicit confirmation before doing any git work, and the
"assuming you want to backport" wording is dropped since the script now asks
instead of assumes:
```
Pull request 12345 has already been merged
Found commit abcdef01234:
[SPARK-XXXXX][SQL] Some change
Proceed with backporting pull request #12345? (y/N):
```
Pressing Enter defaults to No and aborts.
2. The push confirmations in `merge_pr` and `_do_cherry_pick` now name the
destination branch:
```
Merge complete (local ref PR_TOOL_MERGE_PR_12345_MASTER). Push to
apache/master? (y/N):
Pick complete (local ref PR_TOOL_PICK_PR_12345_BRANCH-4.2). Push to
apache/branch-4.2? (y/N):
```
instead of just `Push to apache? (y/N)`.
### Why are the changes needed?
The normal merge flow shows a PR summary and asks `Proceed with merging pull
request #N? (y/N)` before doing anything. The backport flow has no such gate:
it jumps straight from "Pull request N has already been merged, assuming you
want to backport" to the `Enter a branch name` prompt, and the only y/N
confirmation before pushing is `Pick complete (local ref ...). Push to apache?
(y/N)`, which never names the target branch in plain text (it is only embedded
in the local ref name, e.g. `PR_TOOL_PICK_PR_12345_BRANCH-4.2`). This makes it
easy to back-port to a maintenance branch without ever explicitly confirming
what is being merged where.
### Does this PR introduce _any_ user-facing change?
No. This only affects the committer-facing merge tooling.
### How was this patch tested?
- Manually traced the prompt flow for both the normal merge path and the
already-merged backport path.
- Module doctests pass (57 passed).
- `ruff format --check dev/merge_spark_pr.py` reports the file as already
formatted.
### Was this patch authored or co-authored using generative AI tooling?
Generated-by: Claude Code (claude-fable-5)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
