@evanpurkhiser/tooling-personal 1.51.0 → 1.53.0

package/dist/cherry-pick.js

@@ -5,6 +5,41 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cherryPickOnto = cherryPickOnto;
 const simple_git_1 = __importDefault(require("simple-git"));
+/**
+ * Produce an actionable error for a failed `merge-tree` cherry-pick.
+ *
+ * The common failure mode for this workflow is picking a commit that depends
+ * on earlier local-only commits not yet on the base — the merge then conflicts
+ * with content the base hasn't seen. Detect that case explicitly so the caller
+ * (often an LLM) gets a clear next step instead of a generic "conflict".
+ */
+async function buildPickError(git, sha, base, baseSha, parentSha, conflictLines) {
+    const conflictFiles = [
+        ...new Set(conflictLines.map(line => line.split('\t').slice(1).join('\t'))),
+    ];
+    // Local commits between `base` and the picked commit's parent that touched
+    // any conflicting file are candidate blockers — the actual conflict is
+    // caused by at least one of them. We don't narrow further (would require
+    // blaming the conflicting regions specifically), but in this workflow
+    // history is linear so any narrower set would still need to be on the
+    // remote alongside its ancestors.
+    const candidateLog = (await git.raw([
+        'log',
+        '--reverse',
+        '--format=%h %s',
+        `${baseSha}..${parentSha}`,
+        '--',
+        ...conflictFiles,
+    ])).trim();
+    const fileList = conflictFiles.map(file => `- ${file}`).join('\n');
+    const header = `Cannot cherry-pick ${sha.slice(0, 8)} onto tip of ${base}, merge conflicts in:\n${fileList}`;
+    if (!candidateLog) {
+        return new Error(header);
+    }
+    const candidates = candidateLog.split('\n');
+    const candidateList = candidates.map(line => `- ${line}`).join('\n');
+    return new Error(`${header}\n\n${candidates.length} earlier local commit(s) changed those file(s):\n${candidateList}`);
+}
 /**
  * Build a commit object equivalent to cherry-picking `sha` onto `base`, without
  * touching the working tree or any ref.
@@ -21,19 +56,21 @@ async function cherryPickOnto(sha, base) {
     const git = (0, simple_git_1.default)();
     const parentSha = (await git.revparse([`${sha}^`])).trim();
     const baseSha = (await git.revparse([base])).trim();
-    let treeOid;
-    try {
-        treeOid = (await git.raw([
-            'merge-tree',
-            '--write-tree',
-            '--no-messages',
-            `--merge-base=${parentSha}`,
-            baseSha,
-            sha,
-        ])).trim();
-    }
-    catch (error) {
-        throw new Error(`Conflicts applying ${sha.slice(0, 8)} onto ${base}. Rebase locally and retry.\n${error}`, { cause: error });
+    // `git merge-tree --write-tree` exits non-zero on conflicts, but simple-git's
+    // .raw does not surface that — it just returns stdout. On success stdout is
+    // a single tree OID; on conflict it's the tree OID followed by lines of
+    // `<mode> <oid> <stage>\t<path>`. Detect the conflict case explicitly.
+    const mergeOutput = (await git.raw([
+        'merge-tree',
+        '--write-tree',
+        '--no-messages',
+        `--merge-base=${parentSha}`,
+        baseSha,
+        sha,
+    ])).trim();
+    const [treeOid, ...conflictLines] = mergeOutput.split('\n');
+    if (conflictLines.length > 0) {
+        throw await buildPickError(git, sha, base, baseSha, parentSha, conflictLines);
     }
     const info = await git.raw(['show', '-s', '--format=%an%n%ae%n%aI%n%B', sha]);
     const lines = info.split('\n');

package/dist/editor.js

@@ -14,7 +14,7 @@ async function editPullRequest(commit) {
     const prTemplate = `${commit.message}${split}${messageBody}`;
     const pullEditFile = node_path_1.default.join(await (0, utils_1.getRepoPath)(), '.git', 'PULLREQ_EDITMSG');
     await promises_1.default.writeFile(pullEditFile, prTemplate);
-    const quotedFile = `'${pullEditFile.replace(/'/g, `'\\''`)}'`;
+    const quotedFile = `'${pullEditFile.replaceAll(`'`, `'\\''`)}'`;
     const editor = (0, node_child_process_1.spawn)(`${process.env.EDITOR ?? 'vim'} ${quotedFile}`, {
         shell: true,
         stdio: 'inherit',

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@evanpurkhiser/tooling-personal",
-  "version": "1.51.0",
+  "version": "1.53.0",
   "description": "Evan Purkhiser's personal tooling",
   "license": "MIT",
   "author": "Evan Purkhiser",