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

Set merge message

Browse Source
This commit is contained in:
René Pfeuffer
2018-11-07 13:17:21 +01:00
parent d5da106038
commit 26d5e6e062
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,10 @@ import java.io.IOException;
public class GitMergeCommand extends AbstractGitCommand implements MergeCommand { public class GitMergeCommand extends AbstractGitCommand implements MergeCommand {
private static final Logger logger = LoggerFactory.getLogger(GitMergeCommand.class); private static final Logger logger = LoggerFactory.getLogger(GitMergeCommand.class);
public static final String MERGE_COMMIT_MESSAGE_TEMPLATE =
"Merge of branch %s into %s\n" +
"\n" +
"Automatic merge by SCM-Manager.";
private final GitWorkdirFactory workdirFactory; private final GitWorkdirFactory workdirFactory;
@@ -56,27 +60,33 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
} }
private MergeCommandResult merge(MergeCommandRequest request) throws IOException { private MergeCommandResult merge(MergeCommandRequest request) throws IOException {
String target = request.getTargetBranch();
String toMerge = request.getBranchToMerge();
try { try {
clone.checkout().setName(request.getTargetBranch()).call(); clone.checkout().setName(target).call();
} catch (GitAPIException e) { } catch (GitAPIException e) {
throw new InternalRepositoryException("could not checkout target branch " + request.getTargetBranch(), e); throw new InternalRepositoryException("could not checkout target branch " + target, e);
} }
MergeResult result; MergeResult result;
try { try {
result = clone.merge().include(request.getBranchToMerge(), resolveRevision(request.getBranchToMerge())).setCommit(true).call(); result = clone.merge()
.setCommit(true)
.setMessage(String.format(MERGE_COMMIT_MESSAGE_TEMPLATE, toMerge, target))
.include(toMerge, resolveRevision(toMerge))
.call();
} catch (GitAPIException e) { } catch (GitAPIException e) {
throw new InternalRepositoryException("could not merge branch " + request.getBranchToMerge() + " into " + request.getTargetBranch(), e); throw new InternalRepositoryException("could not merge branch " + toMerge + " into " + target, e);
} }
if (result.getMergeStatus().isSuccessful()) { if (result.getMergeStatus().isSuccessful()) {
logger.info("Merged branch {} into {}", request.getBranchToMerge(), request.getTargetBranch()); logger.info("merged branch {} into {}", toMerge, target);
try { try {
clone.push().call(); clone.push().call();
} catch (GitAPIException e) { } catch (GitAPIException e) {
throw new InternalRepositoryException("could not push merged branch " + request.getBranchToMerge() + " to origin", e); throw new InternalRepositoryException("could not push merged branch " + toMerge + " to origin", e);
} }
return new MergeCommandResult(true); return new MergeCommandResult(true);
} else { } else {
logger.info("Could not merged branch {} into {}", request.getBranchToMerge(), request.getTargetBranch()); logger.info("could not merged branch {} into {} due to {}", toMerge, target, result.getConflicts().keySet());
return new MergeCommandResult(false); return new MergeCommandResult(false);
} }
} }