Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 23:15:43 +01:00
Code Issues Packages Projects Releases Activity

Implement merge using api of class Git

Browse Source
This commit is contained in:
René Pfeuffer
2018-11-07 12:52:40 +01:00
parent e377ce5988
commit d5da106038
1 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
View File

@@ -1,9 +1,12 @@
package sonia.scm.repository.spi; package sonia.scm.repository.spi;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.MergeResult;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.merge.MergeStrategy; import org.eclipse.jgit.merge.MergeStrategy;
import org.eclipse.jgit.merge.ResolveMerger; import org.eclipse.jgit.merge.ResolveMerger;
import org.eclipse.jgit.lib.Repository;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sonia.scm.repository.GitWorkdirFactory; import sonia.scm.repository.GitWorkdirFactory;
@@ -47,28 +50,41 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
private static class MergeWorker { private static class MergeWorker {
private final Repository clone; private final Git clone;
private MergeWorker(Repository clone) { private MergeWorker(Repository clone) {
this.clone = clone; this.clone = new Git(clone);
} }
private MergeCommandResult merge(MergeCommandRequest request) throws IOException { private MergeCommandResult merge(MergeCommandRequest request) throws IOException {
ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(clone); try {
boolean mergeResult = merger.merge( clone.checkout().setName(request.getTargetBranch()).call();
resolveRevision(clone, request.getTargetBranch()), } catch (GitAPIException e) {
resolveRevision(clone, request.getBranchToMerge()) throw new InternalRepositoryException("could not checkout target branch " + request.getTargetBranch(), e);
); }
if (mergeResult) { MergeResult result;
logger.info("Merged branch {} into {}", request.getBranchToMerge(), request.getTargetBranch()); try {
// TODO commit, push and verify push was successful result = clone.merge().include(request.getBranchToMerge(), resolveRevision(request.getBranchToMerge())).setCommit(true).call();
} catch (GitAPIException e) {
throw new InternalRepositoryException("could not merge branch " + request.getBranchToMerge() + " into " + request.getTargetBranch(), e);
}
if (result.getMergeStatus().isSuccessful()) {
logger.info("Merged branch {} into {}", request.getBranchToMerge(), request.getTargetBranch());
try {
clone.push().call();
} catch (GitAPIException e) {
throw new InternalRepositoryException("could not push merged branch " + request.getBranchToMerge() + " to origin", e);
}
return new MergeCommandResult(true);
} else {
logger.info("Could not merged branch {} into {}", request.getBranchToMerge(), request.getTargetBranch());
return new MergeCommandResult(false);
} }
return new MergeCommandResult(mergeResult);
} }
private ObjectId resolveRevision(Repository repository, String branchToMerge) throws IOException { private ObjectId resolveRevision(String branchToMerge) throws IOException {
ObjectId resolved = repository.resolve(branchToMerge); ObjectId resolved = clone.getRepository().resolve(branchToMerge);
if (resolved == null) { if (resolved == null) {
return repository.resolve("origin/" + branchToMerge); return clone.getRepository().resolve("origin/" + branchToMerge);
} else { } else {
return resolved; return resolved;
} }