Repository: nodejs/node
Pull request: tools: add support for URLs to PR commits in `merge.sh`

Instead of relying on the collaborator to split the information manually, it's quite trivial for the bash script to extract it from the single URL that can easily be obtained from GitHub web UI.

<!--
Before submitting a pull request, please read:

- the CONTRIBUTING guide at https://github.com/nodejs/node/blob/HEAD/CONTRIBUTING.md
- the commit message formatting guidelines at
  https://github.com/nodejs/node/blob/HEAD/doc/contributing/pull-requests.md#commit-message-guidelines

For code changes:
1. Include tests for any bug fixes or new features.
2. Update documentation if relevant.
3. Ensure that `make -j4 test` (UNIX), or `vcbuild test` (Windows) passes.

If you believe this PR should be highlighted in the Node.js CHANGELOG
please add the `notable-change` label.

Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.
-->


Changed files:
filename: tools/actions/merge.sh
patch: @@ -6,25 +6,46 @@
 # To land a PR with this tool:
 # 1. Run `git node land <pr-id-or-url> --fixupAll`
 # 2. Copy the hash of the commit at the top of the PR branch.
-# 3. Run `tools/actions/merge.sh <pr-id-or-url> <commit-hash>`.
+# 3. Run `tools/actions/merge.sh <pr-id-or-url> <commit-hash>` or `tools/actions/merge.sh <url-to-PR-commit>`.
 
 set -xe
 
 pr=$1
 commit_head=$2
-shift 2 || { echo "Expected two arguments"; exit 1; }
 
 OWNER=nodejs
 REPOSITORY=node
 
 if expr "X$pr" : 'Xhttps://github.com/[^/]\{1,\}/[^/]\{1,\}/pull/[0-9]\{1,\}' >/dev/null; then
   OWNER="$(echo "$pr" | awk 'BEGIN { FS = "/" } ; { print $4 }')"
   REPOSITORY="$(echo "$pr" | awk 'BEGIN { FS = "/" } ; { print $5 }')"
+  [ -n "$commit_head" ] || commit_head="$(echo "$pr" | awk 'BEGIN { FS = "/" } ; { print $9 }')"
   pr="$(echo "$pr" | awk 'BEGIN { FS = "/" } ; { print $7 }')"
-elif ! expr "X$pr" : 'X[0-9]\{1,\}' >/dev/null; then
-  echo "The first argument should be the PR ID or URL"
 fi
 
+validation_error=
+if ! expr "X${pr}X" : 'X[0-9]\{1,\}X' >/dev/null; then
+  set +x
+  echo "Invalid PR ID: $pr"
+  validation_error=1
+fi
+if ! expr "X${commit_head}X" : 'X[a-f0-9]\{40\}X' >/dev/null; then
+  set +x
+  echo "Invalid PR head: $commit_head"
+  validation_error=1
+fi
+[ -z "$validation_error" ] || {
+  echo 'Usage:'
+  printf '\t%s <pr-id-or-url> <commit-hash>\n' "$0"
+  echo 'or:'
+  printf '\t%s <url-to-PR-commit>\n' "$0"
+  echo 'Examples:'
+  printf '\t%s 12345 aaaaabbbbbcccccdddddeeeeefffff1111122222\n' "$0"
+  printf '\t%s https://github.com/%s/pull/12345 aaaaabbbbbcccccdddddeeeeefffff1111122222\n' "$0" "$OWNER/$REPOSITORY"
+  printf '\t%s https://github.com/%s/pull/12345/commits/aaaaabbbbbcccccdddddeeeeefffff1111122222\n' "$0" "$OWNER/$REPOSITORY"
+  exit 1
+}
+
 git log -1 HEAD  --pretty='format:%B' | git interpret-trailers --parse --no-divider | \
   grep -q -x "^PR-URL: https://github.com/$OWNER/$REPOSITORY/pull/$pr$" || {
     echo "Invalid PR-URL trailer"