Skip to content

The Unified and Autonomous Development Platform

chore: Reworking pull request source branch update feature

Robin Shend8ccfc858be5
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.java
index 2d7bf9d204..45d4985962 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
@@ -1,10 +1,8 @@
package io.onedev.server.entitymanager;
-import io.onedev.server.git.service.AheadBehind;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.persistence.dao.EntityManager;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.ProjectAndBranch;
@@ -49,14 +47,10 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
void open(PullRequest request);
- Map<ObjectId, AheadBehind> getAheadBehind(PullRequest request);
-
- void updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy, @Nullable String commitMessage);
-
@Override
void delete(PullRequest request);
- void deleteSourceBranch(PullRequest request, @Nullable String note);
+ void deleteSourceBranch(PullRequest request, @Nullable String note);
void restoreSourceBranch(PullRequest request, @Nullable String note);
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 2636e4b065..9c6619c450 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
@@ -18,7 +18,6 @@ import io.onedev.server.event.project.RefUpdated;
import io.onedev.server.event.project.build.BuildEvent;
import io.onedev.server.event.project.pullrequest.*;
import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.service.AheadBehind;
import io.onedev.server.git.service.GitService;
import io.onedev.server.model.*;
import io.onedev.server.model.support.CompareContext;
@@ -257,51 +256,6 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
pendingSuggestionApplyManager.discard(null, request);
}
- @Transactional
- @Override
- public Map<ObjectId, AheadBehind> getAheadBehind(PullRequest request) {
- ObjectId requestHead = request.getLatestUpdate().getHeadCommit();
- ObjectId targetHead = request.getTarget().getObjectId();
- List<ObjectId> compareIds = new ArrayList<>();
- compareIds.add(requestHead);
- return gitService.getAheadBehinds(request.getProject(), targetHead, compareIds);
- }
-
- @Transactional
- @Override
- public void updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy, String commitMessage) {
- MergePreview mergePreview = checkNotNull(request.checkMergePreview());
- User user = SecurityUtils.getUser();
- PersonIdent person;
- ObjectId targetHead = request.getLatestUpdate().getHeadCommit();
- ObjectId requestHead = request.getTarget().getObjectId();
- ObjectId mergeCommitId;
- if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS) {
- 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) {
- 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;
- }
- gitService.updateRef(request.getSourceProject(), request.getSourceRef(), mergeCommitId, null);
- checkAsync(request, true, true);
-
- request.setBuildCommitHash(mergePreview.getMergeCommitHash());
- updateBuildCommitRef(request);
- listenerRegistry.post(new PullRequestBuildCommitUpdated((request)));
-
- dao.persist(request);
- updateMergePreviewRef(request);
- listenerRegistry.post(new PullRequestMergePreviewUpdated(request));
- }
-
@Transactional
@Override
public void merge(User user, PullRequest request, String commitMessage) {
diff --git a/server-core/src/main/java/io/onedev/server/cluster/ServerNotFoundException.java b/server-core/src/main/java/io/onedev/server/exception/ServerNotFoundException.java
similarity index 87%
rename from server-core/src/main/java/io/onedev/server/cluster/ServerNotFoundException.java
rename to server-core/src/main/java/io/onedev/server/exception/ServerNotFoundException.java
index cb6c382a58..454337c282 100644
--- a/server-core/src/main/java/io/onedev/server/cluster/ServerNotFoundException.java
+++ b/server-core/src/main/java/io/onedev/server/exception/ServerNotFoundException.java
@@ -1,4 +1,4 @@
-package io.onedev.server.cluster;
+package io.onedev.server.exception;
import io.onedev.commons.utils.ExplicitException;
diff --git a/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java b/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java
index b9b267a46b..494b02cbb8 100644
--- a/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java
+++ b/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java
@@ -22,6 +22,7 @@ import io.onedev.server.git.exception.ObjectAlreadyExistsException;
import io.onedev.server.git.exception.ObjectNotFoundException;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.code.BranchProtection;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.annotation.Sessional;
import org.apache.commons.lang3.SerializationUtils;
@@ -1342,13 +1343,12 @@ public class DefaultGitService implements GitService, Serializable {
@Nullable
@Override
- public CommitMessageError checkCommitMessages(Project project, String branch, User user,
- ObjectId oldId, ObjectId newId,
- Map<String, String> envs) {
+ public CommitMessageError checkCommitMessages(BranchProtection protection, Project project,
+ ObjectId oldId, ObjectId newId,
+ Map<String, String> envs) {
Long projectId = project.getId();
- var branchProtection = project.getBranchProtection(branch, user);
- if (branchProtection.getMaxCommitMessageLineLength() != null
- || branchProtection.isEnforceConventionalCommits()) {
+ if (protection.getMaxCommitMessageLineLength() != null
+ || protection.isEnforceConventionalCommits()) {
return runOnProjectServer(projectId, () -> {
Map<ObjectId, String> commitMessages = new LinkedHashMap<>();
Set<ObjectId> mergeCommits = new HashSet<>();
@@ -1396,7 +1396,7 @@ public class DefaultGitService implements GitService, Serializable {
}
}
for (var entry: commitMessages.entrySet()) {
- var errorMessage = branchProtection.checkCommitMessage(
+ var errorMessage = protection.checkCommitMessage(
entry.getValue(), mergeCommits.contains(entry.getKey()));
if (errorMessage != null) {
return new CommitMessageError(entry.getKey(), errorMessage);
diff --git a/server-core/src/main/java/io/onedev/server/git/service/GitService.java b/server-core/src/main/java/io/onedev/server/git/service/GitService.java
index e1bb95458c..340a096db2 100644
--- a/server-core/src/main/java/io/onedev/server/git/service/GitService.java
+++ b/server-core/src/main/java/io/onedev/server/git/service/GitService.java
@@ -2,11 +2,11 @@ package io.onedev.server.git.service;
import io.onedev.commons.utils.LinearRange;
import io.onedev.server.git.*;
-import io.onedev.server.git.command.LogCommit;
import io.onedev.server.git.command.LogCommand;
+import io.onedev.server.git.command.LogCommit;
import io.onedev.server.git.command.RevListOptions;
import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
+import io.onedev.server.model.support.code.BranchProtection;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
@@ -140,8 +140,8 @@ public interface GitService {
byte[] getRawCommit(Project project, ObjectId revId, Map<String, String> envs);
@Nullable
- CommitMessageError checkCommitMessages(Project project, String branch, User user,
- ObjectId oldId, ObjectId newId, Map<String, String> envs);
+ CommitMessageError checkCommitMessages(BranchProtection protection, Project project,
+ ObjectId oldId, ObjectId newId, Map<String, String> envs);
@Nullable
byte[] getRawTag(Project project, ObjectId tagId, Map<String, String> envs);
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.java
index 4a9e9032d0..b726e32159 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
@@ -1603,7 +1603,8 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
@Nullable
public CommitMessageError checkCommitMessages(String branch, User user, ObjectId oldCommitId, ObjectId newCommitId,
Map<String, String> gitEnvs) {
- return getGitService().checkCommitMessages(this, branch, user, oldCommitId, newCommitId, gitEnvs);
+ var protection = getBranchProtection(branch, user);
+ return getGitService().checkCommitMessages(protection, this, oldCommitId, newCommitId, gitEnvs);
}
@Nullable
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 9a5d178276..5bba7ba1fa 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
@@ -308,6 +308,8 @@ public class PullRequest extends ProjectBelonging
private transient Boolean mergedIntoTarget;
+ private transient Boolean sourceOutdated;
+
private transient Collection<ObjectId> missingCommits;
private transient Collection<Long> fixedIssueIds;
@@ -808,6 +810,15 @@ public class PullRequest extends ProjectBelonging
}
return mergedIntoTarget;
}
+
+ public boolean isSourceOutdated() {
+ if (sourceOutdated == null) {
+ var sourceHead = Preconditions.checkNotNull(getSourceHead());
+ sourceOutdated = !getGitService().isMergedInto(getTargetProject(),
+ null, getTarget().getObjectId(), sourceHead);
+ }
+ return sourceOutdated;
+ }
@Nullable
public ObjectId getSourceHead() {
@@ -1048,14 +1059,6 @@ public class PullRequest extends ProjectBelonging
}
}
- public String getDefaultUpdateSourceBranchCommitMessage(MergeStrategy mergeStrategy) {
- if (mergeStrategy == CREATE_MERGE_COMMIT) {
- return "Merge branch '" + getTargetBranch() +"' into '" + getSourceBranch() + "'";
- } else {
- return "Rebase branch '" + getSourceBranch() +"' onto '" + getTargetBranch() + "'";
- }
- }
-
@Nullable
public String checkReopen() {
if (isOpen())
@@ -1153,26 +1156,6 @@ 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/model/support/code/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
index 6ba5ac610b..79f7eeae86 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
@@ -156,7 +156,8 @@ public class BranchProtection implements Serializable {
this.commitSignatureRequired = commitSignatureRequired;
}
- @Editable(order=370, description = "Check this to require <a href='https://www.conventionalcommits.org' target='_blank'>conventional commits</a>")
+ @Editable(order=370, description = "Check this to require <a href='https://www.conventionalcommits.org' target='_blank'>conventional commits</a>. " +
+ "Note this is applicable for non-merge commits")
public boolean isEnforceConventionalCommits() {
return enforceConventionalCommits;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/diff2.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/diff2.svg
index b8d2d4473b..36f629d9ee 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/diff2.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/diff2.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1729830369923" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15223" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M533.333333 288a32 32 0 0 0-64 0V384H373.333333a32 32 0 0 0 0 64H469.333333v96a32 32 0 0 0 64 0V448h96a32 32 0 0 0 0-64H533.333333V288zM373.333333 682.666667a32 32 0 0 0 0 64h256a32 32 0 0 0 0-64h-256z" fill="#404452" p-id="15224"></path><path d="M213.333333 42.666667a85.333333 85.333333 0 0 0-85.333333 85.333333v768a85.333333 85.333333 0 0 0 85.333333 85.333333h597.333334a85.333333 85.333333 0 0 0 85.333333-85.333333V299.434667a85.333333 85.333333 0 0 0-25.002667-60.330667l-171.434666-171.434667A85.333333 85.333333 0 0 0 639.232 42.666667H213.333333z m-21.333333 85.333333a21.333333 21.333333 0 0 1 21.333333-21.333333h425.898667a21.333333 21.333333 0 0 1 15.104 6.229333l171.434667 171.434667a21.333333 21.333333 0 0 1 6.229333 15.104V896a21.333333 21.333333 0 0 1-21.333333 21.333333H213.333333a21.333333 21.333333 0 0 1-21.333333-21.333333V128z" fill="#404452" p-id="15225"></path></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1729830369923" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15223" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M533.333333 288a32 32 0 0 0-64 0V384H373.333333a32 32 0 0 0 0 64H469.333333v96a32 32 0 0 0 64 0V448h96a32 32 0 0 0 0-64H533.333333V288zM373.333333 682.666667a32 32 0 0 0 0 64h256a32 32 0 0 0 0-64h-256z" p-id="15224"></path><path d="M213.333333 42.666667a85.333333 85.333333 0 0 0-85.333333 85.333333v768a85.333333 85.333333 0 0 0 85.333333 85.333333h597.333334a85.333333 85.333333 0 0 0 85.333333-85.333333V299.434667a85.333333 85.333333 0 0 0-25.002667-60.330667l-171.434666-171.434667A85.333333 85.333333 0 0 0 639.232 42.666667H213.333333z m-21.333333 85.333333a21.333333 21.333333 0 0 1 21.333333-21.333333h425.898667a21.333333 21.333333 0 0 1 15.104 6.229333l171.434667 171.434667a21.333333 21.333333 0 0 1 6.229333 15.104V896a21.333333 21.333333 0 0 1-21.333333 21.333333H213.333333a21.333333 21.333333 0 0 1-21.333333-21.333333V128z" p-id="15225"></path></svg>
\ No newline at end of file
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.html
index 3c3e07a4a8..415c001808 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
@@ -49,8 +49,8 @@
<div wicket:id="rebased" class="rebased text-success">
<wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were rebased onto target branch
</div>
- <div wicket:id="aheadBehindContainer" class="ahead-behind text-success">
- <wicket:svg href="tick-circle" class="icon"></wicket:svg><span wicket:id="description"></span> <a wicket:id="link"><span wicket:id="label"></span></a><span wicket:id="description_suffix"></span>
+ <div wicket:id="sourceBranchOutdated" class="source-branch-outdated text-primary">
+ <wicket:svg href="info-circle" class="icon"></wicket:svg> Source branch is outdated <a wicket:id="detail" class="link-primary" title="Show changes"><wicket:svg href="diff2" class="icon"/></a>
</div>
<div wicket:id="calculatingMergePreview" class="calculating-merge-preview text-warning d-flex align-items-center">
<wicket:svg href="loading" class="icon spin mr-2"></wicket:svg> Calculating merge preview...
@@ -108,11 +108,7 @@
<a wicket:id="approve" class="btn btn-sm btn-light-success btn-hover-success">Approve</a>
<a wicket:id="requestForChanges" class="btn btn-sm btn-light-warning btn-hover-warning">Request For Changes</a>
<a wicket:id="reopen" class="btn btn-sm btn-light-primary btn-hover-primary">Reopen</a>
- <a wicket:id="updateSourceBranch" type="button" class="btn btn-sm btn-light-primary btn-hover-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Update Source Branch</a>
- <div class="dropdown-menu">
- <a wicket:id="updateSourceBranchMerge" class="dropdown-item">Merge</a>
- <a wicket:id="updateSourceBranchRebase" class="dropdown-item">Rebase</a>
- </div>
+ <a wicket:id="updateSourceBranch" class="btn btn-sm btn-light-primary btn-hover-primary">Update Source Branch <wicket:svg href="arrow" class="icon rotate-90"/></a>
<a wicket:id="deleteSourceBranch" class="btn btn-sm btn-light-primary btn-hover-primary">Delete Source Branch</a>
<a wicket:id="restoreSourceBranch" class="btn btn-sm btn-light-primary btn-hover-primary">Restore Source Branch</a>
</div>
@@ -239,19 +235,6 @@
</wicket:enclosure>
</div>
</wicket:fragment>
- <wicket:fragment wicket:id="confirmUpdateSourceBranchFrag">
- <div class="confirm-delete-branch">
- <div class="modal-header">
- <h5 class="modal-title">Please confirm</h5>
- <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
- </div>
- <div wicket:id="body" class="modal-body"></div>
- <div class="modal-footer">
- <a wicket:id="confirm" class="btn btn-danger">Confirm</a>
- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
- </div>
- </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> when ready.
This option will be disabled upon adding new commits, changing merge strategy, or switching target branch
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 e7576a0b18..01a0bf1ae5 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
@@ -1,13 +1,11 @@
package io.onedev.server.web.page.project.pullrequests.detail;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.*;
import io.onedev.server.entityreference.EntityReference;
import io.onedev.server.entityreference.LinkTransformer;
import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.service.AheadBehind;
import io.onedev.server.git.service.GitService;
import io.onedev.server.git.service.RefFacade;
import io.onedev.server.model.*;
@@ -17,13 +15,11 @@ 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.InvalidParamException;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.ReadCode;
-import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
@@ -45,6 +41,7 @@ import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
import io.onedev.server.web.component.project.gitprotocol.GitProtocolPanel;
import io.onedev.server.web.component.pullrequest.assignment.AssignmentListPanel;
import io.onedev.server.web.component.pullrequest.build.PullRequestJobsPanel;
@@ -68,9 +65,8 @@ import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
import 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.page.project.pullrequests.detail.operationdlg.MergePullRequestOptionPanel;
+import io.onedev.server.web.page.project.pullrequests.detail.operationdlg.OperationCommentPanel;
import io.onedev.server.web.util.ConfirmClickModifier;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.CursorSupport;
@@ -95,7 +91,10 @@ 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.*;
+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;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
@@ -109,7 +108,6 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
import org.jetbrains.annotations.Nullable;
import javax.persistence.EntityNotFoundException;
@@ -179,6 +177,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
latestUpdateId = requestModel.getObject().getLatestUpdate().getId();
}
+ private GitService getGitService() {
+ return OneDev.getInstance(GitService.class);
+ }
+
private PullRequestManager getPullRequestManager() {
return OneDev.getInstance(PullRequestManager.class);
}
@@ -449,68 +451,32 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
}
});
- summaryContainer.add(new WebMarkupContainer("aheadBehindContainer") {
+ summaryContainer.add(new WebMarkupContainer("sourceBranchOutdated") {
@Override
protected void onInitialize() {
super.onInitialize();
- Map<ObjectId, AheadBehind> abs = getPullRequestManager().getAheadBehind(getPullRequest());
- RevCommit lastCommit = getPullRequest().getLatestUpdate().getHeadCommit();
- AheadBehind ab = Preconditions.checkNotNull(abs.get(lastCommit));
-
- add(new Label("description", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return "Source branch is ";
- }
-
- }).setEscapeModelStrings(false));
-
- add(new Link<Void>("link") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Label("label", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return ab.getBehind() + " commit(s)";
- }
-
- }));
- }
+ add(new Link<Void>("detail") {
@Override
public void onClick() {
RevisionComparePage.State state = new RevisionComparePage.State();
- state.leftSide = new ProjectAndBranch(getProject(), getPullRequest().getSourceBranch());
- state.rightSide = new ProjectAndBranch(getProject(), getPullRequest().getTargetBranch());
+ var request = getPullRequest();
+ state.leftSide = request.getSource();
+ state.rightSide = request.getTarget();
PageParameters params = RevisionComparePage.paramsOf(getProject(), state);
setResponsePage(RevisionComparePage.class, params);
}
});
-
- add(new Label("description_suffix", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return " behind of target branch";
- }
-
- }).setEscapeModelStrings(false));
}
@Override
protected void onConfigure() {
super.onConfigure();
-
- Map<ObjectId, AheadBehind> abs = getPullRequestManager().getAheadBehind(getPullRequest());
- RevCommit lastCommit = getPullRequest().getLatestUpdate().getHeadCommit();
- AheadBehind ab = Preconditions.checkNotNull(abs.get(lastCommit));
- setVisible(!getPullRequest().isMerged() && ab.getBehind() > 0);
+ setVisible(getPullRequest().isOpen()
+ && getPullRequest().getSourceHead() != null
+ && getPullRequest().isSourceOutdated());
}
});
@@ -1633,62 +1599,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
};
}
- 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());
-
- PullRequest updateSourceBranchPr = new PullRequest();
- updateSourceBranchPr.setTitle(StringUtils.capitalize(source.getBranch().replace('-', ' ').replace('_', ' ').toLowerCase()));
- updateSourceBranchPr.setTarget(target);
- updateSourceBranchPr.setSource(source);
- updateSourceBranchPr.setSubmitter(SecurityUtils.getAuthUser());
-
- ObjectId baseCommitId = OneDev.getInstance(GitService.class).getMergeBase(
- target.getProject(), target.getObjectId(),
- source.getProject(), source.getObjectId());
-
- if (baseCommitId == null)
- throw new InvalidParamException("No common base for target and source");
-
- updateSourceBranchPr.setBaseCommitHash(baseCommitId.name());
-
- PullRequestUpdate update = new PullRequestUpdate();
- updateSourceBranchPr.getUpdates().add(update);
- updateSourceBranchPr.setUpdates(updateSourceBranchPr.getUpdates());
- update.setRequest(updateSourceBranchPr);
- update.setHeadCommitHash(source.getObjectName());
- update.setTargetHeadCommitHash(updateSourceBranchPr.getTarget().getObjectName());
-
- getPullRequestManager().checkReviews(updateSourceBranchPr, false);
-
- updateSourceBranchPr.setMergeStrategy(mergeStrategy);
- MergePreview mergePreview = new MergePreview();
- mergePreview.setTargetHeadCommitHash(updateSourceBranchPr.getTarget().getObjectName());
- mergePreview.setHeadCommitHash(updateSourceBranchPr.getLatestUpdate().getHeadCommitHash());
- mergePreview.setMergeStrategy(updateSourceBranchPr.getMergeStrategy());
- ObjectId merged = mergePreview.getMergeStrategy().merge(updateSourceBranchPr, "Pull request update source branch preview");
- if (merged != null)
- mergePreview.setMergeCommitHash(merged.name());
- updateSourceBranchPr.setMergePreview(mergePreview);
-
- var branchProtection = getProject().getBranchProtection(updateSourceBranchPr.getTargetBranch(), updateSourceBranchPr.getSubmitter());
-// var commitMessage = updateSourceBranchPr.getDefaultUpdateSourceBranchCommitMessage(mergeStrategy);
- if (commitMessage != null) {
- var errorMessage = branchProtection.checkCommitMessage(commitMessage,
- updateSourceBranchPr.getMergeStrategy() != SQUASH_SOURCE_BRANCH_COMMITS);
- if (errorMessage != null)
- return errorMessage;
- }
- String checkMerge = updateSourceBranchPr.checkMerge();
- if (!SecurityUtils.canWriteCode(updateSourceBranchPr.getProject())){
- return "You don't have permission to do this operation";
- } else if (checkMerge != null){
- return checkMerge;
- } else {
- return null;
- }
- }
-
private WebMarkupContainer newOperationsContainer() {
WebMarkupContainer operationsContainer = new WebMarkupContainer("requestOperations");
operationsContainer.add(new ChangeObserver() {
@@ -1707,132 +1617,139 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
});
operationsContainer.setOutputMarkupPlaceholderTag(true);
-
operationsContainer.setVisible(SecurityUtils.getAuthUser() != null);
- operationsContainer.add(new Button("updateSourceBranch") {
-
- private boolean canOperate() {
- var request = getPullRequest();
- return SecurityUtils.canWriteCode(request.getProject()) && !request.isMerged();
- }
+ operationsContainer.add(new MenuLink("updateSourceBranch") {
@Override
- protected void onConfigure() {
- super.onConfigure();
- Map<ObjectId, AheadBehind> abs = getPullRequestManager().getAheadBehind(getPullRequest());
- RevCommit lastCommit = getPullRequest().getLatestUpdate().getHeadCommit();
- AheadBehind ab = Preconditions.checkNotNull(abs.get(lastCommit));
- setVisible(canOperate() && ab.getBehind() > 0);
- }
- });
-
-
- operationsContainer.add(new ModalLink("updateSourceBranchMerge") {
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ var menuItems = new ArrayList<MenuItem>();
+ menuItems.add(new MenuItem() {
+ @Override
+ public String getLabel() {
+ return "Merge";
+ }
- private boolean canOperate() {
- var request = getPullRequest();
- return SecurityUtils.canWriteCode(request.getProject()) && !request.isMerged();
- }
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
- @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
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ var request = getPullRequest();
+ var targetHead = request.getTarget().getObjectId();
+ var sourceHead = request.getSourceHead();
+ var result = checkUpdateSourceBranch(true);
+ if (result instanceof ObjectId) {
+ var mergeCommit = getProject().getRevCommit((ObjectId) result, true);
+ var bean = new CommitMessageBean();
+ bean.setCommitMessage(mergeCommit.getFullMessage());
+ new BeanEditModalPanel<>(target, bean, "Merge Target Branch into Source Branch") {
+ @Override
+ protected String getCssClass() {
+ return "modal-lg commit-message no-autosize";
+ }
- @Override
- protected Component newContent(String id, ModalPanel modal) {
+ @Override
+ protected boolean isDirtyAware() {
+ return false;
+ }
- return new UpdateSourceBranchConfirmPanel(id, modal, latestUpdateId) {
+ @Override
+ protected String onSave(AjaxRequestTarget target, CommitMessageBean bean) {
+ var request = getPullRequest();
+ var user = SecurityUtils.getAuthUser();
+ var protection = request.getSourceProject().getBranchProtection(request.getSourceBranch(), user);
+ var errorMessage = protection.checkCommitMessage(bean.getCommitMessage(), true);
+ if (errorMessage != null)
+ return errorMessage;
+ if (targetHead.equals(request.getTarget().getObjectId())
+ && sourceHead.equals(request.getSourceHead())) {
+ var gitService = OneDev.getInstance(GitService.class);
+ var amendedCommitId = gitService.amendCommit(request.getProject(), mergeCommit.copy(),
+ mergeCommit.getAuthorIdent(), mergeCommit.getCommitterIdent(),
+ bean.getCommitMessage());
+ updateSourceBranch(amendedCommitId);
+ getSession().success("Source branch updated successfully");
+ } else {
+ getSession().warn("Target or source branch is updated. Please try again");
+ }
+ close();
+ return null;
+ }
- @Override
- protected String getTitle() {
- return "Update Source Branch by Merge";
+ };
+ } else {
+ getSession().error((String)result);
+ }
+ }
+ };
}
-
+ });
+ menuItems.add(new MenuItem() {
@Override
- protected String operate(AjaxRequestTarget target) {
- if (canOperate()) {
- String message = checkUpdateSourceBranch(getPullRequest(), CREATE_MERGE_COMMIT, getCommitMessage());
- if (message == null) {
- getPullRequestManager().updateSourceBranch(getPullRequest(), CREATE_MERGE_COMMIT, getCommitMessage());
- getSession().success("Source branch updated successfully");
- return null;
- } else {
- return message;
- }
- } else {
- return "Can not perform this operation now";
- }
+ public String getLabel() {
+ return "Rebase";
}
- };
- }
- });
-
- operationsContainer.add(new ModalLink("updateSourceBranchRebase") {
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
- private boolean canOperate() {
- var request = getPullRequest();
- return SecurityUtils.canWriteCode(request.getProject()) && !request.isMerged();
- }
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ var request = getPullRequest();
+ var targetHead = request.getTarget().getObjectId();
+ var sourceHead = request.getSourceHead();
+ var result = checkUpdateSourceBranch(false);
+ if (result instanceof ObjectId) {
+ new ConfirmModalPanel(target) {
- @Override
- 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 void onConfirm(AjaxRequestTarget target) {
+ var request = getPullRequest();
+ if (targetHead.equals(request.getTarget().getObjectId())
+ && sourceHead.equals(request.getSourceHead())) {
+ updateSourceBranch((ObjectId)result);
+ getSession().success("Source branch updated successfully");
+ } else {
+ getSession().warn("Target or source branch is updated. Please try again");
+ }
+ }
- @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") {
+ @Override
+ protected String getConfirmInput() {
+ return null;
+ }
- @Override
- public void onClick(AjaxRequestTarget target) {
- if (!canOperate()) {
- getSession().error("Can not perform this operation now");
- } else {
- 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);
+ @Override
+ protected String getConfirmMessage() {
+ return "You are rebasing source branch on top of target branch";
+ }
+ };
+ } else {
+ getSession().error((String)result);
+ }
}
- }
- modal.close();
- }
-
- });
- fragment.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- modal.close();
+ };
}
-
});
- fragment.add(new AjaxLink<Void>("close") {
+ return menuItems;
+ }
- @Override
- public void onClick(AjaxRequestTarget target) {
- modal.close();
- }
+ private boolean canOperate() {
+ return SecurityUtils.canWriteCode(getPullRequest().getProject())
+ && getPullRequest().isOpen()
+ && getPullRequest().getSourceHead() != null
+ && getPullRequest().isSourceOutdated();
+ }
- });
- fragment.setOutputMarkupId(true);
- return fragment;
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(canOperate());
}
});
@@ -1856,7 +1773,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {
+ return new OperationCommentPanel(id, modal, latestUpdateId) {
@Override
protected String operate(AjaxRequestTarget target) {
@@ -1899,7 +1816,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {
+ return new OperationCommentPanel(id, modal, latestUpdateId) {
@Override
protected String operate(AjaxRequestTarget target) {
@@ -1937,7 +1854,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new MergeConfirmPanel(id, modal, latestUpdateId) {
+ return new MergePullRequestOptionPanel(id, modal, latestUpdateId) {
@Override
protected String operate(AjaxRequestTarget target) {
@@ -1978,7 +1895,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {
+ return new OperationCommentPanel(id, modal, latestUpdateId) {
@Override
protected String operate(AjaxRequestTarget target) {
@@ -2015,7 +1932,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {
+ return new OperationCommentPanel(id, modal, latestUpdateId) {
@Override
protected String operate(AjaxRequestTarget target) {
@@ -2054,7 +1971,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {
+ return new OperationCommentPanel(id, modal, latestUpdateId) {
@Override
protected String operate(AjaxRequestTarget target) {
@@ -2094,7 +2011,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {
+ return new OperationCommentPanel(id, modal, latestUpdateId) {
@Override
protected String operate(AjaxRequestTarget target) {
@@ -2120,6 +2037,63 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return operationsContainer;
}
+ /**
+ * @return String type representing error message if check failed; otherwise ObjectId type
+ * representing merge commit id
+ */
+ private Object checkUpdateSourceBranch(boolean updateByMerge) {
+ var request = getPullRequest();
+ var user = SecurityUtils.getAuthUser();
+ var project = request.getProject();
+ var protection = request.getSourceProject().getBranchProtection(request.getSourceBranch(), user);
+
+ ObjectId sourceHead = request.getSourceHead();
+ ObjectId targetHead = request.getTarget().getObjectId();
+ ObjectId mergeCommitId;
+
+ var gitService = getGitService();
+ if (updateByMerge) {
+ var commitMessage = "Merge branch '" + request.getTargetBranch() +"'";
+ if (!request.getSourceProject().equals(project))
+ commitMessage += " of project '" + project.getPath() + "' ";
+ commitMessage += " into branch '" + request.getSourceBranch() + "'";
+ mergeCommitId = gitService.merge(project, targetHead, sourceHead,
+ false, user.asPerson(), user.asPerson(), commitMessage, false);
+ } else {
+ mergeCommitId = gitService.rebase(project, sourceHead, targetHead, user.asPerson());
+ }
+ if (mergeCommitId == null)
+ return "There are merge conflicts";
+ if (protection.isReviewRequiredForPush(project, sourceHead, mergeCommitId, new HashMap<>()))
+ return "Review required for this change. Submit pull request instead";
+ var buildRequirement = protection.getBuildRequirement(project, sourceHead, mergeCommitId, new HashMap<>());
+ if (!buildRequirement.getRequiredJobs().isEmpty())
+ return "This change needs to be verified by some jobs. Submit pull request instead";
+ if (protection.isCommitSignatureRequired()
+ && !project.hasValidCommitSignature(project.getRevCommit(targetHead, true))) {
+ return "No valid signature for head commit of target branch";
+ }
+ if (updateByMerge
+ && protection.isCommitSignatureRequired()
+ && OneDev.getInstance(SettingManager.class).getGpgSetting().getSigningKey() == null) {
+ return "Commit signature required but no GPG signing key specified";
+ }
+ var error = gitService.checkCommitMessages(protection, project, sourceHead, mergeCommitId, new HashMap<>());
+ if (error != null)
+ return "Error validating commit message of '" + error.getCommitId().name() + "': " + error.getErrorMessage();
+
+ return mergeCommitId;
+ }
+
+ private void updateSourceBranch(ObjectId commitId) {
+ var request = getPullRequest();
+ var gitService = getGitService();
+ if (!request.getSourceProject().equals(request.getTargetProject()))
+ gitService.fetch(request.getSourceProject(), request.getTargetProject(), commitId.name());
+ var oldCommitId = request.getSourceHead();
+ getGitService().updateRef(request.getSourceProject(), request.getSourceRef(), commitId, oldCommitId);
+ }
+
@Override
protected void onDetach() {
requestModel.detach();
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.html
deleted file mode 100644
index da6694c1b5..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/UpdateSourceBranchConfirmPanel.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<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.java
deleted file mode 100644
index d6d6badc72..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/UpdateSourceBranchConfirmPanel.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/MergePullRequestOptionPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.html
rename to server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/MergePullRequestOptionPanel.html
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/operationdlg/MergePullRequestOptionPanel.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/MergePullRequestOptionPanel.java
index fa9c6a7e4c..e58bb49a4c 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/operationdlg/MergePullRequestOptionPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.pullrequests.detail.operationconfirm;
+package io.onedev.server.web.page.project.pullrequests.detail.operationdlg;
import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;
import static io.onedev.server.model.support.pullrequest.MergeStrategy.REBASE_SOURCE_BRANCH_COMMITS;
@@ -15,11 +15,11 @@ import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.editable.BeanContext;
@SuppressWarnings("serial")
-public abstract class MergeConfirmPanel extends OperationConfirmPanel {
+public abstract class MergePullRequestOptionPanel extends ObsoleteUpdateAwarePanel {
private CommitMessageBean bean = new CommitMessageBean();
- public MergeConfirmPanel(String componentId, ModalPanel modal, Long latestUpdateId) {
+ public MergePullRequestOptionPanel(String componentId, ModalPanel modal, Long latestUpdateId) {
super(componentId, modal, latestUpdateId);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/ObsoleteUpdateAwarePanel.html
similarity index 90%
rename from server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.html
rename to server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/ObsoleteUpdateAwarePanel.html
index ddfcba0425..aa6e474727 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/ObsoleteUpdateAwarePanel.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <div class="pull-request-operation-confirm">
+ <div class="obsolete-update-aware">
<form wicket:id="form" class="leave-confirm">
<div class="modal-header">
<h5 wicket:id="title" id="modal-title" class="modal-title">Please Confirm</h5>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/ObsoleteUpdateAwarePanel.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/ObsoleteUpdateAwarePanel.java
index 8876a823e0..16eb73fa9b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/ObsoleteUpdateAwarePanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.pullrequests.detail.operationconfirm;
+package io.onedev.server.web.page.project.pullrequests.detail.operationdlg;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.PullRequestUpdateManager;
@@ -23,7 +23,7 @@ import org.unbescape.html.HtmlEscape;
import javax.annotation.Nullable;
@SuppressWarnings("serial")
-public abstract class OperationConfirmPanel extends Panel {
+public abstract class ObsoleteUpdateAwarePanel extends Panel {
private final ModalPanel modal;
@@ -31,7 +31,7 @@ public abstract class OperationConfirmPanel extends Panel {
private Long latestUpdateId;
- public OperationConfirmPanel(String componentId, ModalPanel modal, Long latestUpdateId) {
+ public ObsoleteUpdateAwarePanel(String componentId, ModalPanel modal, Long latestUpdateId) {
super(componentId);
this.modal = modal;
this.latestUpdateId = latestUpdateId;
@@ -115,11 +115,11 @@ public abstract class OperationConfirmPanel extends Panel {
}
target.prependJavaScript(String.format("$('#%s').data('dirty', $('#%s').hasClass('dirty'))",
- OperationConfirmPanel.this.getMarkupId(), form.getMarkupId()));
+ ObsoleteUpdateAwarePanel.this.getMarkupId(), form.getMarkupId()));
target.appendJavaScript(String.format(""
+ "if ($('#%s').data('dirty')) "
+ " onedev.server.form.markDirty($('#%s'))",
- OperationConfirmPanel.this.getMarkupId(), form.getMarkupId()));
+ ObsoleteUpdateAwarePanel.this.getMarkupId(), form.getMarkupId()));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/OperationCommentPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.html
rename to server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/OperationCommentPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/OperationCommentPanel.java
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/OperationCommentPanel.java
index 164ac61fd7..70ef61180b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/OperationCommentPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.pullrequests.detail.operationconfirm;
+package io.onedev.server.web.page.project.pullrequests.detail.operationdlg;
import com.google.common.collect.Lists;
import io.onedev.server.attachment.AttachmentSupport;
@@ -16,11 +16,11 @@ import javax.annotation.Nullable;
import java.util.List;
@SuppressWarnings("serial")
-public abstract class CommentableOperationConfirmPanel extends OperationConfirmPanel {
+public abstract class OperationCommentPanel extends ObsoleteUpdateAwarePanel {
private String comment;
- public CommentableOperationConfirmPanel(String componentId, ModalPanel modal, Long latestUpdateId) {
+ public OperationCommentPanel(String componentId, ModalPanel modal, Long latestUpdateId) {
super(componentId, modal, latestUpdateId);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
index 456aca2cd6..8abbc5a5a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
@@ -34,6 +34,11 @@
height: 16px;
margin-bottom: 1px;
}
+.pull-request-detail>.card-body>.main>.summary .source-branch-outdated a>.icon {
+ width: 16px;
+ height: 16px;
+ margin-bottom: 2px;
+}
.pull-request-detail>.card-body>.main>.summary>.contribution {
border-top: 1px dashed var(--light-gray);
padding-top: 1rem;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java
index c27170067a..4520bc5bd4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.page.simple.error;
import com.google.common.base.Throwables;
import io.onedev.server.OneDev;
-import io.onedev.server.cluster.ServerNotFoundException;
+import io.onedev.server.exception.ServerNotFoundException;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.exception.ExceptionUtils;
import io.onedev.server.security.SecurityUtils;
diff --git a/server-ee b/server-ee
index ca51e65adc..d7f97635ca 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit ca51e65adca235600bc929ff00944d7c01dc2e51
+Subproject commit d7f97635ca01c5c7564c5e91a8c1b365948aa18c