Support for Git commit hashes when building BlazeVersionData

bazelbuild · Dec 9, 2024 · e272569 · e272569
1 parent 0fb3f81
commit e272569
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/base/src/com/google/idea/blaze/base/qsync/QuerySyncProjectData.java b/base/src/com/google/idea/blaze/base/qsync/QuerySyncProjectData.java
@@ -35,6 +35,7 @@
 import com.google.idea.blaze.qsync.project.ProjectTarget;
 import com.google.idea.blaze.qsync.project.QuerySyncLanguage;
 import com.intellij.openapi.diagnostic.Logger;
+import java.math.BigInteger;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Optional;
@@ -155,7 +156,15 @@ public BlazeVersionData getBlazeVersionData() {
               try {
                 data.setClientCl(Long.parseLong(revision));
               } catch (NumberFormatException e) {
-                logger.warn(e);
+                // Most likely this is a Git commit hash (40 hex digits)
+                logger.warn(String.format("setClientCl(%s)", revision.substring(0, 16)));
+                try {
+                  var prefix = revision.substring(0, 16);
+                  data.setClientCl(new BigInteger(prefix, 16).longValue());
+                } catch (NumberFormatException ignored) {
+                  // If the fallback also fails, report the original exception
+                  logger.warn(e);
+                }
               }
             });
     blazeProject