Merge pull request hub4j#333

kohsuke · kohsuke · commit ccfe3ad4f7a5 · 2017-09-09T12:17:39.000-07:00
diff --git a/src/main/java/org/kohsuke/github/GHPullRequest.java b/src/main/java/org/kohsuke/github/GHPullRequest.java
@@ -346,9 +346,29 @@ public void merge(String msg) throws IOException {
      *      SHA that pull request head must match to allow merge.
      */
     public void merge(String msg, String sha) throws IOException {
-        new Requester(root).method("PUT").with("commit_message",msg).with("sha",sha).to(getApiRoute()+"/merge");
+        merge(msg, sha, null);
     }
 
+    /**
+     * Merge this pull request, using the specified merge method.
+     *
+     * The equivalent of the big green "Merge pull request" button.
+     *
+     * @param msg
+     *      Commit message. If null, the default one will be used.
+     * @param method
+     *      SHA that pull request head must match to allow merge.
+     */
+    public void merge(String msg, String sha, MergeMethod method) throws IOException {
+        new Requester(root).method("PUT")
+                .with("commit_message",msg)
+                .with("sha",sha)
+                .with("merge_method",method)
+                .to(getApiRoute()+"/merge");
+    }
+
+    public enum MergeMethod{ MERGE, SQUASH, REBASE }
+
     private void fetchIssue() throws IOException {
         if (!fetchedIssueDetails) {
             new Requester(root).to(getIssuesApiRoute(), this);
diff --git a/src/main/java/org/kohsuke/github/extras/OkHttpConnector.java b/src/main/java/org/kohsuke/github/extras/OkHttpConnector.java
@@ -30,3 +30,4 @@ public HttpURLConnection connect(URL url) throws IOException {
         return urlFactory.open(url);
     }
 }
+GHPul
diff --git a/src/test/java/org/kohsuke/github/PullRequestTest.java b/src/test/java/org/kohsuke/github/PullRequestTest.java
@@ -99,6 +99,19 @@ public void testMergeCommitSHA() throws Exception {
         fail();
     }
 
+    @Test
+    public void testSquashMerge() throws Exception {
+        String name = rnd.next();
+        GHRef masterRef = getRepository().getRef("heads/master");
+        GHRef branchRef = getRepository().createRef("refs/heads/" + name, masterRef.getObject().getSha());
+        getRepository().createContent(name, name, name, name);
+        Thread.sleep(1000);
+        GHPullRequest p = getRepository().createPullRequest(name, name, "master", "## test squash");
+        Thread.sleep(1000);
+        p.merge("squash merge", null, GHPullRequest.MergeMethod.SQUASH);
+        branchRef.delete();
+    }
+
     @Test
     // Requires push access to the test repo to pass
     public void setLabels() throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -30,3 +30,4 @@ public HttpURLConnection connect(URL url) throws IOException {`
`30`	`30`	`return urlFactory.open(url);`
`31`	`31`	`}`
`32`	`32`	`}`
	`33`	`+GHPul`