tether-sync 0.2.0 → 0.6.0

package/bin/{chunk-NDKBAHAG.js → chunk-KG4OTE34.js}

@@ -99,7 +99,7 @@ function call(endpoint, method, params = {}, timeoutMs = 10 * 60 * 1e3) {
 }
 
 // packages/client/src/version.js
-var VERSION = "0.2.0";
+var VERSION = "0.6.0";
 
 // packages/client/src/update.js
 import fs2 from "node:fs";
@@ -154,10 +154,33 @@ function npmInstall(spec, prefix) {
 // packages/client/src/git.js
 import fs3 from "node:fs";
 import path3 from "node:path";
-import { execFileSync } from "node:child_process";
+import { execFileSync, spawnSync as spawnSync2 } from "node:child_process";
 var GIT_MODES = ["keep", "follow"];
+var gitExe;
+function gitBinary() {
+  if (gitExe !== void 0) return gitExe;
+  const candidates = ["git"];
+  if (isWindows) {
+    const pf = [process.env.ProgramFiles, process.env["ProgramFiles(x86)"], process.env.LOCALAPPDATA && path3.join(process.env.LOCALAPPDATA, "Programs")].filter(Boolean);
+    for (const p of pf) candidates.push(path3.join(p, "Git", "cmd", "git.exe"));
+    const desktop = process.env.LOCALAPPDATA && path3.join(process.env.LOCALAPPDATA, "GitHubDesktop");
+    if (desktop && fs3.existsSync(desktop)) {
+      for (const app of fs3.readdirSync(desktop).filter((d) => d.startsWith("app-")).sort().reverse()) {
+        candidates.push(path3.join(desktop, app, "resources", "app", "git", "cmd", "git.exe"));
+      }
+    }
+  } else candidates.push("/usr/bin/git", "/usr/local/bin/git");
+  gitExe = candidates.find((c) => spawnSync2(c, ["--version"], { stdio: "ignore", windowsHide: true }).status === 0) ?? null;
+  return gitExe;
+}
 function git(cwd, args) {
-  return execFileSync("git", ["-C", cwd, ...args], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], windowsHide: true }).trim();
+  const exe = gitBinary();
+  if (!exe) throw new Error("git is not installed");
+  return execFileSync(exe, ["-C", cwd, ...args], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], windowsHide: true, maxBuffer: 16 * 1024 * 1024 }).replace(/\r?\n$/, "");
+}
+function gitOk(cwd, args) {
+  const exe = gitBinary();
+  return !!exe && spawnSync2(exe, ["-C", cwd, ...args], { stdio: "ignore", windowsHide: true }).status === 0;
 }
 function findRepo(p) {
   let dir = path3.resolve(p);
@@ -166,11 +189,23 @@ function findRepo(p) {
     if (up === dir) return null;
     dir = up;
   }
-  try {
-    const [root, gitDir, hooks] = git(dir, ["rev-parse", "--show-toplevel", "--absolute-git-dir", "--git-path", "hooks"]).split(/\r?\n/);
-    return { root: path3.resolve(root), gitDir: path3.resolve(gitDir), hooksDir: path3.resolve(dir, hooks) };
-  } catch {
-    return null;
+  if (gitBinary()) {
+    try {
+      const [root, gitDir] = git(dir, ["rev-parse", "--show-toplevel", "--absolute-git-dir"]).split(/\r?\n/);
+      return { root: path3.resolve(root), gitDir: path3.resolve(gitDir) };
+    } catch {
+      return null;
+    }
+  }
+  for (let d = dir; ; d = path3.dirname(d)) {
+    const dot = path3.join(d, ".git");
+    const st = fs3.existsSync(dot) ? fs3.statSync(dot) : null;
+    if (st?.isDirectory()) return { root: d, gitDir: dot };
+    if (st?.isFile()) {
+      const m = fs3.readFileSync(dot, "utf8").match(/^gitdir:\s*(.+)$/m);
+      if (m) return { root: d, gitDir: path3.resolve(d, m[1].trim()) };
+    }
+    if (path3.dirname(d) === d) return null;
   }
 }
 function gitBusy(gitDir) {
@@ -183,47 +218,135 @@ function gitBusy(gitDir) {
   if (has("REVERT_HEAD")) return "revert in progress";
   return null;
 }
-var HOOKS = ["post-merge", "post-checkout", "post-rewrite"];
-var quote = (s) => `'${s.replace(/\\/g, "/").replace(/'/g, `'\\''`)}'`;
-var begin = (home) => `# >>> tether (${home.replace(/\\/g, "/")}) >>>`;
-var end = (home) => `# <<< tether (${home.replace(/\\/g, "/")}) <<<`;
-function installHooks(hooksDir, { home, node, cli }) {
-  fs3.mkdirSync(hooksDir, { recursive: true });
-  for (const hook of HOOKS) {
-    const file = path3.join(hooksDir, hook);
-    let text = fs3.existsSync(file) ? fs3.readFileSync(file, "utf8") : "#!/bin/sh\n";
-    text = stripBlock(text, home);
-    const block = [
-      begin(home),
-      "# Lets Tether pick up files git changed (follow mode). Remove with `tether git <path> --mode keep`.",
-      `TETHER_HOME=${quote(home)} ${quote(node)} ${quote(cli)} git-sync --hook ${hook} --repo "$(pwd)" >/dev/null 2>&1 || true`,
-      end(home)
-    ].join("\n");
-    fs3.writeFileSync(file, `${text.replace(/\s*$/, "")}
-
-${block}
-`);
-    try {
-      fs3.chmodSync(file, 493);
-    } catch {
+var rel = (root, abs) => path3.relative(root, abs).split(path3.sep).join("/");
+var head = (root) => {
+  try {
+    return git(root, ["rev-parse", "--verify", "-q", "HEAD"]);
+  } catch {
+    return null;
+  }
+};
+function fileBlob(root, abs) {
+  try {
+    return git(root, ["-c", "filter.tether-keep.clean=", "hash-object", `--path=${rel(root, abs)}`, "--", abs]);
+  } catch {
+    return null;
+  }
+}
+function blobAt(root, rev, abs) {
+  try {
+    return git(root, ["rev-parse", "--verify", "-q", `${rev}:${rel(root, abs)}`]);
+  } catch {
+    return null;
+  }
+}
+function indexBlob(root, abs) {
+  try {
+    const line = git(root, ["ls-files", "-s", "--", rel(root, abs)]);
+    return line ? line.split(/\s+/)[1] : null;
+  } catch {
+    return null;
+  }
+}
+function changeFromGit(root, abs) {
+  const blob = fileBlob(root, abs);
+  if (!blob) return { fromGit: false };
+  const h = head(root);
+  if (h && blobAt(root, "HEAD", abs) === blob) return { fromGit: true, commit: h };
+  if (indexBlob(root, abs) === blob) return { fromGit: true, commit: null };
+  return { fromGit: false };
+}
+var isTracked = (root, abs) => gitOk(root, ["ls-files", "--error-unmatch", "--", rel(root, abs)]);
+var FILTER = "tether-keep";
+var CLEAN = `sh -c 'git cat-file blob ":$1" 2>/dev/null || cat' -- %f`;
+function attributesFile(root) {
+  return path3.resolve(root, git(root, ["rev-parse", "--git-path", "info/attributes"]));
+}
+function attrLine(relPath) {
+  const pattern = /[\s"\\]/.test(relPath) ? `"/${relPath.replace(/["\\]/g, "\\$&")}"` : `/${relPath.replace(/[*?[\]!]/g, "\\$&")}`;
+  return `${pattern} filter=${FILTER}`;
+}
+var readLines = (file) => fs3.existsSync(file) ? fs3.readFileSync(file, "utf8").split(/\r?\n/).filter((l) => l !== "") : [];
+function setKeep(root, abs, on) {
+  if (!gitBinary()) return false;
+  try {
+    const file = attributesFile(root);
+    const line = attrLine(rel(root, abs));
+    const lines = readLines(file);
+    const has = lines.includes(line);
+    if (on) {
+      git(root, ["config", `filter.${FILTER}.clean`, CLEAN]);
+      git(root, ["config", `filter.${FILTER}.required`, "false"]);
+      if (!has) {
+        fs3.mkdirSync(path3.dirname(file), { recursive: true });
+        fs3.writeFileSync(file, [...lines, line].join("\n") + "\n");
+      }
+      restage(root, abs);
+    } else if (has) {
+      const rest = lines.filter((l) => l !== line);
+      fs3.writeFileSync(file, rest.length ? rest.join("\n") + "\n" : "");
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isKept(root, abs) {
+  try {
+    return readLines(attributesFile(root)).includes(attrLine(rel(root, abs)));
+  } catch {
+    return false;
+  }
+}
+function restage(root, abs) {
+  if (isTracked(root, abs)) gitOk(root, ["add", "--", rel(root, abs)]);
+}
+var isAncestor = (root, commit) => !!commit && gitOk(root, ["merge-base", "--is-ancestor", commit, "HEAD"]);
+function changesBetween(root, from, to) {
+  try {
+    const out = git(root, ["-c", "core.quotePath=false", "log", "--reverse", "--first-parent", "--format=%x01", "--name-status", "-M", `${from}..${to}`]);
+    const renames = /* @__PURE__ */ new Map();
+    const added = /* @__PURE__ */ new Set();
+    for (const line of out.split(/\r?\n/)) {
+      const parts = line.split("	");
+      if (parts.length < 2) continue;
+      const status = parts[0][0];
+      if (status === "R") {
+        const [, oldP, newP] = parts;
+        const origin = [...renames.entries()].find(([, cur]) => cur === oldP)?.[0] ?? oldP;
+        if (added.delete(oldP)) added.add(newP);
+        else renames.set(origin, newP);
+      } else if (status === "A") added.add(parts[1]);
+      else if (status === "D") {
+        added.delete(parts[1]);
+        for (const [o, cur] of renames) if (cur === parts[1]) renames.delete(o);
+      }
     }
+    const abs = (p) => path3.join(root, ...p.split("/"));
+    return [
+      ...[...renames].map(([o, n]) => ({ status: "R", from: abs(o), to: abs(n) })),
+      ...[...added].map((p) => ({ status: "A", from: abs(p), to: abs(p) }))
+    ];
+  } catch {
+    return [];
   }
 }
+var HOOKS = ["post-merge", "post-checkout", "post-rewrite"];
+var begin = (home) => `# >>> tether (${home.replace(/\\/g, "/")}) >>>`;
+var end = (home) => `# <<< tether (${home.replace(/\\/g, "/")}) <<<`;
 function removeHooks(hooksDir, home) {
   for (const hook of HOOKS) {
     const file = path3.join(hooksDir, hook);
     if (!fs3.existsSync(file)) continue;
-    const text = stripBlock(fs3.readFileSync(file, "utf8"), home);
+    let text = fs3.readFileSync(file, "utf8");
+    const b = text.indexOf(begin(home));
+    if (b < 0) continue;
+    const e = text.indexOf(end(home), b);
+    text = (text.slice(0, b) + (e < 0 ? "" : text.slice(e + end(home).length))).replace(/\n{3,}/g, "\n\n");
     if (/^(#!.*\n)?\s*$/.test(text)) fs3.rmSync(file);
     else fs3.writeFileSync(file, text.replace(/\s*$/, "\n"));
   }
 }
-function stripBlock(text, home) {
-  const b = text.indexOf(begin(home));
-  if (b < 0) return text;
-  const e = text.indexOf(end(home), b);
-  return (text.slice(0, b) + (e < 0 ? "" : text.slice(e + end(home).length))).replace(/\n{3,}/g, "\n\n");
-}
 
 export {
   isWindows,
@@ -241,8 +364,19 @@ export {
   prefixOf,
   npmInstall,
   GIT_MODES,
+  gitBinary,
   findRepo,
   gitBusy,
-  installHooks,
+  head,
+  fileBlob,
+  blobAt,
+  indexBlob,
+  changeFromGit,
+  isTracked,
+  setKeep,
+  isKept,
+  restage,
+  isAncestor,
+  changesBetween,
   removeHooks
 };