Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-05 04:55:50 +01:00
Code Issues Packages Projects Releases Activity

return revision on merge

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-12-18 11:03:07 +01:00
parent f2e19b6c56
commit dc6d9cc5eb
11 changed files with 97 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/Differ.java
View File

@@ -2,6 +2,7 @@ package sonia.scm.repository.spi;
import com.google.common.base.Strings;
import org.eclipse.jgit.diff.DiffEntry;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -10,6 +11,8 @@ import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.EmptyTreeIterator;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.PathFilter;
import sonia.scm.ContextEntry;
import sonia.scm.NotFoundException;
import sonia.scm.repository.GitUtil;
import sonia.scm.util.Util;
@@ -35,49 +38,48 @@ final class Differ implements AutoCloseable {
}
private static Differ create(Repository repository, DiffCommandRequest request) throws IOException {
RevWalk walk = new RevWalk(repository);
RevWalk walk = new RevWalk(repository);
ObjectId revision = repository.resolve(request.getRevision());
RevCommit commit = walk.parseCommit(revision);
ObjectId revision = repository.resolve(request.getRevision());
if (revision == null) {
throw NotFoundException.notFound(ContextEntry.ContextBuilder.entity("revision not found", request.getRevision()));
}
RevCommit commit;
try {
commit = walk.parseCommit(revision);
} catch (MissingObjectException ex) {
throw NotFoundException.notFound(ContextEntry.ContextBuilder.entity("revision not found", request.getRevision()));
}
walk.markStart(commit);
commit = walk.next();
TreeWalk treeWalk = new TreeWalk(repository);
treeWalk.reset();
treeWalk.setRecursive(true);
walk.markStart(commit);
commit = walk.next();
TreeWalk treeWalk = new TreeWalk(repository);
treeWalk.reset();
treeWalk.setRecursive(true);
if (Util.isNotEmpty(request.getPath()))
{
treeWalk.setFilter(PathFilter.create(request.getPath()));
}
if (Util.isNotEmpty(request.getPath())) {
treeWalk.setFilter(PathFilter.create(request.getPath()));
}
if (!Strings.isNullOrEmpty(request.getAncestorChangeset()))
{
ObjectId otherRevision = repository.resolve(request.getAncestorChangeset());
ObjectId ancestorId = GitUtil.computeCommonAncestor(repository, revision, otherRevision);
RevTree tree = walk.parseCommit(ancestorId).getTree();
if (!Strings.isNullOrEmpty(request.getAncestorChangeset())) {
ObjectId otherRevision = repository.resolve(request.getAncestorChangeset());
ObjectId ancestorId = GitUtil.computeCommonAncestor(repository, revision, otherRevision);
RevTree tree = walk.parseCommit(ancestorId).getTree();
treeWalk.addTree(tree);
} else if (commit.getParentCount() > 0) {
RevTree tree = commit.getParent(0).getTree();
if (tree != null) {
treeWalk.addTree(tree);
}
else if (commit.getParentCount() > 0)
{
RevTree tree = commit.getParent(0).getTree();
if (tree != null)
{
treeWalk.addTree(tree);
}
else
{
treeWalk.addTree(new EmptyTreeIterator());
}
}
else
{
} else {
treeWalk.addTree(new EmptyTreeIterator());
}
} else {
treeWalk.addTree(new EmptyTreeIterator());
}
treeWalk.addTree(commit.getTree());
treeWalk.addTree(commit.getTree());
return new Differ(commit, walk, treeWalk);
}

3
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitFastForwardIfPossible.java
View File

@@ -7,6 +7,7 @@ import sonia.scm.repository.Repository;
import sonia.scm.repository.api.MergeCommandResult;
import java.io.IOException;
import java.util.Collections;
class GitFastForwardIfPossible extends GitMergeStrategy {
@@ -22,7 +23,7 @@ class GitFastForwardIfPossible extends GitMergeStrategy {
MergeResult fastForwardResult = mergeWithFastForwardOnlyMode();
if (fastForwardResult.getMergeStatus().isSuccessful()) {
push();
return MergeCommandResult.success();
return new MergeCommandResult(Collections.emptyList(), "");
} else {
return fallbackMerge.run();
}

12
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommit.java
View File

@@ -3,10 +3,17 @@ package sonia.scm.repository.spi;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.MergeCommand;
import org.eclipse.jgit.api.MergeResult;
import org.eclipse.jgit.revwalk.RevCommit;
import sonia.scm.ContextEntry;
import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.Repository;
import sonia.scm.repository.api.MergeCommandResult;
import java.io.IOException;
import java.util.Collections;
import java.util.Optional;
import static sonia.scm.repository.spi.GitMerger.evaluateRevisionFromMergeCommit;
class GitMergeCommit extends GitMergeStrategy {
@@ -21,11 +28,12 @@ class GitMergeCommit extends GitMergeStrategy {
MergeResult result = doMergeInClone(mergeCommand);
if (result.getMergeStatus().isSuccessful()) {
doCommit();
Optional<RevCommit> revCommit = doCommit();
push();
return MergeCommandResult.success();
return new MergeCommandResult(Collections.emptyList(), evaluateRevisionFromMergeCommit(revCommit));
} else {
return analyseFailure(result);
}
}
}

6
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeStrategy.java
View File

@@ -6,6 +6,7 @@ import org.eclipse.jgit.api.MergeCommand;
import org.eclipse.jgit.api.MergeResult;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.repository.InternalRepositoryException;
@@ -14,6 +15,7 @@ import sonia.scm.repository.api.MergeCommandResult;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.Optional;
abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeCommandResult> {
@@ -52,9 +54,9 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
return result;
}
void doCommit() {
Optional<RevCommit> doCommit() {
logger.debug("merged branch {} into {}", toMerge, target);
doCommit(MessageFormat.format(determineMessageTemplate(), toMerge, target), author);
return doCommit(MessageFormat.format(determineMessageTemplate(), toMerge, target), author);
}
private String determineMessageTemplate() {

9
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeWithSquash.java
View File

@@ -2,11 +2,16 @@ package sonia.scm.repository.spi;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.MergeResult;
import org.eclipse.jgit.revwalk.RevCommit;
import sonia.scm.repository.Repository;
import sonia.scm.repository.api.MergeCommandResult;
import org.eclipse.jgit.api.MergeCommand;
import java.io.IOException;
import java.util.Collections;
import java.util.Optional;
import static sonia.scm.repository.spi.GitMerger.evaluateRevisionFromMergeCommit;
class GitMergeWithSquash extends GitMergeStrategy {
@@ -21,9 +26,9 @@ class GitMergeWithSquash extends GitMergeStrategy {
MergeResult result = doMergeInClone(mergeCommand);
if (result.getMergeStatus().isSuccessful()) {
doCommit();
Optional<RevCommit> revCommit = doCommit();
push();
return MergeCommandResult.success();
return new MergeCommandResult(Collections.emptyList(), evaluateRevisionFromMergeCommit(revCommit));
} else {
return analyseFailure(result);
}

17
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMerger.java Normal file
View File

@@ -0,0 +1,17 @@
package sonia.scm.repository.spi;
import org.eclipse.jgit.revwalk.RevCommit;
import sonia.scm.ContextEntry;
import sonia.scm.repository.InternalRepositoryException;
import java.util.Optional;
public class GitMerger {
static String evaluateRevisionFromMergeCommit(Optional<RevCommit> revCommit) {
if (revCommit.isPresent()) {
return revCommit.get().toString().split(" ")[1];
}
throw new InternalRepositoryException(ContextEntry.ContextBuilder.entity(GitMergeCommit.class, "merge commit failed"), "could not create commit on merge");
}
}