@evanpurkhiser/tooling-personal 1.52.0 → 1.53.0

package/dist/cherry-pick.js

@@ -31,16 +31,14 @@ async function buildPickError(git, sha, base, baseSha, parentSha, conflictLines)
         '--',
         ...conflictFiles,
     ])).trim();
-    if (candidateLog) {
-        const count = candidateLog.split('\n').length;
-        return new Error(`Cannot cherry-pick ${sha.slice(0, 8)} onto tip of ${base}: ` +
-            `merge conflicts in ${conflictFiles.join(', ')}. ` +
-            `${count} earlier local commit(s) changed those file(s); ` +
-            `one or more is the source of the conflict and must be on the remote ` +
-            `before a PR can be opened:\n${candidateLog}`);
+    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);
     }
-    return new Error(`Cannot cherry-pick ${sha.slice(0, 8)} onto ${base}: ` +
-        `content conflicts in ${conflictFiles.join(', ')}. Rebase locally and retry.`);
+    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

package/package.json

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