git-truck 0.7.6 → 0.7.7-2

package/build/index.js

@@ -4202,13 +4202,20 @@ async function diffAndUpdate_mut(data, currCommit, parentHash, repo) {
   const currHash = currCommit.hash;
   log.debug(`comparing [${currHash}] -> [${parentHash}]`);
   const fileChanges = await gitDiffNumStatAnalyzed(repo, parentHash, currHash, renamedFiles);
+  log.debug(`num filechanges ${fileChanges.length}`);
   for (const fileChange of fileChanges) {
     const { pos, neg, file } = fileChange;
     const blob = await lookupFileInTree(data.tree, file);
-    if (file === "dev/null")
+    log.debug(`Changes: ${JSON.stringify(fileChange)}`);
+    log.debug(`Blob: ${blob == null ? void 0 : blob.hash}`);
+    if (file === "dev/null") {
+      log.debug(`Continuing from ${file}`);
       continue;
+    }
     if (blob) {
       updateBlob_mut(blob, data, author, currCommit, pos, neg);
+    } else {
+      log.debug(`Blob not found: ${file}`);
     }
   }
 }
@@ -4217,6 +4224,7 @@ function isBinaryFile(blob) {
 }
 function updateBlob_mut(blob, data, author, currCommit, pos, neg) {
   var _a, _b;
+  log.debug(`Trying to update ${blob.name}`);
   const noCommits = 1 + (blob.noCommits ?? 0);
   const isBinary = isBinaryFile(blob);
   const hydratedBlob = __spreadProps(__spreadValues({}, blob), {
@@ -5350,7 +5358,7 @@ async function latestVersion(packageName, options) {
 
 // package.json
 var name = "git-truck";
-var version = "0.7.6";
+var version = "0.7.7-1";
 var private2 = false;
 var description = "Visualizing a Git repository";
 var license = "MIT";
@@ -5516,7 +5524,7 @@ async function findBranchHead(repo, branch) {
 }
 async function analyzeCommitLight(repo, hash) {
   const rawContent = await deflateGitObject(repo, hash);
-  const commitRegex = /tree (?<tree>.*)\n(?:parent (?<parent>.*)\n)?(?:parent (?<parent2>.*)\n)?author (?<authorName>.*) <(?<authorEmail>.*)> (?<authorTimeStamp>\d*) (?<authorTimeZone>.*)\ncommitter (?<committerName>.*) <(?<committerEmail>.*)> (?<committerTimeStamp>\d*) (?<committerTimeZone>.*)\n(?:gpgsig (?:.|\n)*-----END PGP SIGNATURE-----)?\s*(?<message>.*)\s*(?<description>(?:.|\s)*)/gm;
+  const commitRegex = /tree (?<tree>.*)\s*(?:parent (?<parent>.*)\s*)?(?:parent (?<parent2>.*)\s*)?author (?<authorName>.*?) <(?<authorEmail>.*?)> (?<authorTimeStamp>\d*?) (?<authorTimeZone>.*?)\s*committer (?<committerName>.*?) <(?<committerEmail>.*?)> (?<committerTimeStamp>\d*?) (?<committerTimeZone>.*)\s*(?:gpgsig (?:.|\s)*?-----END PGP SIGNATURE-----)?\s*(?<message>.*)\s*(?<description>(?:.|\s)*)/gm;
   const match = commitRegex.exec(rawContent);
   const groups = (match == null ? void 0 : match.groups) ?? {};
   const tree = groups["tree"];
@@ -5743,7 +5751,7 @@ function GlobalInfo() {
     paths.push([data.repo, data.repo]);
   }
   return /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(BoxTitle, null, data.repo), /* @__PURE__ */ React.createElement(Spacer, null), /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement("strong", null, "Branch: "), data.branch, /* @__PURE__ */ React.createElement(Spacer, null), /* @__PURE__ */ React.createElement("strong", null, "Analyzed: "), dateTimeFormatShort(data.lastRunEpoch), /* @__PURE__ */ React.createElement(Spacer, null), /* @__PURE__ */ React.createElement("strong", null, "As of commit: "), /* @__PURE__ */ React.createElement(InlineCode, {
-    title: data.commit.message
+    title: data.commit.message ?? "No commit message"
   }, data.commit.hash.slice(0, 7))), /* @__PURE__ */ React.createElement(Spacer, null), /* @__PURE__ */ React.createElement(import_remix3.Form, {
     method: "post",
     action: "/repo"
@@ -6462,7 +6470,7 @@ function Index() {
 
 // server-assets-manifest:@remix-run/dev/assets-manifest
 init_react();
-var assets_manifest_default = { "version": "f64d0b94", "entry": { "module": "/build/entry.client-KSYGPJNH.js", "imports": ["/build/_shared/chunk-TG3VUAQG.js", "/build/_shared/chunk-SQUDAINV.js", "/build/_shared/chunk-BC37YV7Z.js"] }, "routes": { "root": { "id": "root", "parentId": void 0, "path": "", "index": void 0, "caseSensitive": void 0, "module": "/build/root-GDC4BREW.js", "imports": void 0, "hasAction": false, "hasLoader": false, "hasCatchBoundary": false, "hasErrorBoundary": false }, "routes/index": { "id": "routes/index", "parentId": "root", "path": void 0, "index": true, "caseSensitive": void 0, "module": "/build/routes/index-Z6NZE4DS.js", "imports": void 0, "hasAction": false, "hasLoader": false, "hasCatchBoundary": false, "hasErrorBoundary": false }, "routes/repo": { "id": "routes/repo", "parentId": "root", "path": "repo", "index": void 0, "caseSensitive": void 0, "module": "/build/routes/repo-5WGDOE26.js", "imports": void 0, "hasAction": true, "hasLoader": true, "hasCatchBoundary": false, "hasErrorBoundary": false } }, "url": "/build/manifest-F64D0B94.js" };
+var assets_manifest_default = { "version": "81db978c", "entry": { "module": "/build/entry.client-KSYGPJNH.js", "imports": ["/build/_shared/chunk-TG3VUAQG.js", "/build/_shared/chunk-SQUDAINV.js", "/build/_shared/chunk-BC37YV7Z.js"] }, "routes": { "root": { "id": "root", "parentId": void 0, "path": "", "index": void 0, "caseSensitive": void 0, "module": "/build/root-GDC4BREW.js", "imports": void 0, "hasAction": false, "hasLoader": false, "hasCatchBoundary": false, "hasErrorBoundary": false }, "routes/index": { "id": "routes/index", "parentId": "root", "path": void 0, "index": true, "caseSensitive": void 0, "module": "/build/routes/index-Z6NZE4DS.js", "imports": void 0, "hasAction": false, "hasLoader": false, "hasCatchBoundary": false, "hasErrorBoundary": false }, "routes/repo": { "id": "routes/repo", "parentId": "root", "path": "repo", "index": void 0, "caseSensitive": void 0, "module": "/build/routes/repo-H5UEBRNX.js", "imports": void 0, "hasAction": true, "hasLoader": true, "hasCatchBoundary": false, "hasErrorBoundary": false } }, "url": "/build/manifest-81DB978C.js" };
 
 // server-entry-module:@remix-run/dev/server-build
 var entry = { module: entry_server_exports };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-truck",
-  "version": "0.7.6",
+  "version": "0.7.7-2",
   "private": false,
   "description": "Visualizing a Git repository",
   "license": "MIT",

package/src/analyzer/analyze.server.ts

@@ -59,8 +59,8 @@ export async function analyzeCommitLight(
 ): Promise<GitCommitObjectLight> {
   const rawContent = await deflateGitObject(repo, hash)
   const commitRegex =
-    /tree (?<tree>.*)\n(?:parent (?<parent>.*)\n)?(?:parent (?<parent2>.*)\n)?author (?<authorName>.*) <(?<authorEmail>.*)> (?<authorTimeStamp>\d*) (?<authorTimeZone>.*)\ncommitter (?<committerName>.*) <(?<committerEmail>.*)> (?<committerTimeStamp>\d*) (?<committerTimeZone>.*)\n(?:gpgsig (?:.|\n)*-----END PGP SIGNATURE-----)?\s*(?<message>.*)\s*(?<description>(?:.|\s)*)/gm
-
+  /tree (?<tree>.*)\s*(?:parent (?<parent>.*)\s*)?(?:parent (?<parent2>.*)\s*)?author (?<authorName>.*?) <(?<authorEmail>.*?)> (?<authorTimeStamp>\d*?) (?<authorTimeZone>.*?)\s*committer (?<committerName>.*?) <(?<committerEmail>.*?)> (?<committerTimeStamp>\d*?) (?<committerTimeZone>.*)\s*(?:gpgsig (?:.|\s)*?-----END PGP SIGNATURE-----)?\s*(?<message>.*)\s*(?<description>(?:.|\s)*)/gm
+  
   const match = commitRegex.exec(rawContent)
   const groups = match?.groups ?? {}
 

package/src/analyzer/hydrate.server.ts

@@ -127,15 +127,22 @@ async function diffAndUpdate_mut(
     currHash,
     renamedFiles
   )
+  log.debug(`num filechanges ${fileChanges.length}`)
 
   for (const fileChange of fileChanges) {
     const { pos, neg, file } = fileChange
 
     const blob = await lookupFileInTree(data.tree, file)
-
-    if (file === "dev/null") continue
+    log.debug(`Changes: ${JSON.stringify(fileChange)}`)
+    log.debug(`Blob: ${blob?.hash}`)
+    if (file === "dev/null") {
+      log.debug(`Continuing from ${file}`)
+      continue
+    }
     if (blob) {
       updateBlob_mut(blob, data, author, currCommit, pos, neg)
+    } else {
+      log.debug(`Blob not found: ${file}`)
     }
   }
 }
@@ -152,6 +159,7 @@ function updateBlob_mut(
   pos: number,
   neg: number
 ) {
+  log.debug(`Trying to update ${blob.name}`)
   const noCommits = 1 + ((blob as HydratedGitBlobObject).noCommits ?? 0)
 
   const isBinary = isBinaryFile(blob)

package/src/components/GlobalInfo.tsx

@@ -37,7 +37,7 @@ export function GlobalInfo() {
         <Spacer/>
         <strong>Analyzed: </strong>{dateTimeFormatShort(data.lastRunEpoch)}
         <Spacer />
-        <strong>As of commit: </strong><InlineCode title={data.commit.message}>{data.commit.hash.slice(0, 7)}</InlineCode>
+        <strong>As of commit: </strong><InlineCode title={data.commit.message ?? "No commit message"}>{data.commit.hash.slice(0, 7)}</InlineCode>
       </div>
       <Spacer/>
       <Form method="post" action="/repo">