From a9bac021f899a3d9c53d87a0d4b3f31b6247662f Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 29 Oct 2026 13:21:04 +0100 Subject: [PATCH 1/5] tools: add support for multiple-commit PRs in `review_backport.sh` Signed-off-by: Antoine du Hamel --- tools/actions/review_backport.sh | 35 ++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/tools/actions/review_backport.sh b/tools/actions/review_backport.sh index 57b46c799e64..66a9cdd06649 100755 --- a/tools/actions/review_backport.sh +++ b/tools/actions/review_backport.sh @@ -11,28 +11,51 @@ BACKPORT_PR=$1 echo "Usage:" >&2 echo 'tools/actions/review_backport.sh https://github.com/nodejs/node/pull/ | less' >&2 echo 'DIFF_CMD="codium --wait --diff" tools/actions/review_backport.sh https://github.com/nodejs/node/pull/' >&2 - echo "Limitations: This tools only supports PRs that landed as single commit, e.g. with 'commit-queue-squash' label." >&2 exit 1 } -SED_CMD='s/^index [a-f0-9]\+..[a-f0-9]\+ \([0-7]\{6\}\)$/index eeeeeeeeee..eeeeeeeeee \1/g;s/^@@ -[0-9]\+,[0-9]\+ +[0-9]\+,[0-9]\+ @@/@@ -111,1 +111,1 @@/' +SED_CMD= +SED_CMD="${SED_CMD};"'s/^index [a-f0-9]\+..[a-f0-9]\+\( [0-7]\{6\}\)\?$/index eeeeeeeeee..eeeeeeeeee\1/g' +SED_CMD="${SED_CMD};"'s/^From [a-f0-9]\{40\} /From 0000000000000000000000000000000000000000 /' +SED_CMD="${SED_CMD};"'s/^@@ -[0-9]\+,[0-9]\+ +[0-9]\+,[0-9]\+ @@/@@ -111,1 +111,1 @@/' set -ex +REMOTE=${GIT_REMOTE:-https://github.com/${GH_REPO:-nodejs/node}.git} + BACKPORT_PR_URL=$(gh pr view "$BACKPORT_PR" --json url --jq .url) ORIGINAL=$(mktemp) BACKPORT=$(mktemp) trap 'set -x; rm -f "$ORIGINAL" "$BACKPORT"; set +x; trap - EXIT; exit' EXIT INT HUP -gh pr view "$BACKPORT_PR" --json commits --jq '.[] | map([ .oid, (.messageBody | match("(?:^|\\n)PR-URL: (https?://.+/pull/\\d+)(?:\\n|$)", "g") | .captures | last | .string)] | @tsv) | .[]' \ +${DIFF_CMD_NO_WAIT:-diff} "$ORIGINAL" "$BACKPORT" + +gh pr view "$BACKPORT_PR" --json commits --jq '.[] | map([ .oid, .messageHeadline, (.messageBody | match("(?:^|\\n)PR-URL: (https?://.+/pull/\\d+)(?:\\n|$)", "g") | .captures | last | .string)] | @tsv) | .[]' \ | while read -r LINE; do COMMIT_SHA=$(echo "$LINE" | cut -f1) - PR_URL=$(echo "$LINE" | cut -f2) + COMMIT_TITLE=$(echo "$LINE" | cut -f2) + PR_URL=$(echo "$LINE" | cut -f3) + + [ -n "$PR_URL" ] || { + echo "Missing PR-URL in commit message for $COMMIT_SHA" >&2 + exit 1 + } + + ORIGINAL_BASE=$(gh pr view "$PR_URL" --json baseRefName -q '.baseRefName') + git fetch "$REMOTE" "$ORIGINAL_BASE" + ORIGINAL_COMMIT=$( + git log FETCH_HEAD --fixed-strings --grep="$COMMIT_TITLE" --format="%H%x09%s%x09%(trailers:key=PR-URL,only,valueonly)" \ + | awk -F'\t' -v t="$COMMIT_TITLE" -v p="$PR_URL" '$2 == t && $3 == p { print $1; exit }' + ) - curl -fsL "$PR_URL.diff" | sed "$SED_CMD" >> "$ORIGINAL" - curl -fsL "$BACKPORT_PR_URL/commits/$COMMIT_SHA.diff" | sed "$SED_CMD" >> "$BACKPORT" + curl -fsL "$BACKPORT_PR_URL/commits/$COMMIT_SHA.patch" | sed "$SED_CMD" >> "$BACKPORT" + [ -n "$ORIGINAL_COMMIT" ] || { + echo "Error: Could not locate landed commit with title '$COMMIT_TITLE' in $REMOTE/$ORIGINAL_BASE" >&2 + continue + } + git format-patch --no-signature --stdout "${ORIGINAL_COMMIT}^!" | sed "$SED_CMD" >> "$ORIGINAL" done ${DIFF_CMD:-diff} "$ORIGINAL" "$BACKPORT" || echo "diff command exited with $?" >&2 From fc4399d417094433f2a139b13f8d88c0585a5064 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sat, 14 Nov 2026 18:31:26 +0100 Subject: [PATCH 2/5] fixup! tools: add support for multiple-commit PRs in `review_backport.sh` --- tools/actions/review_backport.sh | 58 +++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 13 deletions(-) diff --git a/tools/actions/review_backport.sh b/tools/actions/review_backport.sh index 66a9cdd06649..275584154fa6 100755 --- a/tools/actions/review_backport.sh +++ b/tools/actions/review_backport.sh @@ -19,6 +19,7 @@ SED_CMD= SED_CMD="${SED_CMD};"'s/^index [a-f0-9]\+..[a-f0-9]\+\( [0-7]\{6\}\)\?$/index eeeeeeeeee..eeeeeeeeee\1/g' SED_CMD="${SED_CMD};"'s/^From [a-f0-9]\{40\} /From 0000000000000000000000000000000000000000 /' SED_CMD="${SED_CMD};"'s/^@@ -[0-9]\+,[0-9]\+ +[0-9]\+,[0-9]\+ @@/@@ -111,1 +111,1 @@/' +SED_CMD="${SED_CMD};"'s#^\(Subject: [PATCH [0-9]\+\)/[0-9]\+]#\1]#' set -ex @@ -28,36 +29,67 @@ BACKPORT_PR_URL=$(gh pr view "$BACKPORT_PR" --json url --jq .url) ORIGINAL=$(mktemp) BACKPORT=$(mktemp) -trap 'set -x; rm -f "$ORIGINAL" "$BACKPORT"; set +x; trap - EXIT; exit' EXIT INT HUP - -${DIFF_CMD_NO_WAIT:-diff} "$ORIGINAL" "$BACKPORT" - -gh pr view "$BACKPORT_PR" --json commits --jq '.[] | map([ .oid, .messageHeadline, (.messageBody | match("(?:^|\\n)PR-URL: (https?://.+/pull/\\d+)(?:\\n|$)", "g") | .captures | last | .string)] | @tsv) | .[]' \ -| while read -r LINE; do +BUFFER=$(mktemp) +trap 'set -x; rm -f "$ORIGINAL" "$BACKPORT" "$BUFFER"; set +x; trap - EXIT; exit' EXIT INT HUP + +curl -fsSLo "$BUFFER" "$BACKPORT_PR_URL.patch" +sed "$SED_CMD" "$BUFFER" > "$BACKPORT" + +COMMITS=$( + gh pr view "$BACKPORT_PR" --json commits --jq ' + .[] + | map( + [ + .oid, + .messageHeadline, + ( + .messageBody + | match("(?:^|\\n)PR-URL: (https?://.+/pull/\\d+)(?:\\n|$)", "g") + | .captures + | last + | .string + ) + ] | @tsv) + | .[]' +) + +LAST_FETCHED= +COMMIT_RANGES= +while IFS= read -r LINE; do COMMIT_SHA=$(echo "$LINE" | cut -f1) COMMIT_TITLE=$(echo "$LINE" | cut -f2) PR_URL=$(echo "$LINE" | cut -f3) [ -n "$PR_URL" ] || { echo "Missing PR-URL in commit message for $COMMIT_SHA" >&2 - exit 1 + continue } ORIGINAL_BASE=$(gh pr view "$PR_URL" --json baseRefName -q '.baseRefName') - git fetch "$REMOTE" "$ORIGINAL_BASE" + [ "$ORIGINAL_BASE" = "$LAST_FETCHED" ] || { + git fetch "$REMOTE" "$ORIGINAL_BASE" + LAST_FETCHED="$ORIGINAL_BASE" + } + GIT_LOG_OUT=$( + git log FETCH_HEAD --fixed-strings --grep="$COMMIT_TITLE" --format="%H%x09%s%x09%(trailers:key=PR-URL,only,valueonly)" + ) ORIGINAL_COMMIT=$( - git log FETCH_HEAD --fixed-strings --grep="$COMMIT_TITLE" --format="%H%x09%s%x09%(trailers:key=PR-URL,only,valueonly)" \ - | awk -F'\t' -v t="$COMMIT_TITLE" -v p="$PR_URL" '$2 == t && $3 == p { print $1; exit }' + awk -F'\t' -v t="$COMMIT_TITLE" -v p="$PR_URL" '$2 == t && $3 == p { print $1; exit }' <> "$BACKPORT" [ -n "$ORIGINAL_COMMIT" ] || { echo "Error: Could not locate landed commit with title '$COMMIT_TITLE' in $REMOTE/$ORIGINAL_BASE" >&2 continue } - git format-patch --no-signature --stdout "${ORIGINAL_COMMIT}^!" | sed "$SED_CMD" >> "$ORIGINAL" -done + COMMIT_RANGES="${COMMIT_RANGES:+$COMMIT_RANGES }${ORIGINAL_COMMIT}" +done < "$BUFFER" +sed "$SED_CMD" "$BUFFER" > "$ORIGINAL" ${DIFF_CMD:-diff} "$ORIGINAL" "$BACKPORT" || echo "diff command exited with $?" >&2 set +x From 9b3a0f103613e80ba25f718d4044e2d375f5d6c5 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sat, 14 Nov 2026 18:44:32 +0100 Subject: [PATCH 3/5] fixup! --- tools/actions/review_backport.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/actions/review_backport.sh b/tools/actions/review_backport.sh index 275584154fa6..0ca60199d86d 100755 --- a/tools/actions/review_backport.sh +++ b/tools/actions/review_backport.sh @@ -35,7 +35,7 @@ trap 'set -x; rm -f "$ORIGINAL" "$BACKPORT" "$BUFFER"; set +x; trap - EXIT; exit curl -fsSLo "$BUFFER" "$BACKPORT_PR_URL.patch" sed "$SED_CMD" "$BUFFER" > "$BACKPORT" -COMMITS=$( +BACKPORTED_COMMITS=$( gh pr view "$BACKPORT_PR" --json commits --jq ' .[] | map( @@ -54,7 +54,7 @@ COMMITS=$( ) LAST_FETCHED= -COMMIT_RANGES= +ORIGINAL_COMMITS= while IFS= read -r LINE; do COMMIT_SHA=$(echo "$LINE" | cut -f1) COMMIT_TITLE=$(echo "$LINE" | cut -f2) @@ -83,12 +83,14 @@ EOF echo "Error: Could not locate landed commit with title '$COMMIT_TITLE' in $REMOTE/$ORIGINAL_BASE" >&2 continue } - COMMIT_RANGES="${COMMIT_RANGES:+$COMMIT_RANGES }${ORIGINAL_COMMIT}" + ORIGINAL_COMMITS="${ORIGINAL_COMMITS:+$ORIGINAL_COMMITS }${ORIGINAL_COMMIT}" done < "$BUFFER" +xargs git format-patch --no-signature --stdout --root --no-walk > "$BUFFER" < "$ORIGINAL" ${DIFF_CMD:-diff} "$ORIGINAL" "$BACKPORT" || echo "diff command exited with $?" >&2 From c3977499fd7fd1a366ec3f78bb26b0a71b940c7f Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sun, 15 Nov 2026 00:17:48 +0100 Subject: [PATCH 4/5] fixup! --- tools/actions/review_backport.sh | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tools/actions/review_backport.sh b/tools/actions/review_backport.sh index 0ca60199d86d..da1232945e79 100755 --- a/tools/actions/review_backport.sh +++ b/tools/actions/review_backport.sh @@ -54,8 +54,7 @@ BACKPORTED_COMMITS=$( ) LAST_FETCHED= -ORIGINAL_COMMITS= -while IFS= read -r LINE; do +ORIGINAL_COMMITS=$(while IFS= read -r LINE; do COMMIT_SHA=$(echo "$LINE" | cut -f1) COMMIT_TITLE=$(echo "$LINE" | cut -f2) PR_URL=$(echo "$LINE" | cut -f3) @@ -73,20 +72,17 @@ while IFS= read -r LINE; do GIT_LOG_OUT=$( git log FETCH_HEAD --fixed-strings --grep="$COMMIT_TITLE" --format="%H%x09%s%x09%(trailers:key=PR-URL,only,valueonly)" ) - ORIGINAL_COMMIT=$( - awk -F'\t' -v t="$COMMIT_TITLE" -v p="$PR_URL" '$2 == t && $3 == p { print $1; exit }' <&2 continue } - ORIGINAL_COMMITS="${ORIGINAL_COMMITS:+$ORIGINAL_COMMITS }${ORIGINAL_COMMIT}" + awk -F'\t' -v t="$COMMIT_TITLE" -v p="$PR_URL" '$2 == t && $3 == p { print $1; exit }' < "$BUFFER" < Date: Sun, 15 Nov 2026 01:28:06 +0100 Subject: [PATCH 5/5] fixup! --- tools/actions/review_backport.sh | 91 ++++++++++++++------------------ 1 file changed, 40 insertions(+), 51 deletions(-) diff --git a/tools/actions/review_backport.sh b/tools/actions/review_backport.sh index da1232945e79..8dd00a022117 100755 --- a/tools/actions/review_backport.sh +++ b/tools/actions/review_backport.sh @@ -19,72 +19,61 @@ SED_CMD= SED_CMD="${SED_CMD};"'s/^index [a-f0-9]\+..[a-f0-9]\+\( [0-7]\{6\}\)\?$/index eeeeeeeeee..eeeeeeeeee\1/g' SED_CMD="${SED_CMD};"'s/^From [a-f0-9]\{40\} /From 0000000000000000000000000000000000000000 /' SED_CMD="${SED_CMD};"'s/^@@ -[0-9]\+,[0-9]\+ +[0-9]\+,[0-9]\+ @@/@@ -111,1 +111,1 @@/' -SED_CMD="${SED_CMD};"'s#^\(Subject: [PATCH [0-9]\+\)/[0-9]\+]#\1]#' +SED_CMD="${SED_CMD};"'s#^\(Subject: \[PATCH [0-9]\+\)/[0-9]\+]#\1]#' set -ex REMOTE=${GIT_REMOTE:-https://github.com/${GH_REPO:-nodejs/node}.git} -BACKPORT_PR_URL=$(gh pr view "$BACKPORT_PR" --json url --jq .url) +case "$BACKPORT_PR" in + (https://github.com/*/pull/[0-9]*) BACKPORT_PR_URL=$BACKPORT_PR ;; + (*) BACKPORT_PR_URL=$(gh pr view "$BACKPORT_PR" --json url --jq .url) ;; +esac -ORIGINAL=$(mktemp) -BACKPORT=$(mktemp) -BUFFER=$(mktemp) -trap 'set -x; rm -f "$ORIGINAL" "$BACKPORT" "$BUFFER"; set +x; trap - EXIT; exit' EXIT INT HUP +WORKDIR=$(mktemp -d) +trap 'set -x; rm -rf "$WORKDIR"; set +x; trap - EXIT; exit' EXIT INT HUP +ORIGINAL=$WORKDIR/original.patch +BACKPORT=$WORKDIR/backport.patch +BUFFER=$WORKDIR/buffer.patch -curl -fsSLo "$BUFFER" "$BACKPORT_PR_URL.patch" +curl -fsSLo "$BUFFER" "$BACKPORT_PR_URL.patch?full_index=1" sed "$SED_CMD" "$BUFFER" > "$BACKPORT" -BACKPORTED_COMMITS=$( - gh pr view "$BACKPORT_PR" --json commits --jq ' - .[] - | map( - [ - .oid, - .messageHeadline, - ( - .messageBody - | match("(?:^|\\n)PR-URL: (https?://.+/pull/\\d+)(?:\\n|$)", "g") - | .captures - | last - | .string - ) - ] | @tsv) - | .[]' -) - -LAST_FETCHED= -ORIGINAL_COMMITS=$(while IFS= read -r LINE; do - COMMIT_SHA=$(echo "$LINE" | cut -f1) - COMMIT_TITLE=$(echo "$LINE" | cut -f2) - PR_URL=$(echo "$LINE" | cut -f3) - - [ -n "$PR_URL" ] || { +ORIGINAL_COMMITS=$( + LAST_FETCHED= + COMMIT_COUNT=$(git mailsplit -o"$WORKDIR" "$BUFFER") + i=${COMMIT_COUNT:?No commits found in PR $BACKPORT_PR} + while [ "$i" -gt 0 ]; do + MAIL=$WORKDIR/$(printf '%04d' "$i") + i=$((i - 1)) + + read -r _ COMMIT_SHA _ < "$MAIL" + PR_URL=$(git interpret-trailers --parse "$MAIL" | sed -n '/^PR-URL: /h;$ {x;s/^PR-URL: //p;}') + [ -n "$PR_URL" ] || { echo "Missing PR-URL in commit message for $COMMIT_SHA" >&2 continue - } - - ORIGINAL_BASE=$(gh pr view "$PR_URL" --json baseRefName -q '.baseRefName') - [ "$ORIGINAL_BASE" = "$LAST_FETCHED" ] || { - git fetch "$REMOTE" "$ORIGINAL_BASE" - LAST_FETCHED="$ORIGINAL_BASE" - } - GIT_LOG_OUT=$( - git log FETCH_HEAD --fixed-strings --grep="$COMMIT_TITLE" --format="%H%x09%s%x09%(trailers:key=PR-URL,only,valueonly)" - ) - [ -n "$GIT_LOG_OUT" ] || { - echo "Error: Could not locate landed commit with title '$COMMIT_TITLE' in $REMOTE/$ORIGINAL_BASE" >&2 - continue - } - awk -F'\t' -v t="$COMMIT_TITLE" -v p="$PR_URL" '$2 == t && $3 == p { print $1; exit }' <&2 + continue + } + T=$COMMIT_TITLE P=$PR_URL awk -F'\t' '$2 == ENVIRON["T"] && $3 == ENVIRON["P"] { print $1; exit }' < "$BUFFER" < "$BUFFER" < "$ORIGINAL"