launchable 1.97.0__tar.gz → 1.97.2__tar.gz

{launchable-1.97.0 → launchable-1.97.2}/.github/workflows/python-publish.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - id: run-tagpr
-      uses: Songmu/tagpr@3dca11e7c0d68637ee212ddd35acc3d30a7403a4 # v1.5.0
+      uses: Songmu/tagpr@e89d37247ca73d3e5620bf074a53fbd5b39e66b0 # v1.5.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

{launchable-1.97.0/launchable.egg-info → launchable-1.97.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: launchable
-Version: 1.97.0
+Version: 1.97.2
 Summary: Launchable CLI
 Home-page: https://launchableinc.com/
 Author: Launchable, Inc.
@@ -74,10 +74,8 @@ module to PyPI.
 ## How to update launchable/jar/exe_deploy.jar
 
 ```
-bazel build //src/main/java/com/launchableinc/ingest/commits:exe_deploy.jar
-bazel test //...
-cp bazel-bin/src/main/java/com/launchableinc/ingest/commits/exe_deploy.jar launchable/jar/exe_deploy.jar
- ```
+./build-java.sh
+```
 
 # Installing CLI
 

{launchable-1.97.0 → launchable-1.97.2}/README.md

@@ -50,10 +50,8 @@ module to PyPI.
 ## How to update launchable/jar/exe_deploy.jar
 
 ```
-bazel build //src/main/java/com/launchableinc/ingest/commits:exe_deploy.jar
-bazel test //...
-cp bazel-bin/src/main/java/com/launchableinc/ingest/commits/exe_deploy.jar launchable/jar/exe_deploy.jar
- ```
+./build-java.sh
+```
 
 # Installing CLI
 

launchable-1.97.2/build-java.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -ex
+bazel build //src/main/java/com/launchableinc/ingest/commits:exe_deploy.jar
+bazel test //...
+cp bazel-bin/src/main/java/com/launchableinc/ingest/commits/exe_deploy.jar launchable/jar/exe_deploy.jar
+

{launchable-1.97.0 → launchable-1.97.2}/launchable/commands/subset.py

@@ -218,20 +218,6 @@ def subset(
     app = context.obj
     tracking_client = TrackingClient(Tracking.Command.SUBSET, app=app)
 
-    if is_observation and is_get_tests_from_previous_sessions:
-        msg = "Cannot use --observation and --get-tests-from-previous-sessions options at the same time"
-        click.echo(
-            click.style(
-                msg,
-                fg="red"),
-            err=True,
-        )
-        tracking_client.send_error_event(
-            event_name=Tracking.ErrorEvent.INTERNAL_CLI_ERROR,
-            stack_trace=msg,
-        )
-        sys.exit(1)
-
     if is_observation and is_output_exclusion_rules:
         msg = (
             "WARNING: --observation and --output-exclusion-rules are set. "

{launchable-1.97.0 → launchable-1.97.2/launchable.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: launchable
-Version: 1.97.0
+Version: 1.97.2
 Summary: Launchable CLI
 Home-page: https://launchableinc.com/
 Author: Launchable, Inc.
@@ -74,10 +74,8 @@ module to PyPI.
 ## How to update launchable/jar/exe_deploy.jar
 
 ```
-bazel build //src/main/java/com/launchableinc/ingest/commits:exe_deploy.jar
-bazel test //...
-cp bazel-bin/src/main/java/com/launchableinc/ingest/commits/exe_deploy.jar launchable/jar/exe_deploy.jar
- ```
+./build-java.sh
+```
 
 # Installing CLI
 

{launchable-1.97.0 → launchable-1.97.2}/launchable.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ LICENSE.txt
 Pipfile
 README.md
 WORKSPACE
+build-java.sh
 pyproject.toml
 renovate.json
 setup.cfg

{launchable-1.97.0 → launchable-1.97.2}/src/main/java/com/launchableinc/ingest/commits/CommitGraphCollector.java

@@ -1,7 +1,5 @@
 package com.launchableinc.ingest.commits;
 
-import static com.google.common.collect.ImmutableList.toImmutableList;
-
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
@@ -10,25 +8,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.CharStreams;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.UncheckedIOException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -39,10 +18,9 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm;
 import org.eclipse.jgit.diff.DiffEntry;
-import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.errors.InvalidObjectIdException;
 import org.eclipse.jgit.errors.MissingObjectException;
-import org.eclipse.jgit.errors.StopWalkException;
+import org.eclipse.jgit.lib.AnyObjectId;
 import org.eclipse.jgit.lib.ConfigConstants;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.ObjectReader;
@@ -53,17 +31,41 @@ import org.eclipse.jgit.revwalk.RevSort;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.revwalk.filter.CommitTimeRevFilter;
 import org.eclipse.jgit.revwalk.filter.OrRevFilter;
-import org.eclipse.jgit.revwalk.filter.RevFilter;
 import org.eclipse.jgit.submodule.SubmoduleWalk;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.UncheckedIOException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+import static com.google.common.collect.ImmutableList.*;
+import static java.util.Arrays.*;
+
 /**
  * Compares what commits the local repository and the remote repository have, then send delta over.
  */
 public class CommitGraphCollector {
   private static final Logger logger = LoggerFactory.getLogger(CommitGraphCollector.class);
   private static final ObjectMapper objectMapper = new ObjectMapper();
+  private static final boolean LCHIB544 = System.getenv("LAUNCHABLE_DEBUG_LCHIB544")!=null;
 
   /**
    * Root repository to start processing.
@@ -172,7 +174,7 @@ public class CommitGraphCollector {
   private ImmutableList<ObjectId> getAdvertisedRefs(HttpResponse response) throws IOException {
     JsonParser parser = new JsonFactory().createParser(response.getEntity().getContent());
     String[] ids = objectMapper.readValue(parser, String[].class);
-    return Arrays.stream(ids)
+    return stream(ids)
         .map(
             s -> {
               try {
@@ -292,10 +294,12 @@ public class CommitGraphCollector {
     private final Repository git;
 
     private final ObjectReader objectReader;
+    private final Set<ObjectId> shallowCommits;
 
-    ByRepository(Repository git) {
+    ByRepository(Repository git) throws IOException {
       this.git = git;
       this.objectReader = git.newObjectReader();
+      this.shallowCommits = objectReader.getShallowCommits();
     }
 
     /**
@@ -410,6 +414,18 @@ public class CommitGraphCollector {
               ConfigConstants.CONFIG_KEY_ALGORITHM,
               SupportedAlgorithm.HISTOGRAM);
 
+
+      if (LCHIB544) {
+        System.err.printf("Commit %s parents=%s%n",
+                r.name(),
+                stream(r.getParents()).map(AnyObjectId::name).collect(Collectors.joining(",")));
+      }
+
+      if (shallowCommits.contains(r)) {
+        c.setShallow(true);
+        warnMissingObject();
+      }
+
       for (RevCommit p : r.getParents()) {
         CountingDiffFormatter diff = new CountingDiffFormatter(git);
         List<DiffEntry> files = diff.scan(p.getTree(), r.getTree());
@@ -424,19 +440,28 @@ public class CommitGraphCollector {
                 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");
-            }
+            warnMissingObject();
           } catch (IOException e) {
             logger.warn("Failed to process a change to a file", e);
           }
         }
         c.getParentHashes().put(p.name(), changes);
       }
+
+      if (LCHIB544) {
+        System.err.println(objectMapper.writeValueAsString(c));
+      }
+
       return c;
     }
 
+    private void warnMissingObject() {
+      if (!warnMissingObject) {
+        warnMissingObject = true;
+        System.err.println("See https://www.launchableinc.com/missing-git-object-during-commit-collection");
+      }
+    }
+
     @Override
     public void close() {
       objectReader.close();

{launchable-1.97.0 → launchable-1.97.2}/src/main/java/com/launchableinc/ingest/commits/JSCommit.java

@@ -34,6 +34,9 @@ public class JSCommit {
   /** Commit message. */
   private String message;
 
+  /** This object was marked as shallow and therefore its parent commits are not available. */
+  private boolean shallow;
+
   private Map<String, List<JSFileChange>> parentHashes = new HashMap<>();
 
   public String getCommitHash() {
@@ -107,4 +110,12 @@ public class JSCommit {
   public void setMessage(String message) {
     this.message = message;
   }
+
+  public boolean isShallow() {
+    return shallow;
+  }
+
+  public void setShallow(boolean shallow) {
+    this.shallow = shallow;
+  }
 }