The Unified and Autonomous Development Platform
Some pull request improvements
Robin Shend35f84ef463e
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex fde6ad753b..bfd124be42 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -7208,6 +7208,11 @@ public class DataMigrator {}}dom.writeToFile(file, false);+ } else if (file.getName().startsWith("PullRequests.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements())+ element.addElement("autoMerge").addElement("enabled").setText("false");+ dom.writeToFile(file, false);}}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.javaindex e83f9d0b8e..f783c90148 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java@@ -2,6 +2,7 @@ package io.onedev.server.entitymanager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;+import io.onedev.server.model.support.pullrequest.AutoMerge;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.persistence.dao.EntityManager;@@ -13,6 +14,8 @@ public interface PullRequestChangeManager extends EntityManager<PullRequestChangvoid changeMergeStrategy(PullRequest request, MergeStrategy mergeStrategy);+ void changeAutoMerge(PullRequest request, AutoMerge autoMerge);+void changeTitle(PullRequest request, String title);void changeDescription(PullRequest request, @Nullable String description);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 c61d821601..7ff9d8b8ed 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@@ -2,6 +2,7 @@ package io.onedev.server.entitymanager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.ProjectAndBranch;@@ -42,7 +43,7 @@ public interface PullRequestManager extends EntityManager<PullRequest> {void checkAsync(PullRequest request, boolean sourceUpdated, boolean updateBuildCommit);- void merge(PullRequest request, @Nullable String commitMessage);+ void merge(User user, PullRequest request, @Nullable String commitMessage);void open(PullRequest request);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.javaindex c548b57781..2e54937b0b 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java@@ -9,11 +9,9 @@ import io.onedev.server.event.project.pullrequest.PullRequestChanged;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.PullRequestComment;+import io.onedev.server.model.support.pullrequest.AutoMerge;import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestTargetBranchChangeData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestTitleChangeData;+import io.onedev.server.model.support.pullrequest.changedata.*;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;@@ -72,6 +70,21 @@ public class DefaultPullRequestChangeManager extends BaseEntityManager<PullRequerequest.setMergeStrategy(mergeStrategy);}+ @Transactional+ @Override+ public void changeAutoMerge(PullRequest request, AutoMerge autoMerge) {+ if (request.getAutoMerge().isEnabled() && !autoMerge.isEnabled()+ || !request.getAutoMerge().isEnabled() && autoMerge.isEnabled()) {+ PullRequestChange change = new PullRequestChange();+ change.setDate(new Date());+ change.setRequest(request);+ change.setData(new PullRequestAutoMergeChangeData(autoMerge.isEnabled()));+ change.setUser(SecurityUtils.getUser());+ create(change, null);+ }+ request.setAutoMerge(autoMerge);+ }+@Transactional@Overridepublic void changeTitle(PullRequest request, String title) {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 0684491cd2..f16ac53f52 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@@ -258,10 +258,9 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>@Transactional@Override- public void merge(PullRequest request, String commitMessage) {+ public void merge(User user, PullRequest request, String commitMessage) {MergePreview mergePreview = checkNotNull(request.checkMergePreview());ObjectId mergeCommitId = ObjectId.fromString(checkNotNull(mergePreview.getMergeCommitHash()));- User user = SecurityUtils.getUser();PersonIdent person = user.asPerson();Project project = request.getTargetProject();@@ -276,6 +275,8 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>author = person;elseauthor = null;+ if (commitMessage == null)+ commitMessage = request.getDefaultCommitMessage();mergeCommitId = getGitService().amendCommit(project, mergeCommitId,author, person, commitMessage);} else if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS) {@@ -297,10 +298,16 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>ObjectId.fromString(request.getMergePreview().getMergeCommitHash()), null);}- closeAsMerged(request, false);+ closeAsMerged(user, request, false);gitService.updateRef(project, request.getTargetRef(), mergeCommitId,ObjectId.fromString(mergePreview.getTargetHeadCommitHash()));++ if (project.findDeleteBranchAfterPullRequestMerge()+ && request.checkDeleteSourceBranch() == null+ && SecurityUtils.canDeleteBranch(user.asSubject(), request.getSourceProject(), request.getSourceBranch())) {+ gitService.deleteBranch(request.getSourceProject(), request.getSourceBranch());+ }}@Transactional@@ -346,7 +353,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>listenerRegistry.post(new PullRequestOpened(request));}- private void closeAsMerged(PullRequest request, boolean dueToMerged) {+ private void closeAsMerged(User user, PullRequest request, boolean dueToMerged) {request.setStatus(MERGED);request.setCloseDate(new Date());@@ -362,7 +369,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>reason = null;PullRequestChange change = new PullRequestChange();- change.setUser(SecurityUtils.getUser());+ change.setUser(user);change.setDate(date);change.setData(new PullRequestMergeData(reason));change.setRequest(request);@@ -452,7 +459,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>} else {updateManager.checkUpdate(request);if (request.isMergedIntoTarget()) {- closeAsMerged(request, true);+ closeAsMerged(SecurityUtils.getUser(), request, true);} else {checkReviews(request, sourceUpdated);@@ -462,38 +469,43 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>}Project targetProject = request.getTargetProject();- if (request.isOpen() && !request.isMergedIntoTarget()) {- MergePreview mergePreview = request.checkMergePreview();- if (mergePreview == null) {- mergePreview = new MergePreview();- mergePreview.setTargetHeadCommitHash(request.getTarget().getObjectName());- mergePreview.setHeadCommitHash(request.getLatestUpdate().getHeadCommitHash());- mergePreview.setMergeStrategy(request.getMergeStrategy());- logger.debug("Calculating merge preview of pull request #{} in project '{}'...",- request.getNumber(), targetProject.getPath());- ObjectId merged = mergePreview.getMergeStrategy()- .merge(request, "Merge preview of pull request #" + request.getNumber());- if (merged != null)- mergePreview.setMergeCommitHash(merged.name());-- request.setMergePreview(mergePreview);-- if (updateBuildCommit) {- request.setBuildCommitHash(mergePreview.getMergeCommitHash());- updateBuildCommitRef(request);- listenerRegistry.post(new PullRequestBuildCommitUpdated((request)));- }- dao.persist(request);- updateMergePreviewRef(request);- listenerRegistry.post(new PullRequestMergePreviewUpdated(request));- } else if (updateBuildCommit &&- !Objects.equals(mergePreview.getMergeCommitHash(), request.getBuildCommitHash())) {+ MergePreview mergePreview = request.checkMergePreview();+ if (mergePreview == null) {+ mergePreview = new MergePreview();+ mergePreview.setTargetHeadCommitHash(request.getTarget().getObjectName());+ mergePreview.setHeadCommitHash(request.getLatestUpdate().getHeadCommitHash());+ mergePreview.setMergeStrategy(request.getMergeStrategy());+ logger.debug("Calculating merge preview of pull request #{} in project '{}'...",+ request.getNumber(), targetProject.getPath());+ ObjectId merged = mergePreview.getMergeStrategy()+ .merge(request, "Merge preview of pull request #" + request.getNumber());+ if (merged != null)+ mergePreview.setMergeCommitHash(merged.name());++ request.setMergePreview(mergePreview);++ if (updateBuildCommit) {request.setBuildCommitHash(mergePreview.getMergeCommitHash());- dao.persist(request);updateBuildCommitRef(request);- listenerRegistry.post(new PullRequestBuildCommitUpdated(request));+ listenerRegistry.post(new PullRequestBuildCommitUpdated((request)));}- }+ dao.persist(request);+ updateMergePreviewRef(request);+ listenerRegistry.post(new PullRequestMergePreviewUpdated(request));+ } else if (updateBuildCommit &&+ !Objects.equals(mergePreview.getMergeCommitHash(), request.getBuildCommitHash())) {+ request.setBuildCommitHash(mergePreview.getMergeCommitHash());+ dao.persist(request);+ updateBuildCommitRef(request);+ listenerRegistry.post(new PullRequestBuildCommitUpdated(request));+ }+ var autoMerge = request.getAutoMerge();+ if (autoMerge.isEnabled() && request.checkMerge() == null) {+ if (autoMerge.getUser() != null)+ merge(autoMerge.getUser(), request, null);+ else+ throw new ExplicitException("Auto merge user not specified");+ }}}}@@ -618,10 +630,18 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>lastActivity.setDate(event.getDate());event.getRequest().setLastActivity(lastActivity);}+ event.getRequest().getAutoMerge().setEnabled(false);} else if (!event.isMinor()) {event.getRequest().setLastActivity(event.getLastUpdate());- if (event instanceof PullRequestCodeCommentEvent)+ if (event instanceof PullRequestCodeCommentEvent) {event.getRequest().setCodeCommentsUpdateDate(event.getDate());+ } else if (event instanceof PullRequestChanged) {+ var data = ((PullRequestChanged) event).getChange().getData();+ if (data instanceof PullRequestMergeStrategyChangeData+ || data instanceof PullRequestTargetBranchChangeData) {+ event.getRequest().getAutoMerge().setEnabled(false);+ }+ }}}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 78adddf1d2..72c059563b 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -1919,6 +1919,17 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelreturn MergeStrategy.CREATE_MERGE_COMMIT;}++ public boolean findDeleteBranchAfterPullRequestMerge() {+ Project current = this;+ do {+ if (current.getPullRequestSetting().getDeleteSourceBranchAfterMerge() != null)+ return current.getPullRequestSetting().getDeleteSourceBranchAfterMerge();+ current = current.getParent();+ } while (current != null);++ return false;+ }public List<User> findDefaultPullRequestAssignees() {Project current = this;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.javaindex 741e48a919..e30e037a9a 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@@ -16,6 +16,7 @@ import io.onedev.server.git.service.GitService;import io.onedev.server.model.support.*;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;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.rest.annotation.Api;@@ -263,6 +264,9 @@ public class PullRequest extends ProjectBelonging@Embeddedprivate LastActivity lastActivity;+ @Embedded+ private AutoMerge autoMerge = new AutoMerge();+@Column(name="CODE_COMMENTS_UPDT")private Date codeCommentsUpdateDate;@@ -740,6 +744,14 @@ public class PullRequest extends ProjectBelongingthis.lastActivity = lastActivity;}+ public AutoMerge getAutoMerge() {+ return autoMerge;+ }++ public void setAutoMerge(AutoMerge autoMerge) {+ this.autoMerge = autoMerge;+ }+@Nullablepublic Date getCodeCommentsUpdateDate() {return codeCommentsUpdateDate;@@ -1031,6 +1043,17 @@ public class PullRequest extends ProjectBelongingreturn null;}++ public String getDefaultCommitMessage() {+ if (autoMerge.getCommitMessage() != null) {+ return autoMerge.getCommitMessage();+ } else {+ var commitMessage = "Merges pull request #" + getNumber() + "\n\n" + getTitle();+ if (getDescription() != null)+ commitMessage += "\n\n" + getDescription();+ return commitMessage;+ }+ }@Nullablepublic String checkReopen() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.javanew file mode 100644index 0000000000..b537b510d5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/AutoMerge.java@@ -0,0 +1,59 @@+package io.onedev.server.model.support.pullrequest;++import io.onedev.server.model.User;+import org.hibernate.annotations.OptimisticLock;++import javax.annotation.Nullable;+import javax.persistence.*;+import java.io.Serializable;++@Embeddable+public class AutoMerge implements Serializable {++ private static final long serialVersionUID = 1L;++ public static final String COLUMN_ENABLED = "AUTO_MERGE_ENABLED";++ public static final String COLUMN_USER = "AUTO_MERGE_USER";++ public static final String COLUMN_COMMIT_MESSAGE = "AUTO_MERGE_COMMIT_MESSAGE";++ @Column(name=COLUMN_ENABLED, nullable = false)+ @OptimisticLock(excluded=true)+ private boolean enabled;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(name=COLUMN_USER)+ @OptimisticLock(excluded=true)+ private User user;++ @Column(name= COLUMN_COMMIT_MESSAGE)+ @OptimisticLock(excluded=true)+ private String commitMessage;++ public boolean isEnabled() {+ return enabled;+ }++ public void setEnabled(boolean enabled) {+ this.enabled = enabled;+ }++ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++ @Nullable+ public String getCommitMessage() {+ return commitMessage;+ }++ public void setCommitMessage(String commitMessage) {+ this.commitMessage = commitMessage;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.javaindex 2785272b7b..870fd3c4f2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java@@ -27,6 +27,8 @@ public class ProjectPullRequestSetting implements Serializable {private List<String> defaultAssignees = new ArrayList<>();+ private Boolean deleteSourceBranchAfterMerge;+@Nullablepublic List<NamedPullRequestQuery> getNamedQueries() {return namedQueries;@@ -73,6 +75,17 @@ public class ProjectPullRequestSetting implements Serializable {return choices;}+ @Editable(order=400, placeholder = "Inherit from parent", rootPlaceholder = "No", description = "" ++ "If enabled, source branch will be deleted automatically after merge the pull request if " ++ "user has permission to do that")+ public Boolean getDeleteSourceBranchAfterMerge() {+ return deleteSourceBranchAfterMerge;+ }++ public void setDeleteSourceBranchAfterMerge(Boolean deleteSourceBranchAfterMerge) {+ this.deleteSourceBranchAfterMerge = deleteSourceBranchAfterMerge;+ }+public void onRenameUser(String oldName, String newName) {var index = getDefaultAssignees().indexOf(oldName);if (index != -1)diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAutoMergeChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAutoMergeChangeData.javanew file mode 100644index 0000000000..67bb50e4e9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAutoMergeChangeData.java@@ -0,0 +1,18 @@+package io.onedev.server.model.support.pullrequest.changedata;++public class PullRequestAutoMergeChangeData extends PullRequestChangeData {++ private static final long serialVersionUID = 1L;++ private final boolean enabled;++ public PullRequestAutoMergeChangeData(boolean enabled) {+ this.enabled = enabled;+ }++ @Override+ public String getActivity() {+ return enabled? "enabled auto merge": "disabled auto merge";+ }++}diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.javaindex 57522587f3..de8ffce934 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java@@ -7,6 +7,7 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.git.service.GitService;import io.onedev.server.model.*;import io.onedev.server.model.PullRequestReview.Status;+import io.onedev.server.model.support.pullrequest.AutoMerge;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.rest.InvalidParamException;@@ -311,6 +312,39 @@ public class PullRequestResource {pullRequestChangeManager.changeMergeStrategy(request, mergeStrategy);return Response.ok().build();}++ @Api(order=1550)+ @Path("/{requestId}/auto-merge")+ @POST+ public Response setAutoMerge(@PathParam("requestId") Long requestId, @NotNull AutoMergeData data) {+ PullRequest request = pullRequestManager.load(requestId);+ if (request.getAutoMerge().isEnabled()) {+ var authUser = SecurityUtils.getAuthUser();+ if (SecurityUtils.canManagePullRequests(request.getProject())+ || authUser != null && authUser.equals(request.getAutoMerge().getUser())) {+ var autoMerge = new AutoMerge();+ autoMerge.setEnabled(data.isEnabled());+ autoMerge.setUser(SecurityUtils.getUser());+ autoMerge.setCommitMessage(data.getCommitMessage());+ pullRequestChangeManager.changeAutoMerge(request, autoMerge);+ } else {+ throw new UnauthorizedException();+ }+ } else if (SecurityUtils.canWriteCode(request.getProject())) {+ if (data.isEnabled()) {+ var autoMerge = new AutoMerge();+ autoMerge.setEnabled(true);+ autoMerge.setUser(SecurityUtils.getUser());+ autoMerge.setCommitMessage(data.getCommitMessage());+ pullRequestChangeManager.changeAutoMerge(request, autoMerge);+ } else {+ throw new UnsupportedOperationException();+ }+ } else {+ throw new UnauthorizedException();+ }+ return Response.ok().build();+ }@Api(order=1600)@Path("/{requestId}/reopen")@@ -346,13 +380,14 @@ public class PullRequestResource {@POSTpublic Response merge(@PathParam("requestId") Long requestId, String note) {PullRequest request = pullRequestManager.load(requestId);- if (!SecurityUtils.canWriteCode(request.getProject()))+ var user = SecurityUtils.getUser();+ if (!SecurityUtils.canWriteCode(user.asSubject(), request.getProject()))throw new UnauthorizedException();String errorMessage = request.checkMerge();if (errorMessage != null)throw new ExplicitException(errorMessage);- pullRequestManager.merge(request, note);+ pullRequestManager.merge(user, request, note);return Response.ok().build();}@@ -509,4 +544,28 @@ public class PullRequestResource {}}++ public static class AutoMergeData implements Serializable {++ private boolean enabled;++ private String commitMessage;++ public boolean isEnabled() {+ return enabled;+ }++ public void setEnabled(boolean enabled) {+ this.enabled = enabled;+ }++ public String getCommitMessage() {+ return commitMessage;+ }++ public void setCommitMessage(String commitMessage) {+ this.commitMessage = commitMessage;+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex 85e976ee69..98e6a1b3b0 100644--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -158,23 +158,29 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {public static boolean canCreateRootProjects() {return SecurityUtils.getSubject().isPermitted(new CreateRootProjects());}-- public static boolean canDeleteBranch(Project project, String branchName) {- var subject = getSubject();- if (canWriteCode(subject, project))++ public static boolean canDeleteBranch(Subject subject, Project project, String branchName) {+ if (canWriteCode(subject, project))return !project.getBranchProtection(branchName, getUser(subject)).isPreventDeletion();- else+ elsereturn false;}- public static boolean canDeleteTag(Project project, String tagName) {- var subject = getSubject();- if (canWriteCode(subject, project))+ public static boolean canDeleteBranch(Project project, String branchName) {+ return canDeleteBranch(SecurityUtils.getSubject(), project, branchName);+ }++ public static boolean canDeleteTag(Subject subject, Project project, String tagName) {+ if (canWriteCode(subject, project))return !project.getTagProtection(tagName, getUser(subject)).isPreventDeletion();- else+ elsereturn false;}+ public static boolean canDeleteTag(Project project, String tagName) {+ return canDeleteTag(SecurityUtils.getSubject(), project, tagName);+ }+public static boolean canCreateTag(Project project, String tagName) {return canCreateTag(getSubject(), project, tagName);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex d121dc2c8e..abe8a04167 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -846,7 +846,7 @@ public abstract class CodeCommentListPanel extends Panel {cellItem.add(fragment);}- });+ });body.add(commentsTable = new DefaultDataTable<>("comments", columns, dataProvider,WebConstants.PAGE_SIZE, getPagingHistorySupport()) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommitMessageBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/CommitMessageBean.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommitMessageBean.javarename to server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/CommitMessageBean.javaindex 4a639f7979..a9a0ccf5ab 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommitMessageBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/CommitMessageBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequests.detail.operationconfirm;+package io.onedev.server.web.page.project.pullrequests.detail;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Multiline;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex a019146668..f869456bb5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -171,6 +171,21 @@<div wicket:id="help" class="font-size-sm text-muted form-text"></div></div></div>+ <div wicket:id="autoMerge" class="auto-merge">+ <div class="head d-flex">+ <span class="mr-2">Auto Merge <span wicket:id="badge" class="ml-2 badge badge-sm badge-info"/></span>+ <wicket:enclosure child="toggle">+ <div class="switch switch-sm switch-primary ml-auto">+ <label>+ <input wicket:id="toggle" type="checkbox">+ </label>+ </div>+ </wicket:enclosure>+ </div>+ <div class="body">+ <div wicket:id="tips" class="font-size-sm text-muted form-text"></div>+ </div>+ </div><div wicket:id="labels" class="labels"><div wicket:id="head" class="d-flex align-items-center justify-content-between mb-3"><span class="font-weight-bolder">Labels</span>@@ -216,4 +231,11 @@</wicket:enclosure></div></wicket:fragment>+ <wicket:fragment wicket:id="autoMergeEnabledFrag">+ Pull request will be merged automatically<wicket:enclosure> with a preset <a wicket:id="commitMessage">commit message</a></wicket:enclosure> once all reviewers have approved and all required jobs have passed.+ This option will be disabled upon adding new commits, changing merge strategy, or switching target branch.+ </wicket:fragment>+ <wicket:fragment wicket:id="autoMergeDisabledFrag">+ Enable this option to automatically merge the pull request once all reviewers have approved and all required jobs have passed.+ </wicket:fragment></wicket:extend>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 42443b6459..e77a664424 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@@ -11,6 +11,7 @@ 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.BuildRequirement;+import io.onedev.server.model.support.pullrequest.AutoMerge;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.search.entity.EntityQuery;@@ -24,6 +25,8 @@ import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.behavior.ChangeObserver;import io.onedev.server.web.behavior.ReferenceInputBehavior;+import io.onedev.server.web.component.MultilineLabel;+import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.component.branch.BranchLink;import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;import io.onedev.server.web.component.entity.nav.EntityNavPanel;@@ -73,6 +76,7 @@ import org.apache.wicket.RestartResponseException;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;@@ -84,6 +88,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.CheckBox;import org.apache.wicket.markup.html.form.DropDownChoice;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextField;@@ -106,6 +111,7 @@ import javax.persistence.EntityNotFoundException;import javax.validation.ValidationException;import java.io.Serializable;import java.util.*;+import java.util.concurrent.atomic.AtomicBoolean;import java.util.stream.Collectors;import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;@@ -176,8 +182,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRreturn OneDev.getInstance(PullRequestReviewManager.class);}- private PullRequestAssignmentManager getPullRequestAssignmentManager() {- return OneDev.getInstance(PullRequestAssignmentManager.class);+ private PullRequestChangeManager getPullRequestChangeManager() {+ return OneDev.getInstance(PullRequestChangeManager.class);}private WebMarkupContainer newRequestHead() {@@ -893,6 +899,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}fragment.add(newMergeStrategyContainer());+ fragment.add(newAutoMergeContainer());fragment.add(new ReviewListPanel("reviews") {@Override@@ -1245,6 +1252,170 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRreturn mergeStrategyContainer;}++ private WebMarkupContainer newAutoMergeContainer() {+ WebMarkupContainer autoMergeContainer = new WebMarkupContainer("autoMerge") {+ @Override+ protected void onBeforeRender() {+ Fragment tipsContainer;+ var autoMerge = getPullRequest().getAutoMerge();+ if (autoMerge.isEnabled()) {+ tipsContainer = new Fragment("tips", "autoMergeEnabledFrag", PullRequestDetailPage.this);+ WebMarkupContainer link;+ if (getPullRequest().getMergeStrategy() != REBASE_SOURCE_BRANCH_COMMITS) {+ if (SecurityUtils.canManagePullRequests(getProject())+ || autoMerge.getUser() != null && autoMerge.getUser().equals(SecurityUtils.getUser())) {+ link = new AjaxLink<Void>("commitMessage") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ var bean = new CommitMessageBean();+ bean.setCommitMessage(autoMerge.getCommitMessage());+ new BeanEditModalPanel<>(target, bean, "Preset Commit Message") {++ @Override+ protected void onSave(AjaxRequestTarget target, CommitMessageBean bean) {+ autoMerge.setCommitMessage(bean.getCommitMessage());+ getPullRequestChangeManager().changeAutoMerge(getPullRequest(), autoMerge);+ Session.get().success("Preset commit message updated");+ close();+ }+ };+ }++ };+ } else {+ link = new DropdownLink("commitMessage") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new MultilineLabel(id, autoMerge.getCommitMessage())+ .add(AttributeAppender.append("class", "p-3"));+ }++ };+ }+ } else {+ link = new WebMarkupContainer("commitMessage");+ link.setVisible(false);+ }+ tipsContainer.add(link);+ } else {+ tipsContainer = new Fragment("tips", "autoMergeDisabledFrag", PullRequestDetailPage.this);+ }+ addOrReplace(tipsContainer);++ super.onBeforeRender();+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ var request = getPullRequest();+ setVisible(request.isOpen() && request.checkMerge() != null);+ }++ };++ var autoMergeEnabled = new AtomicBoolean();+ var toggleCheck = new CheckBox("toggle", new IModel<>() {++ @Override+ public void detach() {+ }++ @Override+ public Boolean getObject() {+ return getPullRequest().getAutoMerge().isEnabled();+ }++ @Override+ public void setObject(Boolean object) {+ autoMergeEnabled.set(object);+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ if (getPullRequest().getAutoMerge().isEnabled())+ setVisible(SecurityUtils.canModifyPullRequest(getPullRequest()));+ else+ setVisible(SecurityUtils.canWriteCode(getProject()));+ }++ };+ toggleCheck.add(new AjaxFormComponentUpdatingBehavior("change") {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ var request = getPullRequest();+ if (autoMergeEnabled.get()) {+ if (request.getMergeStrategy() != REBASE_SOURCE_BRANCH_COMMITS) {+ var bean = new CommitMessageBean();+ bean.setCommitMessage(request.getDefaultCommitMessage());+ new BeanEditModalPanel<>(target, bean, "Preset Commit Message") {++ @Override+ protected void onSave(AjaxRequestTarget target, CommitMessageBean bean) {+ var autoMerge = new AutoMerge();+ autoMerge.setEnabled(true);+ autoMerge.setUser(SecurityUtils.getUser());+ autoMerge.setCommitMessage(bean.getCommitMessage());+ getPullRequestChangeManager().changeAutoMerge(getPullRequest(), autoMerge);+ target.add(autoMergeContainer);+ close();+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ super.onCancel(target);+ target.add(autoMergeContainer);+ }++ @Override+ protected boolean isDirtyAware() {+ return false;+ }+ };+ } else {+ var autoMerge = new AutoMerge();+ autoMerge.setEnabled(true);+ autoMerge.setUser(SecurityUtils.getUser());+ autoMerge.setCommitMessage(request.getAutoMerge().getCommitMessage());+ getPullRequestChangeManager().changeAutoMerge(request, autoMerge);+ target.add(autoMergeContainer);+ }+ } else {+ var autoMerge = new AutoMerge();+ autoMerge.setCommitMessage(request.getAutoMerge().getCommitMessage());+ getPullRequestChangeManager().changeAutoMerge(request, autoMerge);+ target.add(autoMergeContainer);+ }+ }++ });+ autoMergeContainer.add(toggleCheck);++ autoMergeContainer.add(new Label("badge", new AbstractReadOnlyModel<String>() {+ @Override+ public String getObject() {+ return getPullRequest().getAutoMerge().isEnabled()? "ON": "OFF";+ }++ }) {+ @Override+ protected void onConfigure() {+ super.onConfigure();+ toggleCheck.configure();+ setVisible(!toggleCheck.isVisible());+ }+ });++ autoMergeContainer.setOutputMarkupId(true);+ return autoMergeContainer;+ }private WebMarkupContainer newStatusBarContainer() {WebMarkupContainer statusBarContainer = new WebMarkupContainer("statusBar");@@ -1485,13 +1656,14 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRif (canOperate()) {var request = getPullRequest();var branchProtection = getProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());- if (getCommitMessage() != null) {- var errorMessage = branchProtection.checkCommitMessage(getCommitMessage(),+ var commitMessage = getCommitMessage();+ if (commitMessage != null) {+ var errorMessage = branchProtection.checkCommitMessage(commitMessage,request.getMergeStrategy() != SQUASH_SOURCE_BRANCH_COMMITS);if (errorMessage != null)return errorMessage;}- getPullRequestManager().merge(getPullRequest(), getCommitMessage());+ getPullRequestManager().merge(SecurityUtils.getUser(), getPullRequest(), commitMessage);notifyPullRequestChange(target);return null;} else {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.javaindex 2030e5a3fa..56ed75700b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java@@ -4,6 +4,7 @@ import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MEimport static io.onedev.server.model.support.pullrequest.MergeStrategy.REBASE_SOURCE_BRANCH_COMMITS;import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;+import io.onedev.server.web.page.project.pullrequests.detail.CommitMessageBean;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;@@ -32,22 +33,14 @@ public abstract class MergeConfirmPanel extends OperationConfirmPanel {String description = null;MergeStrategy mergeStrategy = request.getMergeStrategy();MergePreview mergePreview = request.checkMergePreview();- if (mergeStrategy == CREATE_MERGE_COMMIT) {- commitMessage = "Merges pull request #" + request.getNumber();- commitMessage += "\n\n" + request.getTitle();- } else if (mergeStrategy == SQUASH_SOURCE_BRANCH_COMMITS) {- commitMessage = request.getTitle();- if (request.getDescription() != null)- commitMessage += "\n\n" + request.getDescription();- commitMessage += "\n\nMerges pull request #" + request.getNumber();- } else if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS) {+ if (mergeStrategy == CREATE_MERGE_COMMIT || mergeStrategy == SQUASH_SOURCE_BRANCH_COMMITS)+ commitMessage = request.getDefaultCommitMessage();+ else if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS)description = "Source branch commits will be rebased onto target branch";- } else if (mergePreview.getMergeCommitHash().equals(mergePreview.getHeadCommitHash())) {+ else if (mergePreview.getMergeCommitHash().equals(mergePreview.getHeadCommitHash()))description = "Source branch commits will be fast-forwarded to target branch";- } else {- commitMessage = "Merges pull request #" + request.getNumber();- commitMessage += "\n\n" + request.getTitle();- }+ else+ commitMessage = request.getDefaultCommitMessage();getForm().add(new Label("description", description).setVisible(description != null));