@mikaelkaron/skills-cherry-pick-filter 0.5.1 → 0.6.0

package/dist/commands/cherry-pick-filter.js

@@ -1,5 +1,5 @@
 import { Args, Command, Flags } from "@oclif/core";
-import { exec, tryExec } from "../lib/git.js";
+import { checkout, cherryPick, diffTree, log, lsRemote, revParse, showRef, tryCheckout, } from "../lib/git.js";
 function out(sha) {
     if (!process.stdout.isTTY)
         process.stdout.write(sha + "\n");
@@ -49,23 +49,30 @@ All human-readable output goes to stderr. stdout emits one picked commit SHA per
         const { targetBranch } = args;
         const filters = flags.filter;
         const dryRun = flags["dry-run"];
-        const currentBranch = exec("git rev-parse --abbrev-ref HEAD");
+        const currentBranch = revParse(["--abbrev-ref", "HEAD"]);
         if (currentBranch === targetBranch) {
             this.error(`already on '${targetBranch}'.`, { exit: 1 });
         }
-        const localExists = tryExec(`git show-ref --verify --quiet refs/heads/${targetBranch}`).ok;
+        const localExists = showRef([
+            "--verify",
+            "--quiet",
+            `refs/heads/${targetBranch}`,
+        ]).ok;
         if (!localExists) {
-            const remoteResult = tryExec(`git ls-remote --heads origin ${targetBranch}`);
+            const remoteResult = lsRemote(["--heads", "origin", targetBranch]);
             if (remoteResult.ok && remoteResult.output.length > 0) {
                 this.logToStderr(`Checking out '${targetBranch}' from origin...`);
-                const checkoutResult = tryExec(`git checkout --track origin/${targetBranch}`);
+                const checkoutResult = tryCheckout([
+                    "--track",
+                    `origin/${targetBranch}`,
+                ]);
                 if (!checkoutResult.ok) {
                     this.logToStderr(checkoutResult.output);
                     this.error(`failed to checkout '${targetBranch}' from origin.`, {
                         exit: 1,
                     });
                 }
-                exec(`git checkout ${currentBranch}`);
+                checkout([currentBranch]);
             }
             else {
                 this.error(`branch '${targetBranch}' not found locally or on origin.`, {
@@ -76,8 +83,14 @@ All human-readable output goes to stderr. stdout emits one picked commit SHA per
         const dryRunLabel = dryRun ? " (dry run)" : "";
         this.logToStderr(`\nSyncing ${currentBranch} → ${targetBranch}${dryRunLabel}`);
         this.logToStderr(`Filter prefixes: ${filters.join(", ")}\n`);
-        const pathspecs = filters.map((f) => `:!${f}`).join(" ");
-        const logOutput = tryExec(`git log ${targetBranch}..HEAD --reverse --format="%H %s" -- ${pathspecs}`);
+        const pathspecs = filters.map((f) => `:!${f}`);
+        const logOutput = log([
+            `${targetBranch}..HEAD`,
+            "--reverse",
+            "--format=%H %s",
+            "--",
+            ...pathspecs,
+        ]);
         if (!logOutput.ok || !logOutput.output) {
             this.logToStderr("Already up to date.");
             return;
@@ -85,14 +98,17 @@ All human-readable output goes to stderr. stdout emits one picked commit SHA per
         const candidates = logOutput.output
             .split("\n")
             .filter(Boolean)
-            .map((line) => ({ sha: line.slice(0, 40), subject: line.slice(41) }));
+            .map((line) => ({
+            sha: line.slice(0, 40),
+            subject: line.slice(41),
+        }));
         if (candidates.length === 0) {
             this.logToStderr("Already up to date.");
             return;
         }
         const mixed = [];
         for (const { sha, subject } of candidates) {
-            const files = exec(`git diff-tree --no-commit-id -r --name-only ${sha}`)
+            const files = diffTree(["--no-commit-id", "-r", "--name-only", sha])
                 .split("\n")
                 .filter(Boolean);
             const filteredFiles = files.filter((f) => filters.some((prefix) => f.startsWith(prefix)));
@@ -128,10 +144,10 @@ All human-readable output goes to stderr. stdout emits one picked commit SHA per
             this.logToStderr("Dry run complete. Run without --dry-run to apply.");
             return;
         }
-        exec(`git checkout ${targetBranch}`);
+        checkout([targetBranch]);
         let picked = 0;
         for (const { sha, subject } of candidates) {
-            const result = tryExec(`git cherry-pick ${sha}`);
+            const result = cherryPick([sha]);
             if (result.ok) {
                 this.logToStderr(`  pick ${sha.slice(0, 9)} ${subject}`);
                 out(sha);
@@ -146,7 +162,7 @@ All human-readable output goes to stderr. stdout emits one picked commit SHA per
                 });
             }
         }
-        exec(`git checkout ${currentBranch}`);
+        checkout([currentBranch]);
         this.logToStderr(`\nDone: ${picked} picked`);
     }
 }

package/dist/lib/git.d.ts

@@ -1,5 +1,23 @@
-export declare function exec(cmd: string): string;
-export declare function tryExec(cmd: string): {
+export declare function revParse(args: string[], cmd?: string): string;
+export declare function showRef(args: string[], cmd?: string): {
+    ok: boolean;
+    output: string;
+};
+export declare function lsRemote(args: string[], cmd?: string): {
+    ok: boolean;
+    output: string;
+};
+export declare function checkout(args: string[], cmd?: string): string;
+export declare function tryCheckout(args: string[], cmd?: string): {
+    ok: boolean;
+    output: string;
+};
+export declare function log(args: string[], cmd?: string): {
+    ok: boolean;
+    output: string;
+};
+export declare function diffTree(args: string[], cmd?: string): string;
+export declare function cherryPick(args: string[], cmd?: string): {
     ok: boolean;
     output: string;
 };

package/dist/lib/git.js

@@ -1,16 +1,56 @@
-import { execSync } from "node:child_process";
-export function exec(cmd) {
-    return execSync(cmd, {
+import { spawnSync } from "node:child_process";
+import which from "which";
+function defaultCmd() {
+    return (process.env["GIT_CMD"] ?? which.sync("git", { nothrow: true }) ?? "git");
+}
+function run(args, cmd = defaultCmd()) {
+    const result = spawnSync(cmd, args, {
         encoding: "utf8",
         stdio: ["pipe", "pipe", "inherit"],
-    }).trim();
+    });
+    if (result.error) {
+        throw new Error(result.error.message.includes("ENOENT")
+            ? "git not found. Install it from https://git-scm.com"
+            : result.error.message);
+    }
+    if (result.status !== 0) {
+        throw new Error(result.stderr?.trim() ||
+            `git ${args[0]} failed with exit code ${result.status}`);
+    }
+    return result.stdout.trim();
 }
-export function tryExec(cmd) {
+function tryRun(args, cmd = defaultCmd()) {
     try {
-        return { ok: true, output: exec(cmd) };
+        return { ok: true, output: run(args, cmd) };
     }
     catch (e) {
         const err = e;
-        return { ok: false, output: err.stderr ?? err.message ?? "" };
+        if (err.message?.includes("git not found"))
+            throw e;
+        return { ok: false, output: err.message ?? "" };
     }
 }
+export function revParse(args, cmd) {
+    return run(["rev-parse", ...args], cmd);
+}
+export function showRef(args, cmd) {
+    return tryRun(["show-ref", ...args], cmd);
+}
+export function lsRemote(args, cmd) {
+    return tryRun(["ls-remote", ...args], cmd);
+}
+export function checkout(args, cmd) {
+    return run(["checkout", ...args], cmd);
+}
+export function tryCheckout(args, cmd) {
+    return tryRun(["checkout", ...args], cmd);
+}
+export function log(args, cmd) {
+    return tryRun(["log", ...args], cmd);
+}
+export function diffTree(args, cmd) {
+    return run(["diff-tree", ...args], cmd);
+}
+export function cherryPick(args, cmd) {
+    return tryRun(["cherry-pick", ...args], cmd);
+}

package/oclif.manifest.json

@@ -61,5 +61,5 @@
       ]
     }
   },
-  "version": "0.5.1"
+  "version": "0.6.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikaelkaron/skills-cherry-pick-filter",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "bin": {
     "mks-cherry-pick-filter": "bin/run.js"
   },
@@ -23,7 +23,8 @@
     "test:types": "tsc -p test/tsconfig.json"
   },
   "dependencies": {
-    "@oclif/core": "^4"
+    "@oclif/core": "^4",
+    "which": "^7.0.0"
   },
   "devDependencies": {
     "@oclif/test": "^4.1.18",