Merge pull request #787 from launchableinc/missing-object

Improve a warning message for missing object errors
launchableinc · Feb 26, 2024 · 040ec82 · 040ec82
2 parents c9ceb1a + 00e4bc3
commit 040ec82
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/launchable/jar/exe_deploy.jar b/launchable/jar/exe_deploy.jar
diff --git a/src/main/java/com/launchableinc/ingest/commits/CommitGraphCollector.java b/src/main/java/com/launchableinc/ingest/commits/CommitGraphCollector.java
@@ -80,6 +80,8 @@ public class CommitGraphCollector {
 
   private boolean dryRun;
 
+  private boolean warnMissingObject;
+
   private String dryRunPrefix() {
     if (!dryRun) {
       return "";
@@ -408,7 +410,18 @@ private JSCommit transform(RevCommit r) throws IOException {
         for (DiffEntry de : files) {
           try {
             changes.add(diff.process(de));
-          } catch (UncheckedIOException e) {
+          } catch (MissingObjectException e) {
+            // in a partially cloned repository, BLOBs might be unavailable and that'd result in MissingObjectException
+            System.err.printf("Warning: %s is missing. Skipping diff calculation for %s -> %s%n",
+                e.getObjectId().abbreviate(7).name(),
+                p.abbreviate(7).name(),
+                r.abbreviate(7).name()
+            );
+            if (!warnMissingObject) {
+              warnMissingObject = true;
+              System.err.println("See https://www.launchableinc.com/missing-git-object-during-commit-collection");
+            }
+          } catch (IOException e) {
             logger.warn("Failed to process a change to a file", e);
           }
         }

diff --git a/src/main/java/com/launchableinc/ingest/commits/CountingDiffFormatter.java b/src/main/java/com/launchableinc/ingest/commits/CountingDiffFormatter.java
@@ -26,17 +26,13 @@ public CountingDiffFormatter(Repository git) {
   }
 
   /** Entry point to compute a file level change. */
-  JSFileChange process(DiffEntry de) {
+  JSFileChange process(DiffEntry de) throws IOException {
     add = 0;
     del = 0;
 
     // This call internally eventually reaches to format(EditList, RawTest, RawText) that counts the
     // numbers.
-    try {
-      format(de);
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
-    }
+    format(de);
 
     JSFileChange fc = new JSFileChange();
     fc.setLinesAdded(add);