The Unified and Autonomous Development Platform
feat: specify commit message if select the merge strategy.
sususweet4c37f0dd4e03
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.javaindex 96557e0ca7..2d7bf9d204 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java@@ -51,7 +51,7 @@ public interface PullRequestManager extends EntityManager<PullRequest> {Map<ObjectId, AheadBehind> getAheadBehind(PullRequest request);- void updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy);+ void updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy, @Nullable String commitMessage);@Overridevoid delete(PullRequest request);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.javaindex b2ea51dd9f..ce07cc8f3b 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@@ -269,14 +269,13 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>@Transactional@Override- public void updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy) {+ public void updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy, String commitMessage) {MergePreview mergePreview = checkNotNull(request.checkMergePreview());User user = SecurityUtils.getUser();PersonIdent person = user.asPerson();ObjectId targetHead = request.getLatestUpdate().getHeadCommit();ObjectId requestHead = request.getTarget().getObjectId();ObjectId mergeCommitId;- String commitMessage = request.getDefaultUpdateSourceBranchCommitMessage(mergeStrategy);if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS) {mergeCommitId = gitService.rebase(request.getTargetProject(), requestHead, targetHead, person);} else if (mergeStrategy == CREATE_MERGE_COMMIT) {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.javaindex 62486fdf2c..1195fc1c4c 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@@ -71,6 +71,7 @@ import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestimport io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;import io.onedev.server.web.page.project.pullrequests.detail.operationconfirm.CommentableOperationConfirmPanel;import io.onedev.server.web.page.project.pullrequests.detail.operationconfirm.MergeConfirmPanel;+import io.onedev.server.web.page.project.pullrequests.detail.operationconfirm.UpdateSourceBranchConfirmPanel;import io.onedev.server.web.util.ConfirmClickModifier;import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.CursorSupport;@@ -1633,7 +1634,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR};}- private String updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy){+ private String updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy, String commitMessage){ProjectAndBranch source = new ProjectAndBranch(request.getTargetProject(), request.getTargetBranch());ProjectAndBranch target = new ProjectAndBranch(request.getSourceProject(), request.getSourceBranch());@@ -1672,7 +1673,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRupdateSourceBranchPr.setMergePreview(mergePreview);var branchProtection = getProject().getBranchProtection(updateSourceBranchPr.getTargetBranch(), updateSourceBranchPr.getSubmitter());- var commitMessage = updateSourceBranchPr.getDefaultUpdateSourceBranchCommitMessage(mergeStrategy);+// var commitMessage = updateSourceBranchPr.getDefaultUpdateSourceBranchCommitMessage(mergeStrategy);if (commitMessage != null) {var errorMessage = branchProtection.checkCommitMessage(commitMessage,updateSourceBranchPr.getMergeStrategy() != SQUASH_SOURCE_BRANCH_COMMITS);@@ -1685,7 +1686,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR} else if (checkMerge != null){return checkMerge;} else {- getPullRequestManager().updateSourceBranch(request, mergeStrategy);+ getPullRequestManager().updateSourceBranch(request, mergeStrategy, commitMessage);return null;}}@@ -1738,44 +1739,29 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected 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 Merge"));- fragment.add(new AjaxLink<Void>("confirm") {- @Override- public void onClick(AjaxRequestTarget target) {- if (!canOperate()) {- getSession().error("Can not perform this operation now");- } else {- String message = updateSourceBranch(getPullRequest(), CREATE_MERGE_COMMIT);- if (message == null) {- getSession().success("Source branch updated successfully");- } else {- getSession().error(message);- }- }- modal.close();- }-- });- fragment.add(new AjaxLink<Void>("cancel") {+ return new UpdateSourceBranchConfirmPanel(id, modal, latestUpdateId) {@Override- public void onClick(AjaxRequestTarget target) {- modal.close();+ protected String getTitle() {+ return "Update Source Branch by Merge";}- });- fragment.add(new AjaxLink<Void>("close") {-@Override- public void onClick(AjaxRequestTarget target) {- modal.close();+ protected String operate(AjaxRequestTarget target) {+ if (canOperate()) {+ String message = updateSourceBranch(getPullRequest(), CREATE_MERGE_COMMIT, getCommitMessage());+ if (message == null) {+ return "Source branch updated successfully";+ } else {+ return message;+ }+ } else {+ return "Can not perform this operation now";+ }}- });- fragment.setOutputMarkupId(true);- return fragment;+ };}});@@ -1798,7 +1784,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRif (!canOperate()) {getSession().error("Can not perform this operation now");} else {- String message = updateSourceBranch(getPullRequest(), REBASE_SOURCE_BRANCH_COMMITS);+ String message = updateSourceBranch(getPullRequest(), REBASE_SOURCE_BRANCH_COMMITS, null);if (message == null) {getSession().success("Source branch updated successfully");} else {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/UpdateSourceBranchConfirmPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/UpdateSourceBranchConfirmPanel.htmlnew file mode 100644index 0000000000..da6694c1b5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/UpdateSourceBranchConfirmPanel.html@@ -0,0 +1,3 @@+<wicket:extend>+ <div wicket:id="commitMessage" class="no-autosize commit-message"></div>+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/UpdateSourceBranchConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/UpdateSourceBranchConfirmPanel.javanew file mode 100644index 0000000000..d6d6badc72--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/UpdateSourceBranchConfirmPanel.java@@ -0,0 +1,42 @@+package io.onedev.server.web.page.project.pullrequests.detail.operationconfirm;++import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.page.project.pullrequests.detail.CommitMessageBean;+import io.onedev.server.model.PullRequest;+import io.onedev.server.web.component.modal.ModalPanel;+import org.apache.wicket.markup.html.WebMarkupContainer;++@SuppressWarnings("serial")+public abstract class UpdateSourceBranchConfirmPanel extends OperationConfirmPanel {++ private CommitMessageBean bean = new CommitMessageBean();++ public UpdateSourceBranchConfirmPanel(String componentId, ModalPanel modal, Long latestUpdateId) {+ super(componentId, modal, latestUpdateId);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ PullRequest request = getPullRequest();+ String commitMessage = request.getDefaultUpdateSourceBranchCommitMessage(MergeStrategy.CREATE_MERGE_COMMIT);+ if (commitMessage != null) {+ bean.setCommitMessage(commitMessage);+ getForm().add(BeanContext.edit("commitMessage", bean));+ } else {+ getForm().add(new WebMarkupContainer("commitMessage").setVisible(false));+ }+ }+++ private PullRequest getPullRequest() {+ return getLatestUpdate().getRequest();+ }++ public String getCommitMessage() {+ return bean.getCommitMessage();+ }++}