Skip to content

The Unified and Autonomous Development Platform

feat: check messages of all commits being merged into source branch.

sususweetc5596dda00bc
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 4c87e71cb8..9a5d178276 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -1153,6 +1153,26 @@ public class PullRequest extends ProjectBelonging
return commitMessageErrorOpt.orElse(null);
}
+ @Nullable
+ public CommitMessageError checkUpdateSourceBranchCommitMessages(MergeStrategy mergeStrategy, ObjectId oldObjectId, ObjectId newObjectId) {
+ if (commitMessageErrorOpt.isEmpty()) {
+
+ CommitMessageError error = null;
+ if (mergeStrategy != SQUASH_SOURCE_BRANCH_COMMITS) {
+ error = getProject().checkCommitMessages(getSourceBranch(), getSubmitter(), oldObjectId, newObjectId, new HashMap<>());
+ }
+ if (error == null && autoMerge.isEnabled() && isMergeCommitMessageRequired()) {
+ var branchProtection = getProject().getBranchProtection(getSourceBranch(), autoMerge.getUser());
+ var commitMessage = getDefaultUpdateSourceBranchCommitMessage(mergeStrategy);
+ var errorMessage = branchProtection.checkCommitMessage(commitMessage, mergeStrategy != SQUASH_SOURCE_BRANCH_COMMITS);
+ if (errorMessage != null)
+ error = new CommitMessageError(null, errorMessage);
+ }
+ commitMessageErrorOpt = Optional.ofNullable(error);
+ }
+ return commitMessageErrorOpt.orElse(null);
+ }
+
public static String getSerialLockName(Long requestId) {
return "pull-request-" + requestId + "-serial";
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 8b418aea47..c5ebccaa67 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -1635,13 +1635,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
var project = request.getProject();
var user = SecurityUtils.getAuthUser();
Map<String, String> gitEnvs = new HashMap<>();
- var branchProtection = project.getBranchProtection(request.getSourceBranch(), request.getSubmitter());
-
String branchName = request.getSourceBranch();
- BranchProtection protection = project.getBranchProtection(branchName, SecurityUtils.getAuthUser());
+ BranchProtection protection = project.getBranchProtection(branchName, user);
- ObjectId oldObjectId = request.getBaseCommit().copy();
- ObjectId newObjectId = request.getLatestUpdate().getHeadCommit().copy();
+ ObjectId oldObjectId = request.getLatestUpdate().getHeadCommit().copy();
+ ObjectId newObjectId = request.getBaseCommit().copy();
String errorMessage;
if (protection.isPreventForcedPush()
@@ -1652,11 +1650,21 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
errorMessage = "Review required for your change. Please submit pull request instead";
return errorMessage;
} else if (!newObjectId.equals(ObjectId.zeroId())) {
-// if (commitMessage != null) {
-// errorMessage = branchProtection.checkCommitMessage(commitMessage, false);
-// if (errorMessage != null)
-// return errorMessage;
-// }
+ var commitMessageError = request.checkUpdateSourceBranchCommitMessages(mergeStrategy, oldObjectId, newObjectId);
+ if (commitMessageError != null) {
+ if (commitMessageError.getCommitId() != null) {
+ var params = CommitDetailPage.paramsOf(getProject(), commitMessageError.getCommitId().name());
+ return String.format("Error validating commit message of <a href='%s' class='text-monospace font-size-sm'>%s</a>: %s",
+ RequestCycle.get().urlFor(CommitDetailPage.class, params),
+ GitUtils.abbreviateSHA(commitMessageError.getCommitId().name()),
+ escapeHtml5(commitMessageError.getErrorMessage()));
+ } else {
+ return String.format("Error validating auto merge commit message: %s",
+ escapeHtml5(commitMessageError.getErrorMessage()));
+ }
+ } else {
+ return null;
+ }
} else if (!oldObjectId.equals(ObjectId.zeroId()) && !newObjectId.equals(ObjectId.zeroId())
&& project.isBuildRequiredForPush(user, branchName, oldObjectId, newObjectId, gitEnvs)) {
errorMessage = "Build required for your change. Please submit pull request instead";