Skip to content

The Unified and Autonomous Development Platform

feat: check branch protection rules right after user selects to update the branch.

sususweetf61d99124dd5
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index ce07cc8f3b..2636e4b065 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -272,20 +272,25 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
public void updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy, String commitMessage) {
MergePreview mergePreview = checkNotNull(request.checkMergePreview());
User user = SecurityUtils.getUser();
- PersonIdent person = user.asPerson();
+ PersonIdent person;
ObjectId targetHead = request.getLatestUpdate().getHeadCommit();
ObjectId requestHead = request.getTarget().getObjectId();
ObjectId mergeCommitId;
if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS) {
- mergeCommitId = gitService.rebase(request.getTargetProject(), requestHead, targetHead, person);
+ person = new PersonIdent(User.SYSTEM_NAME, User.SYSTEM_EMAIL_ADDRESS);
+ mergeCommitId = gitService.rebase(request.getSourceProject(), requestHead, targetHead, person);
+ ObjectId targetHeadCommitId = ObjectId.fromString(request.getSource().getObjectName());
+ mergeCommitId = gitService.amendCommits(request.getSourceProject(), mergeCommitId, targetHeadCommitId,
+ User.SYSTEM_NAME, person);
} else if (mergeStrategy == CREATE_MERGE_COMMIT) {
- mergeCommitId = gitService.merge(request.getTargetProject(), targetHead, requestHead, false,
+ person = user.asPerson();
+ mergeCommitId = gitService.merge(request.getSourceProject(), targetHead, requestHead, false,
person, person, commitMessage, false);
+ mergeCommitId = gitService.amendCommit(request.getSourceProject(), mergeCommitId, person, person, commitMessage);
} else {
return;
}
- mergeCommitId = gitService.amendCommit(request.getTargetProject(), mergeCommitId, person, person, commitMessage);
- gitService.updateRef(request.getTargetProject(), request.getSourceRef(), mergeCommitId, null);
+ gitService.updateRef(request.getSourceProject(), request.getSourceRef(), mergeCommitId, null);
checkAsync(request, true, true);
request.setBuildCommitHash(mergePreview.getMergeCommitHash());
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 1195fc1c4c..e7576a0b18 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
@@ -13,7 +13,6 @@ import io.onedev.server.git.service.RefFacade;
import io.onedev.server.model.*;
import io.onedev.server.model.PullRequestReview.Status;
import io.onedev.server.model.support.EntityWatch;
-import io.onedev.server.model.support.code.BranchProtection;
import io.onedev.server.model.support.code.BuildRequirement;
import io.onedev.server.model.support.pullrequest.AutoMerge;
import io.onedev.server.model.support.pullrequest.MergePreview;
@@ -1634,7 +1633,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
};
}
- private String updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy, String commitMessage){
+ private String checkUpdateSourceBranch(PullRequest request, MergeStrategy mergeStrategy, String commitMessage){
ProjectAndBranch source = new ProjectAndBranch(request.getTargetProject(), request.getTargetBranch());
ProjectAndBranch target = new ProjectAndBranch(request.getSourceProject(), request.getSourceBranch());
@@ -1686,7 +1685,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
} else if (checkMerge != null){
return checkMerge;
} else {
- getPullRequestManager().updateSourceBranch(request, mergeStrategy, commitMessage);
return null;
}
}
@@ -1737,6 +1735,16 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return SecurityUtils.canWriteCode(request.getProject()) && !request.isMerged();
}
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ String message = checkUpdateSourceBranch(getPullRequest(), CREATE_MERGE_COMMIT, null);
+ if (message == null) {
+ super.onClick(target);
+ } else {
+ getSession().error(message);
+ }
+ }
+
@Override
protected Component newContent(String id, ModalPanel modal) {
@@ -1750,9 +1758,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected String operate(AjaxRequestTarget target) {
if (canOperate()) {
- String message = updateSourceBranch(getPullRequest(), CREATE_MERGE_COMMIT, getCommitMessage());
+ String message = checkUpdateSourceBranch(getPullRequest(), CREATE_MERGE_COMMIT, getCommitMessage());
if (message == null) {
- return "Source branch updated successfully";
+ getPullRequestManager().updateSourceBranch(getPullRequest(), CREATE_MERGE_COMMIT, getCommitMessage());
+ getSession().success("Source branch updated successfully");
+ return null;
} else {
return message;
}
@@ -1773,8 +1783,17 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
}
@Override
- protected Component newContent(String id, ModalPanel modal) {
+ public void onClick(AjaxRequestTarget target) {
+ String message = checkUpdateSourceBranch(getPullRequest(), REBASE_SOURCE_BRANCH_COMMITS, getPullRequest().getDefaultUpdateSourceBranchCommitMessage(REBASE_SOURCE_BRANCH_COMMITS));
+ if (message == null) {
+ super.onClick(target);
+ } else {
+ getSession().error(message);
+ }
+ }
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
Fragment fragment = new Fragment(id, "confirmUpdateSourceBranchFrag", PullRequestDetailPage.this);
fragment.add(new Label("body", "You selected to update source branch by Rebase"));
fragment.add(new AjaxLink<Void>("confirm") {
@@ -1784,8 +1803,9 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
if (!canOperate()) {
getSession().error("Can not perform this operation now");
} else {
- String message = updateSourceBranch(getPullRequest(), REBASE_SOURCE_BRANCH_COMMITS, null);
+ String message = checkUpdateSourceBranch(getPullRequest(), REBASE_SOURCE_BRANCH_COMMITS, getPullRequest().getDefaultUpdateSourceBranchCommitMessage(REBASE_SOURCE_BRANCH_COMMITS));
if (message == null) {
+ getPullRequestManager().updateSourceBranch(getPullRequest(), REBASE_SOURCE_BRANCH_COMMITS, getPullRequest().getDefaultUpdateSourceBranchCommitMessage(REBASE_SOURCE_BRANCH_COMMITS));
getSession().success("Source branch updated successfully");
} else {
getSession().error(message);