Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-06 13:35:44 +01:00
Code Issues Packages Projects Releases Activity

Implement simple merge dry run

Browse Source
This commit is contained in:
René Pfeuffer
2018-11-06 14:40:55 +01:00
parent 8df0b53f36
commit e0cc99a3d8
3 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,25 @@
package sonia.scm.repository.spi;
import org.eclipse.jgit.merge.MergeStrategy;
import org.eclipse.jgit.merge.ResolveMerger;
import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.Repository;
import java.io.IOException;
public class GitMergeDryRunCommand extends AbstractGitCommand implements MergeDryRunCommand {
GitMergeDryRunCommand(GitContext context, Repository repository) {
super(context, repository);
}
@Override
public boolean isMergeable(MergeDryRunCommandRequest request) {
try {
org.eclipse.jgit.lib.Repository repository = context.open();
ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
return merger.merge(repository.resolve(request.getBranchToMerge()), repository.resolve(request.getTargetBranch()));
} catch (IOException e) {
throw new InternalRepositoryException(e);
}
}
}

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

@@ -63,7 +63,8 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
Command.INCOMING,
Command.OUTGOING,
Command.PUSH,
Command.PULL
Command.PULL,
Command.MERGE_DRY_RUN
);
//J+
@@ -240,7 +241,11 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
return new GitTagsCommand(context, repository);
}
//~--- fields ---------------------------------------------------------------
@Override
public MergeDryRunCommand getMergeDryRunCommand() {
return new GitMergeDryRunCommand(context, repository);
}
//~--- fields ---------------------------------------------------------------
/** Field description */
private GitContext context;

23
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeDryRunCommandTest.java Normal file
View File

@@ -0,0 +1,23 @@
package sonia.scm.repository.spi;
import org.junit.Assert;
import org.junit.Test;
public class GitMergeDryRunCommandTest extends AbstractGitCommandTestBase {
@Test
public void shouldDetectNotMergeableBranches() {
GitMergeDryRunCommand command = createCommand();
MergeDryRunCommandRequest request = new MergeDryRunCommandRequest();
request.setBranchToMerge("test-branch");
request.setTargetBranch("master");
boolean mergeable = command.isMergeable(request);
Assert.assertFalse(mergeable);
}
private GitMergeDryRunCommand createCommand()
{
return new GitMergeDryRunCommand(createContext(), repository);
}
}