@davmash/bygone 0.8.9 → 0.8.11

package/out/standalone-main.js

@@ -2624,6 +2624,7 @@ __export(gitComparison_exports, {
   listBranchCommits: () => listBranchCommits,
   listChangedPaths: () => listChangedPaths,
   materializeBranchReviewTrees: () => materializeBranchReviewTrees,
+  materializeGitTree: () => materializeGitTree,
   parseNameStatusZ: () => parseNameStatusZ,
   resolveBranchReviewRange: () => resolveBranchReviewRange,
   resolveReviewPathPair: () => resolveReviewPathPair
@@ -2764,6 +2765,15 @@ function materializeBranchReviewTrees(review, leftRoot, rightRoot) {
     }
   }
 }
+function materializeGitTree(repoRoot, relativeDir, targetRoot, commit = "HEAD") {
+  for (const relativeFile of listGitBlobPaths(repoRoot, commit, relativeDir)) {
+    writeMaterializedGitFile(
+      targetRoot,
+      relativeFile,
+      readGitBlob(repoRoot, commit, relativeFile)
+    );
+  }
+}
 function resolveReviewPathPair(changedPaths, selectedPath) {
   const changedPath = changedPaths.find((candidate) => candidate.path === selectedPath || candidate.previousPath === selectedPath);
   if (!changedPath) {
@@ -2805,21 +2815,90 @@ function tryRunGit(runGit2, args, cwd) {
   }
 }
 function materializeGitPath(repoRoot, commit, relativePath, targetRoot) {
-  if (!relativePath) {
+  if (!relativePath || !isGitBlobPath(repoRoot, commit, relativePath)) {
     return;
   }
+  writeMaterializedGitFile(targetRoot, relativePath, readGitBlob(repoRoot, commit, relativePath));
+}
+function writeMaterializedGitFile(targetRoot, relativePath, content) {
   const resolvedRoot = path7.resolve(targetRoot);
   const targetFile = path7.resolve(resolvedRoot, relativePath);
   if (targetFile !== resolvedRoot && !targetFile.startsWith(`${resolvedRoot}${path7.sep}`)) {
     throw new Error(`Refusing to materialize path outside review root: ${relativePath}`);
   }
-  const content = (0, import_child_process3.execFileSync)("git", ["show", `${commit}:${relativePath}`], {
+  fs6.mkdirSync(path7.dirname(targetFile), { recursive: true });
+  fs6.writeFileSync(targetFile, content);
+}
+function listGitBlobPaths(repoRoot, commit, relativeDir) {
+  if (commit === "INDEX") {
+    const args2 = ["ls-files", "--stage", "-z", "--"];
+    if (relativeDir) {
+      args2.push(relativeDir);
+    }
+    return parseNulRecords(runGitText(repoRoot, args2)).flatMap((record) => {
+      const parsed = parseIndexStageRecord(record);
+      return parsed && parsed.mode !== GITLINK_MODE ? [parsed.path] : [];
+    });
+  }
+  const args = ["ls-tree", "-r", "-z", commit];
+  if (relativeDir) {
+    args.push("--", relativeDir);
+  }
+  return parseNulRecords(runGitText(repoRoot, args)).flatMap((record) => {
+    const parsed = parseLsTreeRecord(record);
+    return parsed && parsed.type === "blob" ? [parsed.path] : [];
+  });
+}
+function isGitBlobPath(repoRoot, commit, relativePath) {
+  if (commit === "INDEX") {
+    return listGitBlobPaths(repoRoot, commit, relativePath).includes(relativePath);
+  }
+  const parsed = parseLsTreeRecord(parseNulRecords(runGitText(repoRoot, ["ls-tree", "-z", commit, "--", relativePath]))[0] ?? "");
+  return parsed?.type === "blob";
+}
+function parseNulRecords(output) {
+  return output.split("\0").filter((record) => record.length > 0);
+}
+function parseLsTreeRecord(record) {
+  const tab = record.indexOf("	");
+  if (tab === -1) {
+    return void 0;
+  }
+  const type = record.slice(0, tab).split(" ")[1];
+  const relativePath = record.slice(tab + 1);
+  if (!type || !relativePath) {
+    return void 0;
+  }
+  return { type, path: relativePath };
+}
+function parseIndexStageRecord(record) {
+  const tab = record.indexOf("	");
+  if (tab === -1) {
+    return void 0;
+  }
+  const mode = record.slice(0, tab).split(" ")[0];
+  const relativePath = record.slice(tab + 1);
+  if (!mode || !relativePath) {
+    return void 0;
+  }
+  return { mode, path: relativePath };
+}
+function readGitBlob(repoRoot, commit, relativePath) {
+  const spec = commit && commit !== "INDEX" ? `${commit}:${relativePath}` : `:${relativePath}`;
+  return (0, import_child_process3.execFileSync)("git", ["show", spec], {
     cwd: repoRoot,
+    encoding: "buffer",
+    maxBuffer: readGitMaxBuffer(),
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+}
+function runGitText(repoRoot, args) {
+  return (0, import_child_process3.execFileSync)("git", [...args], {
+    cwd: repoRoot,
+    encoding: "utf8",
     maxBuffer: readGitMaxBuffer(),
     stdio: ["ignore", "pipe", "pipe"]
   });
-  fs6.mkdirSync(path7.dirname(targetFile), { recursive: true });
-  fs6.writeFileSync(targetFile, content);
 }
 function changeKindForStatus(code) {
   if (code === "A") {
@@ -2843,7 +2922,7 @@ function readGitMaxBuffer() {
   const parsed = Number.parseInt(process.env.BYGONE_GIT_MAX_BUFFER_BYTES ?? "", 10);
   return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_GIT_MAX_BUFFER_BYTES2;
 }
-var import_child_process3, fs6, path7, DEFAULT_GIT_MAX_BUFFER_BYTES2;
+var import_child_process3, fs6, path7, DEFAULT_GIT_MAX_BUFFER_BYTES2, GITLINK_MODE;
 var init_gitComparison = __esm({
   "src/gitComparison.ts"() {
     "use strict";
@@ -2851,6 +2930,7 @@ var init_gitComparison = __esm({
     fs6 = __toESM(require("fs"));
     path7 = __toESM(require("path"));
     DEFAULT_GIT_MAX_BUFFER_BYTES2 = 64 * 1024 * 1024;
+    GITLINK_MODE = "160000";
   }
 });
 
@@ -2886,6 +2966,12 @@ var require_navigationUtils = __commonJS({
       }
       return matches[0].index;
     }
+    function findMultiPanelChangeIndex(changes, pairIndex, blockIndex) {
+      if (!Array.isArray(changes) || !Number.isInteger(pairIndex) || !Number.isInteger(blockIndex)) {
+        return -1;
+      }
+      return changes.findIndex((change) => change.pairIndex === pairIndex && change.blockIndex === blockIndex);
+    }
     function buildBlockChanges(blocks, side) {
       if (!Array.isArray(blocks) || side !== "left" && side !== "right") {
         return [];
@@ -2957,6 +3043,7 @@ var require_navigationUtils = __commonJS({
       buildDirectoryNavigationState: buildDirectoryNavigationState2,
       containsModelLine,
       findChangeIndexAtLine,
+      findMultiPanelChangeIndex,
       resolveFileNavigationAction
     };
   }
@@ -5198,7 +5285,7 @@ var require_changeTour = __commonJS({
       const stack = source.stack.map((entry) => ({
         id: entry.id,
         ref: entry.ref,
-        oid: runGitText(repoRoot, ["rev-parse", "--verify", `${entry.ref}^{commit}`]),
+        oid: runGitText2(repoRoot, ["rev-parse", "--verify", `${entry.ref}^{commit}`]),
         label: entry.label || entry.ref
       }));
       const adjacentChanges = stack.slice(0, -1).map((entry, index) => parseNameStatusZ2((0, import_child_process4.execFileSync)("git", [
@@ -5302,7 +5389,7 @@ var require_changeTour = __commonJS({
         return false;
       }
     }
-    function runGitText(repoRoot, args) {
+    function runGitText2(repoRoot, args) {
       return (0, import_child_process4.execFileSync)("git", args, {
         cwd: repoRoot,
         encoding: "utf8",
@@ -9210,7 +9297,7 @@ var require_package = __commonJS({
       displayName: "Bygone",
       desktopName: "com.davidmashburn.bygone.desktop",
       description: "See how change happened. Visual diff and file history for VS Code.",
-      version: "0.8.9",
+      version: "0.8.11",
       author: "David Mashburn",
       license: "MIT",
       private: false,
@@ -9421,6 +9508,7 @@ var require_package = __commonJS({
         reinstall: "node ./scripts/dev-sync.mjs --install-only",
         "release:check": "npm run security:audit && npm test && npm run bundle:check && npm run lint && npm run package:vsix && npm run package:npm && npm run package:npm:dry-run",
         "release:build": "node ./scripts/release.mjs",
+        "release:publish:npm": "npm publish ./dist/npm-package --access public",
         "release:publish": "node ./scripts/release.mjs --publish",
         "release:verify-macos": "node ./scripts/verify-macos-signing.mjs --require-notarized",
         lint: "eslint . --max-warnings=0",
@@ -22441,7 +22529,7 @@ var { detectRipgrepCapability: detectRipgrepCapability2, startRepositorySearch:
 var { buildRepositoryReplacementPlan: buildRepositoryReplacementPlan2, applyRepositoryReplacementPlan: applyRepositoryReplacementPlan2, undoRepositoryReplacementPlan: undoRepositoryReplacementPlan2 } = (init_repositoryReplace(), __toCommonJS(repositoryReplace_exports));
 var { searchFileHistory: searchFileHistory2 } = (init_gitHistorySearch(), __toCommonJS(gitHistorySearch_exports));
 var { classifyAuthoredTourPaths: classifyAuthoredTourPaths2, discoverAuthoredTourDocument: discoverAuthoredTourDocument2 } = (init_tourDocument(), __toCommonJS(tourDocument_exports));
-var { materializeBranchReviewTrees: materializeBranchReviewTrees2, resolveBranchReviewRange: resolveBranchReviewRange2, resolveReviewPathPair: resolveReviewPathPair2 } = (init_gitComparison(), __toCommonJS(gitComparison_exports));
+var { materializeBranchReviewTrees: materializeBranchReviewTrees2, materializeGitTree: materializeGitTree2, resolveBranchReviewRange: resolveBranchReviewRange2, resolveReviewPathPair: resolveReviewPathPair2 } = (init_gitComparison(), __toCommonJS(gitComparison_exports));
 var { buildDirectoryNavigationState } = require_navigationUtils();
 var { getMenuCapabilities } = require_menuUtils();
 var {
@@ -24298,14 +24386,14 @@ function resolveGitRefForDiff(repoRoot, ref) {
 }
 function materializeGitDiffSource(repoRoot, source, targetRoot) {
   if (source.kind === "index") {
-    materializeGitTree(repoRoot, "", targetRoot, "INDEX");
+    materializeGitTree2(repoRoot, "", targetRoot, "INDEX");
     return;
   }
   if (source.kind === "worktree") {
     materializeWorkingTree(repoRoot, "", targetRoot);
     return;
   }
-  materializeGitTree(repoRoot, "", targetRoot, source.sha);
+  materializeGitTree2(repoRoot, "", targetRoot, source.sha);
 }
 function getGitDiffSourceLabel(source) {
   if (source.label) {
@@ -24556,35 +24644,6 @@ function hasUnstagedDirectoryChanges(repoRoot, relativeDir) {
   const output = runGit(["status", "--porcelain", "--", relativeDir || "."], repoRoot);
   return output.split("\n").some((line) => line.length >= 2 && line[1] !== " ");
 }
-function materializeGitTree(repoRoot, relativeDir, targetRoot, commit = "HEAD") {
-  let files;
-  if (commit === "INDEX") {
-    const lsArgs = ["ls-files", "-z", "--"];
-    if (relativeDir) {
-      lsArgs.push(relativeDir);
-    }
-    files = execFileSync4("git", lsArgs, {
-      cwd: repoRoot,
-      encoding: "utf8",
-      maxBuffer: GIT_MAX_BUFFER_BYTES2
-    }).split("\0").filter((filePath) => filePath.length > 0);
-  } else {
-    const lsArgs = ["ls-tree", "-r", "-z", "--name-only", commit];
-    if (relativeDir) {
-      lsArgs.push("--", relativeDir);
-    }
-    files = execFileSync4("git", lsArgs, {
-      cwd: repoRoot,
-      encoding: "utf8",
-      maxBuffer: GIT_MAX_BUFFER_BYTES2
-    }).split("\0").filter((filePath) => filePath.length > 0);
-  }
-  for (const relativeFile of files) {
-    const targetFile = path8.join(targetRoot, relativeFile);
-    fs7.mkdirSync(path8.dirname(targetFile), { recursive: true });
-    fs7.writeFileSync(targetFile, readGitBlob(repoRoot, commit === "INDEX" ? "" : commit, relativeFile));
-  }
-}
 function materializeWorkingTree(repoRoot, relativeDir, targetRoot) {
   const lsArgs = ["ls-files", "-co", "-z", "--exclude-standard"];
   if (relativeDir) {
@@ -24872,14 +24931,14 @@ function ensureDirectoryHistoryEntryMaterialized(dirHistory, index) {
   const leftRoot = fs7.mkdtempSync(path8.join(os.tmpdir(), "bygone-dir-left-"));
   const rightRoot = fs7.mkdtempSync(path8.join(os.tmpdir(), "bygone-dir-right-"));
   if (entry.commit === "WORKTREE") {
-    materializeGitTree(dirHistory.repoRoot, dirHistory.relativeDir, leftRoot, entry.parentCommit);
+    materializeGitTree2(dirHistory.repoRoot, dirHistory.relativeDir, leftRoot, entry.parentCommit);
     materializeWorkingTree(dirHistory.repoRoot, dirHistory.relativeDir, rightRoot);
   } else if (entry.commit === "INDEX") {
-    materializeGitTree(dirHistory.repoRoot, dirHistory.relativeDir, leftRoot, entry.parentCommit);
-    materializeGitTree(dirHistory.repoRoot, dirHistory.relativeDir, rightRoot, "INDEX");
+    materializeGitTree2(dirHistory.repoRoot, dirHistory.relativeDir, leftRoot, entry.parentCommit);
+    materializeGitTree2(dirHistory.repoRoot, dirHistory.relativeDir, rightRoot, "INDEX");
   } else {
-    materializeGitTree(dirHistory.repoRoot, dirHistory.relativeDir, leftRoot, entry.parentCommit);
-    materializeGitTree(dirHistory.repoRoot, dirHistory.relativeDir, rightRoot, entry.commit);
+    materializeGitTree2(dirHistory.repoRoot, dirHistory.relativeDir, leftRoot, entry.parentCommit);
+    materializeGitTree2(dirHistory.repoRoot, dirHistory.relativeDir, rightRoot, entry.commit);
   }
   const leftDir = path8.join(leftRoot, dirHistory.relativeDir);
   const rightDir = path8.join(rightRoot, dirHistory.relativeDir);
@@ -27422,12 +27481,6 @@ function parseGitHistoryRecords(logOutput) {
     };
   });
 }
-function readGitBlob(repoRoot, commit, relativePath) {
-  return execFileSync4("git", ["show", `${commit}:${relativePath}`], {
-    cwd: repoRoot,
-    maxBuffer: GIT_MAX_BUFFER_BYTES2
-  });
-}
 function getPathKind(filePath) {
   try {
     const stats = fs7.statSync(filePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@davmash/bygone",
-  "version": "0.8.9",
+  "version": "0.8.11",
   "description": "See how change happened. Visual diff and file history.",
   "author": "David Mashburn",
   "license": "MIT",