585 changes: 585 additions & 0 deletions ...rion.server.tests/src/org/eclipse/orion/server/tests/servlets/git/GitMergeSquashTest.java
View file

Large diffs are not rendered by default.

11 changes: 8 additions & 3 deletions ...g.eclipse.orion.server.tests/src/org/eclipse/orion/server/tests/servlets/git/GitTest.java
View file
Expand Up @@ -553,14 +553,18 @@ protected JSONObject getRemoteBranch(String gitRemoteUri, int size, int i, Strin
return remoteBranch;
}

protected JSONObject merge(String gitHeadUri, String commit) throws JSONException, IOException, SAXException {
protected JSONObject merge(String gitHeadUri, String commit, boolean squash) throws JSONException, IOException, SAXException {
assertCommitUri(gitHeadUri);
WebRequest request = getPostGitMergeRequest(gitHeadUri, commit);
WebRequest request = getPostGitMergeRequest(gitHeadUri, commit, squash);
WebResponse response = webConversation.getResponse(request);
assertEquals(HttpURLConnection.HTTP_OK, response.getResponseCode());
return new JSONObject(response.getText());
}

protected JSONObject merge(String gitHeadUri, String commit) throws JSONException, IOException, SAXException {
return merge(gitHeadUri, commit, false);
}

// rebase

protected JSONObject rebase(String gitHeadUri, Operation operation) throws IOException, SAXException, JSONException {
Expand Down Expand Up @@ -1168,7 +1172,7 @@ protected static WebRequest getPostGitCloneRequest(URIish uri, IPath workspacePa
return request;
}

private static WebRequest getPostGitMergeRequest(String location, String commit) throws JSONException, UnsupportedEncodingException {
private static WebRequest getPostGitMergeRequest(String location, String commit, boolean squash) throws JSONException, UnsupportedEncodingException {
String requestURI;
if (location.startsWith("http://"))
requestURI = location;
Expand All @@ -1177,6 +1181,7 @@ private static WebRequest getPostGitMergeRequest(String location, String commit)

JSONObject body = new JSONObject();
body.put(GitConstants.KEY_MERGE, commit);
body.put(GitConstants.KEY_SQUASH, squash);
WebRequest request = new PostMethodWebRequest(requestURI, IOUtilities.toInputStream(body.toString()), "UTF-8");
request.setHeaderField(ProtocolConstants.HEADER_ORION_VERSION, "1");
setAuthentication(request);
Expand Down