Support Squashed Commits

This returns the single commit when a PR is squashed
quarkusio · Aug 22, 2024 · c85fca2 · c85fca2
1 parent fe82bcb
commit c85fca2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/src/main/java/io/quarkus/backports/GitHubService.java b/src/main/java/io/quarkus/backports/GitHubService.java
@@ -126,11 +126,20 @@ public Collection<PullRequest> getBackportCandidatesPullRequests() throws IOExce
             JsonObject pr = pullRequests.getJsonObject(i);
             JsonArray commits = pr.getJsonObject("commits").getJsonArray("nodes");
             List<Commit> commitList = new ArrayList<>();
-            for (int j = 0; j < commits.size(); j++) {
-                JsonObject commitNode = commits.getJsonObject(j);
-                Commit commit = commitNode.getJsonObject("commit").mapTo(Commit.class);
-                commit.url = commitNode.getString("url");
+            // Was the PR squashed? If so, we only have one commit
+            JsonObject mergeCommit = pr.getJsonObject("mergeCommit");
+            boolean squashed = mergeCommit.getJsonObject("parents").getInteger("totalCount") == 1;
+            if (squashed) {
+                Commit commit = mergeCommit.mapTo(Commit.class);
+                commit.url = mergeCommit.getString("url");
                 commitList.add(commit);
+            } else {
+                for (int j = 0; j < commits.size(); j++) {
+                    JsonObject commitNode = commits.getJsonObject(j);
+                    Commit commit = commitNode.getJsonObject("commit").mapTo(Commit.class);
+                    commit.url = commitNode.getString("url");
+                    commitList.add(commit);
+                }
             }
             // Sort by commit date
             Collections.sort(commitList);
@@ -301,4 +310,4 @@ private static class Templates {
 
     }
 
-}
+}
diff --git a/src/main/resources/templates/GitHubService/listPullRequests.graphql b/src/main/resources/templates/GitHubService/listPullRequests.graphql
@@ -26,6 +26,16 @@
             url
           }
         }
+        mergeCommit {
+          url
+          message
+          oid
+          abbreviatedOid
+          committedDate
+          parents {
+            totalCount
+          }
+        }
         commits(last: 100) {
           nodes {
             url