@hawkeyexl/manni 2.11.1 → 2.12.1

package/README.md

@@ -98,7 +98,7 @@ actually reads rather than hand-written:
 ```yaml
 repos:
   - repo: https://github.com/hawkeyexl/manni
-    rev: v2.11.1
+    rev: v2.12.1
     hooks:
       - id: manni-meta
 ```

package/dist/{chunk-CZGAZGDN.js → chunk-7X4QMQX4.js}

@@ -81,7 +81,7 @@ import {
   withValueAt,
   writeEncryptionKey,
   writeFileAtomic
-} from "./chunk-7ODP2AB3.js";
+} from "./chunk-F6CE4LEJ.js";
 
 // src/meta/core/reencrypt.ts
 import { extname } from "node:path";
@@ -1900,6 +1900,19 @@ function gitClient(root) {
   });
   return {
     available,
+    shallow,
+    // `merge-base --is-ancestor` exits 0 for yes and 1 for no. For a commit
+    // it does not have it exits 128, `Not a valid commit name`, which reads
+    // as git failing. So `hasCommit` answers first, and is required rather
+    // than an optimization: a commit git lacks is in no history it holds,
+    // which is a no, and exactly the pin a deleted branch leaves behind.
+    isAncestor: (commit, of) => once(`ancestor\0${commit}\0${of}`, async () => {
+      if (!await hasCommit(commit)) return false;
+      const out = await run2(root, ["merge-base", "--is-ancestor", "--end-of-options", commit, of]);
+      if (out.ok) return true;
+      if (out.code === 1) return false;
+      throw failed("merge-base", out);
+    }),
     head: () => once("head", async () => {
       if (!await available()) return null;
       const out = await run2(root, ["rev-parse", "HEAD"]);
@@ -1966,6 +1979,7 @@ function gitClient(root) {
 var UNIT = "";
 var GIT_UNAVAILABLE_HISTORY = "git is not available here, so citations are checked without history: no never-true, no reanchored claims, no diffs, no commit subjects.";
 var PAGE_HISTORY_UNAVAILABLE = "the page history ends before the pin held; use fetch-depth: 0 to tell reanchored claims from changed ones";
+var SHALLOW_RECOMMIT = "this clone is shallow, so --recommit re-recorded only commits that do not contain their lines. Fetch full history to check the rest.";
 var GIT_UNAVAILABLE_COMMIT = "git is not available here, so the citation records no commit.";
 function noGit() {
   return {
@@ -4806,6 +4820,7 @@ function rewriteOf(plan) {
         reason: "recommitted",
         // The source itself held. Only its date was wrong.
         status: "current",
+        because: plan.because,
         from: plan.from,
         to: plan.commitSha,
         fromCommit: plan.from,
@@ -5017,19 +5032,29 @@ async function runUpdate(opts) {
       "--recommit needs git to verify recorded commits, and git is not available here."
     );
   }
+  const outsideHistory = async (commit, head) => {
+    if (git.shallow === void 0 || git.isAncestor === void 0) return false;
+    if (await git.shallow()) return false;
+    return !await git.isAncestor(commit, head);
+  };
   const recommitFor = async (result) => {
     const recorded = result.citation.source["commit-sha"];
     const path = result.source.resolvedPath;
     if (recorded === void 0 || path === void 0) return void 0;
+    const head = await git.head();
+    if (head === null || head === recorded) return void 0;
     const range = sourceRange(result.citation.source);
     const pin = result.citation.source.integrity;
     const key = range.encrypted ? run3.key : void 0;
-    const was = await historyOf(git, recorded, path, range, pin, key, void 0);
-    if (was.kind !== "never-true") return void 0;
-    const head = await git.head();
-    if (head === null || head === recorded) return void 0;
+    let because;
+    if (await outsideHistory(recorded, head)) because = "not-in-history";
+    else {
+      const was = await historyOf(git, recorded, path, range, pin, key, void 0);
+      if (was.kind !== "never-true") return void 0;
+      because = "not-contained";
+    }
     const now = await historyOf(git, head, path, range, pin, key, void 0);
-    return now.kind === "original" ? head : void 0;
+    return now.kind === "original" ? { commit: head, because } : void 0;
   };
   const plansFor = async (result, entry, page, lines, lineNow, declined) => {
     const out = [];
@@ -5129,7 +5154,8 @@ async function runUpdate(opts) {
           kind: "source-recommitted",
           result,
           from: result.citation.source["commit-sha"] ?? "",
-          commitSha: to
+          commitSha: to.commit,
+          because: to.because
         });
       }
     }
@@ -5444,7 +5470,12 @@ async function runUpdate(opts) {
   const reminted = pages.some(
     (page) => page.rewritten.some((r) => r.reason === "accepted" && r.end === "source")
   );
-  sayNotices(reports, opts.onNotice, reminted && !await git.available() ? [GIT_UNAVAILABLE_COMMIT] : []);
+  const also = [];
+  if (reminted && !await git.available()) also.push(GIT_UNAVAILABLE_COMMIT);
+  if (recommit && git.shallow !== void 0 && git.isAncestor !== void 0 && await git.shallow()) {
+    also.push(SHALLOW_RECOMMIT);
+  }
+  sayNotices(reports, opts.onNotice, also);
   const rewritten = pages.reduce((n, page) => n + citationsIn(page.rewritten), 0);
   const skipped = pages.reduce((n, page) => n + page.skipped.length + page.refused.length, 0);
   const undone = pages.some(
@@ -5871,6 +5902,15 @@ function refusalLine(rewrite) {
   }
   return `${where} that line now holds different text than the claim at ${at2}. Re-add it with cite add.`;
 }
+function recommitWhy(because) {
+  switch (because) {
+    case "not-in-history":
+      return "not in this branch's history";
+    case "not-contained":
+    case void 0:
+      return "did not contain the pinned lines";
+  }
+}
 function rewriteLine(rewrite) {
   const word = rewrite.from.includes("-") ? "lines" : "line";
   const status = rewrite.status === "never-true" ? "never true" : rewrite.status;
@@ -5880,7 +5920,7 @@ function rewriteLine(rewrite) {
   if (rewrite.reason === "recommitted") {
     const from = shortCommit(rewrite.fromCommit ?? "");
     const to = shortCommit(rewrite.toCommit ?? "");
-    return `source ${shortSrc(rewrite.src ?? "")} commit ${from} -> ${to} (did not contain the pinned lines)`;
+    return `source ${shortSrc(rewrite.src ?? "")} commit ${from} -> ${to} (${recommitWhy(rewrite.because)})`;
   }
   if (rewrite.reason === "shifted") {
     return `claim ${word} ${rewrite.from} -> ${rewrite.to} (shifted by a marker)`;
@@ -6578,4 +6618,4 @@ export {
   runKeyRotate,
   runKeySet
 };
-//# sourceMappingURL=chunk-CZGAZGDN.js.map
+//# sourceMappingURL=chunk-7X4QMQX4.js.map