This is an automated email from the ASF dual-hosted git repository.
zhengruifeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 00fef6941f3f [SPARK-57795][INFRA][FOLLOWUP] Refine the merge summary
comment in merge_spark_pr.py
00fef6941f3f is described below
commit 00fef6941f3f3958284aed9b50ad5d2798f3f997
Author: Ruifeng Zheng <[email protected]>
AuthorDate: Thu Jul 2 17:48:20 2026 +0800
[SPARK-57795][INFRA][FOLLOWUP] Refine the merge summary comment in
merge_spark_pr.py
### What changes were proposed in this pull request?
This reapplies the merge summary comment refinement that was merged as
`1ea6ed10d75` and then reverted by `eb3d853db89` (the merge was unintentional),
and adds one behavioral fix on top.
Reapplied change (refines the merge summary comment posted by
`merge_spark_pr.py`):
1. Rename the header from `**Merge summary** (posted by
`merge_spark_pr.py`):` to `**Merge Summary:**`.
2. Use the full commit SHA in the commit links (previously truncated to 8
characters). The `[:8]` truncation is dropped in `merge_pr` and
`_do_cherry_pick`, with `.strip()` added since `run_cmd` does not strip the
trailing newline.
3. Move the `merge_spark_pr.py` attribution to a trailing italic line:
`*Posted by `merge_spark_pr.py`*`.
Additional fix (second commit):
4. Always post the merge summary even if a backport is cancelled. Once the
PR is merged into the target branch and pushed, the summary should record that
landing regardless of what happens to subsequent cherry-picks. Previously,
aborting/cancelling a backport (e.g. answering `n` at a cherry-pick conflict)
raised through `fail()` / `sys.exit()` before `post_merge_comment` ran, so the
already-successful target-branch merge was never recorded. The backport loop is
now wrapped in `try`/`f [...]
Example rendered comment:
> **Merge Summary:**
> - merged into master
https://github.com/apache/spark/commit/<full-sha>
> - merged into branch-4.x
https://github.com/apache/spark/commit/<full-sha>
>
> *Posted by `merge_spark_pr.py`*
### Why are the changes needed?
A cleaner, more readable merge summary comment, and a correct one:
cancelling a backport must not drop the record of the merge that already landed
on the target branch.
### Does this PR introduce _any_ user-facing change?
No. This only affects the developer merge tooling. The `git cherry-pick -x`
"cherry picked from commit ..." line is unaffected (git always records the full
SHA regardless of the abbreviation passed).
### How was this patch tested?
Manually verified the generated comment body and confirmed the full SHA is
carried through. Existing lint (`ruff`) passes.
### Was this patch authored or co-authored using generative AI tooling?
Generated-by: Claude Code (model: claude-opus-4-8)
Closes #56925 from zhengruifeng/reapply-merge-summary-dev6.
Authored-by: Ruifeng Zheng <[email protected]>
Signed-off-by: Ruifeng Zheng <[email protected]>
---
dev/merge_spark_pr.py | 46 +++++++++++++++++++++++++---------------------
1 file changed, 25 insertions(+), 21 deletions(-)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index f16740f2720c..e3f542eb1ac6 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -450,7 +450,7 @@ def post_merge_comment(pr_num, merged_commits):
"- merged into %s %s/%s" % (ref, GITHUB_COMMIT_BASE, commit_hash)
for ref, commit_hash in merged_commits
]
- body = "**Merge summary** (posted by `merge_spark_pr.py`):\n" +
"\n".join(lines)
+ body = "**Merge Summary:**\n" + "\n".join(lines) + "\n\n*Posted by
`merge_spark_pr.py`*"
print("Posting merge comment on PR #%s:\n%s" % (pr_num, body))
if not GITHUB_OAUTH_KEY:
print_error("GITHUB_OAUTH_KEY is not set; skipping the merge comment.")
@@ -560,7 +560,7 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc,
pr_author, co_author
clean_up()
print_error("Exception while pushing: %s" % e)
- merge_hash = run_cmd("git rev-parse %s" % target_branch_name)[:8]
+ merge_hash = run_cmd("git rev-parse %s" % target_branch_name).strip()
clean_up()
print("Pull request #%s merged!" % pr_num)
print("Merge hash: %s" % merge_hash)
@@ -594,7 +594,7 @@ def _do_cherry_pick(pr_num, merge_hash, pick_ref):
except Exception as e:
fail("Exception while pushing: %s" % e)
- pick_hash = run_cmd("git rev-parse %s" % pick_branch_name)[:8]
+ pick_hash = run_cmd("git rev-parse %s" % pick_branch_name).strip()
clean_up()
print("Pull request #%s picked into %s!" % (pr_num, pick_ref))
@@ -1562,24 +1562,28 @@ def main():
# target_ref (the merge sink, never to be re-picked) and grows with every
cherry-pick.
remaining_branches = [b for b in branch_names if b != target_ref]
pick_prompt = "Would you like to pick %s into another branch?" % merge_hash
- while get_input(f"\n{pick_prompt} (y/N): ", ["y", "n", ""]) == "y":
- default = remaining_branches[0] if remaining_branches else
branch_names[0]
- picked = cherry_pick(
- pr_num,
- merge_hash,
- default,
- branch_names,
- target_ref,
- already_picked=tuple(merged_refs),
- )
- picked_refs = [ref for ref, _ in picked]
- merged_refs = merged_refs + picked_refs
- merged_commits = merged_commits + picked
- for b in picked_refs:
- if b in remaining_branches:
- remaining_branches.remove(b)
-
- post_merge_comment(pr_num, merged_commits)
+ # Always record the merge summary for what actually landed, even if a later
+ # cherry-pick is aborted or cancelled: the merge into the target branch has
+ # already been pushed, so cancelling a backport must not drop that line.
+ try:
+ while get_input(f"\n{pick_prompt} (y/N): ", ["y", "n", ""]) == "y":
+ default = remaining_branches[0] if remaining_branches else
branch_names[0]
+ picked = cherry_pick(
+ pr_num,
+ merge_hash,
+ default,
+ branch_names,
+ target_ref,
+ already_picked=tuple(merged_refs),
+ )
+ picked_refs = [ref for ref, _ in picked]
+ merged_refs = merged_refs + picked_refs
+ merged_commits = merged_commits + picked
+ for b in picked_refs:
+ if b in remaining_branches:
+ remaining_branches.remove(b)
+ finally:
+ post_merge_comment(pr_num, merged_commits)
# asf_jira is guaranteed to be set here: initialize_jira() fails fast
otherwise.
continue_maybe("Would you like to update an associated JIRA?")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
