Skip to content

The Unified and Autonomous Development Platform

feat: Able to synchronize source branch with when processing a pull request.

sususweet628e5463726c
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 aee8677567..e5c85e311c 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,5 +1,6 @@
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;
@@ -18,55 +19,59 @@ import java.util.List;
import java.util.Map;
public interface PullRequestManager extends EntityManager<PullRequest> {
-
- @Nullable
+
+ @Nullable
PullRequest findEffective(ProjectAndBranch target, ProjectAndBranch source);
-
+
Map<ProjectAndBranch, PullRequest> findEffectives(ProjectAndBranch target, Collection<ProjectAndBranch> sources);
-
- @Nullable
+
+ @Nullable
PullRequest findOpen(ProjectAndBranch target, ProjectAndBranch source);
-
+
Collection<PullRequest> queryOpenTo(ProjectAndBranch target);
Collection<PullRequest> queryOpen(ProjectAndBranch sourceOrTarget);
-
+
@Nullable
PullRequest find(Project targetProject, long number);
@Nullable
PullRequest find(String uuid);
-
+
void discard(PullRequest request, @Nullable String note);
-
+
void reopen(PullRequest request, @Nullable String note);
void checkAsync(PullRequest request, boolean sourceUpdated, boolean updateBuildCommit);
-
+
void merge(User user, PullRequest request, @Nullable String commitMessage);
-
+
void open(PullRequest request);
-
+
+ Map<ObjectId, AheadBehind> getAheadBehind(PullRequest request);
+
+ void synchronize(PullRequest request);
+
@Override
void delete(PullRequest request);
-
+
void deleteSourceBranch(PullRequest request, @Nullable String note);
-
+
void restoreSourceBranch(PullRequest request, @Nullable String note);
-
+
void checkReviews(PullRequest request, boolean sourceUpdated);
-
+
void checkAutoMerge(PullRequest request);
-
- List<PullRequest> query(@Nullable Project targetProject, EntityQuery<PullRequest> requestQuery,
+
+ List<PullRequest> query(@Nullable Project targetProject, EntityQuery<PullRequest> requestQuery,
boolean loadLabelsAndReviewsAndBuilds, int firstResult, int maxResults);
-
+
int count(@Nullable Project targetProject, @Nullable Criteria<PullRequest> requestCriteria);
-
+
List<PullRequest> query(Project targetProject, String fuzzyQuery, int count);
void delete(Collection<PullRequest> requests, Project project);
-
+
List<ProjectPullRequestStatusStat> queryStatusStats(Collection<Project> projects);
Map<Integer, Integer> queryDurationStats(Project project,
@@ -77,7 +82,7 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
@Nullable
Criteria<PullRequest> criteria,
StatsGroup group);
-
+
ObjectId getComparisonBase(PullRequest request, ObjectId oldCommitId, ObjectId newCommitId);
-
+
}
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 e244231376..7d048167f3 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,6 +18,7 @@ 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;
@@ -255,6 +256,41 @@ 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 synchronize(PullRequest request) {
+ MergePreview mergePreview = checkNotNull(request.checkMergePreview());
+ User user = SecurityUtils.getUser();
+ PersonIdent person = user.asPerson();
+ ObjectId targetHead = request.getLatestUpdate().getHeadCommit();
+ ObjectId requestHead = request.getTarget().getObjectId();
+ String commitMessage = "Merge branch '" + request.getTargetBranch() + "' into '" + request.getSourceBranch() + "'";
+ ObjectId mergeCommitId = gitService.merge(request.getTargetProject(), targetHead, requestHead,
+ false, person, person, commitMessage, false);
+ mergeCommitId = getGitService().amendCommit(request.getTargetProject(), mergeCommitId,
+ person, person, commitMessage);
+ gitService.updateRef(request.getTargetProject(), 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
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 b7d7176b44..8cb9b61578 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,6 +49,9 @@
<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 class="ahead-behind text-success">
+ <wicket:svg href="tick-circle" class="icon"></wicket:svg><span wicket:id="aheadBehind"></span>
+ </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...
</div>
@@ -56,16 +59,16 @@
<wicket:svg href="tick-circle" class="icon"></wicket:svg> Able to merge without conflicts
</div>
<div wicket:id="hasMergeConflict" class="has-merge-conflict text-warning">
- <wicket:svg href="exclamation-circle" class="icon"></wicket:svg> There are merge conflicts.
+ <wicket:svg href="exclamation-circle" class="icon"></wicket:svg> There are merge conflicts.
<wicket:enclosure child="resolveInstructions">
Please follow <a wicket:id="resolveInstructions" class="link-primary" href="javascript:void(0);">this instruction</a> to resolve the conflicts
</wicket:enclosure>
</div>
<div wicket:id="noValidCommitSignature" class="no-valid-commit-signature text-warning">
- <wicket:svg href="times-circle" class="icon"></wicket:svg> Pull request can not be merged now as valid signature is required for head commit
+ <wicket:svg href="times-circle" class="icon"></wicket:svg> Pull request can not be merged now as valid signature is required for head commit
</div>
<div wicket:id="requestedForChanges" class="requested-for-changes text-warning">
- <wicket:svg href="diff" class="icon"></wicket:svg> Pull request can not be merged now as it was <a class="more-info d-inline link-primary">requested for changes</a>
+ <wicket:svg href="diff" class="icon"></wicket:svg> Pull request can not be merged now as it was <a class="more-info d-inline link-primary">requested for changes</a>
</div>
<div wicket:id="waitingForReviews" class="waiting-for-reviews text-warning">
<wicket:svg href="clock" class="icon"></wicket:svg> Pull request can not be merged now as it is <a class="more-info d-inline link-primary">pending review</a>
@@ -83,8 +86,8 @@
</wicket:enclosure>
<wicket:enclosure child="requiredJobs">
<div class="required-jobs text-warning">
- <wicket:svg href="warning" class="icon"></wicket:svg>
- <span wicket:id="requiredJobsMessage"></span>
+ <wicket:svg href="warning" class="icon"></wicket:svg>
+ <span wicket:id="requiredJobsMessage"></span>
<span wicket:id="requiredJobs" class="d-inline-block mr-2">
<span wicket:id="jobName"></span>
<a wicket:id="runJob" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>
@@ -100,6 +103,7 @@
</div>
</div>
<div wicket:id="requestOperations" class="operations">
+ <a wicket:id="updateSourceBranch" class="btn btn-sm btn-light-danger">Update Source Branch</a>
<a wicket:id="merge" class="btn btn-sm btn-light-success btn-hover-success">Merge</a>
<a wicket:id="discard" class="btn btn-sm btn-light-info btn-hover-info">Discard</a>
<a wicket:id="approve" class="btn btn-sm btn-light-success btn-hover-success">Approve</a>
@@ -147,11 +151,11 @@
<wicket:enclosure child="jobs">
<div class="jobs">
<div class="head">
- Jobs
+ Jobs
<span wicket:id="hiddenJobsNote" class="warning ml-2" title="Some jobs are hidden due to permission policy">
<wicket:svg href="exclamation-circle-o" class="icon"/>
</span>
- </div>
+ </div>
<div wicket:id="jobs" class="body"></div>
<div wicket:id="jobsHelp" class="font-size-sm text-muted form-text">Jobs marked with <span class="text-danger">*</span> are required to be successful</div>
</div>
@@ -166,7 +170,7 @@
<div wicket:id="mergeStrategy" class="merge-strategy">
<div class="head">Merge Strategy</div>
<div class="body">
- <select wicket:id="editor" class="form-control custom-select"></select>
+ <select wicket:id="editor" class="form-control custom-select"></select>
<span wicket:id="viewer"></span>
<div wicket:id="help" class="font-size-sm text-muted form-text"></div>
</div>
@@ -210,7 +214,7 @@
</wicket:fragment>
<wicket:fragment wicket:id="projectTitleFrag">
<span class="d-flex align-items-center">
- <a wicket:id="pullRequests" class="text-nowrap">Pull Requests</a>
+ <a wicket:id="pullRequests" class="text-nowrap">Pull Requests</a>
<span class="dot"></span>
<span wicket:id="pullRequestNumber"></span>
</span>
@@ -218,13 +222,13 @@
<wicket:fragment wicket:id="cloneFrag">
<div class="p-4">
<div class="font-weight-bolder font-size-lg mb-2">Checkout Pull Request Head</div>
- <div class="code font-size-sm">
+ <div class="code font-size-sm">
<div>git fetch origin <span wicket:id="headRef"></span></div>
<div>git checkout FETCH_HEAD</div>
</div>
<wicket:enclosure child="mergeRef">
<div class="font-weight-bolder font-size-lg mt-4 mb-2">Checkout Pull Request Merge Preview</div>
- <div class="code font-size-sm">
+ <div class="code font-size-sm">
<div>git fetch origin <span wicket:id="mergeRef"></span></div>
<div>git checkout FETCH_HEAD</div>
</div>
@@ -232,10 +236,10 @@
</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
+ 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
</wicket:fragment>
<wicket:fragment wicket:id="autoMergeDisabledFrag">
- Enable this option to merge the pull request automatically when ready (all reviewers approved, all required jobs passed etc.)
+ Enable this option to merge the pull request automatically when ready (all reviewers approved, all required jobs passed etc.)
</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.java
index bb67b668b1..65a21d4178 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,11 +1,13 @@
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.RefFacade;
import io.onedev.server.model.*;
import io.onedev.server.model.PullRequestReview.Status;
@@ -105,6 +107,7 @@ 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;
@@ -522,8 +525,26 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
&& preview.getMergeCommitHash() != null);
}
- });
-
+ });
+ summaryContainer.add(new Label("aheadBehind", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ Map<ObjectId, AheadBehind> abs = getPullRequestManager().getAheadBehind(getPullRequest());
+ RevCommit lastCommit = getPullRequest().getLatestUpdate().getHeadCommit();
+ AheadBehind ab = Preconditions.checkNotNull(abs.get(lastCommit));
+ return "Source branch is " + ab.getAhead() + " commit(s) ahead of target branch, " + ab.getBehind() + " commit(s) behind of target branch";
+ }
+
+ }) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!getPullRequest().isMerged());
+ }
+
+ });
summaryContainer.add(new WebMarkupContainer("noValidCommitSignature") {
@Override
@@ -1583,6 +1604,31 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
operationsContainer.setOutputMarkupPlaceholderTag(true);
operationsContainer.setVisible(SecurityUtils.getAuthUser() != null);
+
+ operationsContainer.add(new AjaxLink<Void>("updateSourceBranch") {
+
+ private boolean canOperate() {
+ PullRequest request = getPullRequest();
+ return SecurityUtils.canWriteCode(request.getProject()) && request.checkMerge() == null;
+ }
+
+ @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);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (canOperate()) {
+ getPullRequestManager().synchronize(getPullRequest());
+ notifyPullRequestChange(target);
+ }
+ }
+ });
operationsContainer.add(new ModalLink("approve") {