tools: stage rebased PR commit

Author: canblmz1

.github/workflows/pr-64954-rebuild.yml

@@ -14,20 +14,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 3
+          fetch-depth: 4
 
-      - name: Rebuild fix on upstream main
+      - name: Build rebased commit object
         shell: bash
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
         run: |
           set -euo pipefail
 
           ORIGINAL=ed1a29ad1e4c657e6adbe3f9bde275e14928e6c0
-          BRANCH=fix/readdir-recursive-buffer-path
-
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git remote add upstream https://github.com/nodejs/node.git 2>/dev/null || true
-          git fetch upstream main
+          git fetch --depth=1 upstream main
           git checkout --detach upstream/main
 
           python3 <<'PY'
@@ -41,13 +39,11 @@ jobs:
                   raise SystemExit(f'{path}: expected exactly one match, found {count}: {old!r}')
               p.write_text(text.replace(old, new, 1))
 
-          # Shared Buffer-aware path helpers.
           replace_once(
               'lib/internal/fs/utils.js',
               "const pathModule = require('path');\nconst kType = Symbol('type');",
               "const pathModule = require('path');\nconst binding = internalBinding('fs');\nconst kType = Symbol('type');",
           )
-
           replace_once(
               'lib/internal/fs/utils.js',
               "function getDirents(path, { 0: names, 1: types }, callback) {",
@@ -61,82 +57,140 @@ jobs:
 
           function getDirents(path, { 0: names, 1: types }, callback) {""",
           )
-
           replace_once(
               'lib/internal/fs/utils.js',
               "  getDirents,\n  getOptions,\n  getValidatedFd,",
               "  getDirents,\n  getOptions,\n  isDirectoryPath,\n  join,\n  getValidatedFd,",
           )
 
-          # Callback/sync recursive readdir now shares one traversal helper on main.
           replace_once(
               'lib/fs.js',
               "  handleErrorFromBinding,\n  preprocessSymlinkDestination,",
               "  handleErrorFromBinding,\n  isDirectoryPath,\n  join: joinPath,\n  preprocessSymlinkDestination,",
           )
-
           replace_once(
               'lib/fs.js',
               " * @param {string} dir\n * @param {string} prefix",
               " * @param {string | Buffer} dir\n * @param {string | Buffer} prefix",
           )
-
           replace_once(
               'lib/fs.js',
               "    const relative = prefix === '' ? name : `${prefix}${pathModule.sep}${name}`;\n    let isDirectory;",
               "    const relative = prefix === '' ? name : joinPath(prefix, name);\n    const fullPath = joinPath(dir, name);\n    let isDirectory;",
           )
-
           replace_once(
               'lib/fs.js',
               "        (dirent.isSymbolicLink() && binding.internalModuleStat(pathModule.join(dir, name)) === 1);",
               "        (dirent.isSymbolicLink() && isDirectoryPath(fullPath));",
           )
-
           replace_once(
               'lib/fs.js',
               "         binding.internalModuleStat(pathModule.join(dir, name)) === 1);",
               "         isDirectoryPath(fullPath));",
           )
-
           replace_once(
               'lib/fs.js',
               "      ArrayPrototypePush(context.dirs, pathModule.join(dir, name));",
               "      ArrayPrototypePush(context.dirs, fullPath);",
           )
 
-          # Promise recursive readdir uses the same Buffer-safe helpers.
           replace_once(
               'lib/internal/fs/promises.js',
               "  getReadFileBufferByteLengthName,\n  preprocessSymlinkDestination,",
               "  getReadFileBufferByteLengthName,\n  isDirectoryPath,\n  join: joinPath,\n  preprocessSymlinkDestination,",
           )
-
           replace_once(
               'lib/internal/fs/promises.js',
               "      const relative = prefix === '' ? name : `${prefix}${pathModule.sep}${name}`;\n      let isDirectory;",
               "      const relative = prefix === '' ? name : joinPath(prefix, name);\n      const direntPath = joinPath(path, name);\n      let isDirectory;",
           )
-
           replace_once(
               'lib/internal/fs/promises.js',
               "           binding.internalModuleStat(pathModule.join(path, name)) === 1);",
               "           isDirectoryPath(direntPath));",
           )
-
           replace_once(
               'lib/internal/fs/promises.js',
               "      if (isDirectory) {\n        const direntPath = pathModule.join(path, name);\n        ArrayPrototypePush(queue, [direntPath, relative, await readdirWithTypes(direntPath)]);",
               "      if (isDirectory) {\n        ArrayPrototypePush(queue, [direntPath, relative, await readdirWithTypes(direntPath)]);",
           )
           PY
 
-          # Keep the regression test from the original PR commit.
           git show "$ORIGINAL":test/parallel/test-fs-readdir-recursive-buffer.js \
             > test/parallel/test-fs-readdir-recursive-buffer.js
-
           git diff --check
-          git add lib/fs.js lib/internal/fs/promises.js lib/internal/fs/utils.js \
-            test/parallel/test-fs-readdir-recursive-buffer.js
-          git commit -C "$ORIGINAL"
-          git push --force origin HEAD:"$BRANCH"
+
+          python3 <<'PY'
+          import base64
+          import json
+          import os
+          import subprocess
+          import urllib.request
+          from pathlib import Path
+
+          repo = 'canblmz1/node'
+          token = os.environ['GITHUB_TOKEN']
+
+          def run(*args):
+              return subprocess.check_output(args, text=True).strip()
+
+          def api(path, data):
+              body = json.dumps(data).encode()
+              req = urllib.request.Request(
+                  'https://api.github.com' + path,
+                  data=body,
+                  method='POST',
+                  headers={
+                      'Authorization': f'Bearer {token}',
+                      'Accept': 'application/vnd.github+json',
+                      'X-GitHub-Api-Version': '2022-11-28',
+                      'User-Agent': 'pr-64954-rebuilder',
+                      'Content-Type': 'application/json',
+                  },
+              )
+              with urllib.request.urlopen(req) as response:
+                  return json.load(response)
+
+          parent = run('git', 'rev-parse', 'upstream/main')
+          base_tree = run('git', 'rev-parse', 'upstream/main^{tree}')
+          original = 'ed1a29ad1e4c657e6adbe3f9bde275e14928e6c0'
+          message = run('git', 'show', '-s', '--format=%B', original)
+
+          paths = [
+              'lib/fs.js',
+              'lib/internal/fs/promises.js',
+              'lib/internal/fs/utils.js',
+              'test/parallel/test-fs-readdir-recursive-buffer.js',
+          ]
+          entries = []
+          for path in paths:
+              content = base64.b64encode(Path(path).read_bytes()).decode()
+              blob = api(f'/repos/{repo}/git/blobs', {
+                  'content': content,
+                  'encoding': 'base64',
+              })
+              entries.append({
+                  'path': path,
+                  'mode': '100644',
+                  'type': 'blob',
+                  'sha': blob['sha'],
+              })
+
+          tree = api(f'/repos/{repo}/git/trees', {
+              'base_tree': base_tree,
+              'tree': entries,
+          })
+          commit = api(f'/repos/{repo}/git/commits', {
+              'message': message,
+              'tree': tree['sha'],
+              'parents': [parent],
+              'author': {
+                  'name': 'Can',
+                  'email': 'hello@syntaxandco.com',
+                  'date': '2026-08-02T10:00:57Z',
+              },
+          })
+          print('CREATED_COMMIT_SHA=' + commit['sha'])
+          print('PARENT_SHA=' + parent)
+          print('TREE_SHA=' + tree['sha'])
+          PY