Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add RepositoryApi.compare(Object projectIdOrPath, String from, String to, Object fromProjectId, boolean straight) #1208

Merged
merged 12 commits into from
Dec 24, 2024
49 changes: 36 additions & 13 deletions gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -913,21 +913,12 @@ public File getRepositoryArchive(
* false to compare using merge base (from…to)’.
* @return a CompareResults containing the results of the comparison
* @throws GitLabApiException if any exception occurs
* @deprecated use {@link #compare(Object, String, String, Long, Boolean)} instead
*/
@Deprecated
public CompareResults compare(Object projectIdOrPath, String from, String to, Boolean straight)
throws GitLabApiException {
Form formData = new GitLabApiForm()
.withParam("from", from, true)
.withParam("to", to, true)
.withParam("straight", straight);
Response response = get(
Response.Status.OK,
formData.asMap(),
"projects",
getProjectIdOrPath(projectIdOrPath),
"repository",
"compare");
return (response.readEntity(CompareResults.class));
return compare(projectIdOrPath, from, to, null, straight);
}

/**
Expand All @@ -939,9 +930,41 @@ public CompareResults compare(Object projectIdOrPath, String from, String to, Bo
* @param to the commit SHA or branch name
* @return a CompareResults containing the results of the comparison
* @throws GitLabApiException if any exception occurs
* @deprecated use {@link #compare(Object, String, String, Long, Boolean)} instead
*/
@Deprecated
public CompareResults compare(Object projectIdOrPath, String from, String to) throws GitLabApiException {
return (compare(projectIdOrPath, from, to, false));
return compare(projectIdOrPath, from, to, false);
}

/**
* Compare branches, tags or commits. This can be accessed without authentication
* if the repository is publicly accessible.
*
* @param projectIdOrPath the project in the form of an Long(ID), String(path), or Project instance
* @param from the commit SHA or branch name
* @param to the commit SHA or branch name
* @param fromProjectId The ID to compare from.
* @param straight specifies the comparison method, true for direct comparison between from and to (from..to),
* false to compare using merge base (from…to)
* @return a CompareResults containing the results of the comparison
* @throws GitLabApiException if any exception occurs
*/
public CompareResults compare(Object projectIdOrPath, String from, String to, Long fromProjectId, Boolean straight)
throws GitLabApiException {
GitLabApiForm formData = new GitLabApiForm()
.withParam("from", from, true)
.withParam("to", to, true)
.withParam("straight", straight)
.withParam("from_project_id", fromProjectId);
Response response = get(
Response.Status.OK,
formData.asMap(),
"projects",
getProjectIdOrPath(projectIdOrPath),
"repository",
"compare");
return (response.readEntity(CompareResults.class));
}

/**
Expand Down
Loading