Skip to content

The Unified and Autonomous Development Platform

Remove DO_NOT_MERGE option when creating new pull request. Add submitter as default review if no other reviewers

Robin Shen3a01dc9219fb
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 c7274c57e6..eac396442a 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
@@ -470,7 +470,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
@Sessional
@Override
public MergePreview previewMerge(PullRequest request) {
- if (!request.isNew() && request.getMergeStrategy() != MergeStrategy.DO_NOT_MERGE) {
+ if (!request.isNew()) {
MergePreview lastPreview = request.getLastMergePreview();
if (request.isOpen() && !request.isMergeIntoTarget()) {
if (lastPreview == null || !lastPreview.isUpToDate(request)) {
@@ -782,18 +782,16 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
PullRequest request = update.getRequest();
for (User user: reviewRequirement.getUsers()) {
- if (!user.equals(request.getSubmitter())) {
- PullRequestReview review = request.getReview(user);
- if (review == null) {
- review = new PullRequestReview();
- review.setRequest(request);
- review.setUser(user);
- request.getReviews().add(review);
- } else if (review.getExcludeDate() != null) {
- review.setExcludeDate(null);
- } else if (review.getUpdate() == null || review.getUpdate().getId()<update.getId()) {
- review.setResult(null);
- }
+ PullRequestReview review = request.getReview(user);
+ if (review == null) {
+ review = new PullRequestReview();
+ review.setRequest(request);
+ review.setUser(user);
+ request.getReviews().add(review);
+ } else if (review.getExcludeDate() != null) {
+ review.setExcludeDate(null);
+ } else if (review.getUpdate() == null || review.getUpdate().getId()<update.getId()) {
+ review.setResult(null);
}
}
@@ -813,21 +811,17 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
int effectiveCount = 0;
Set<User> potentialReviewers = new HashSet<>();
for (User user: users) {
- if (user.equals(request.getSubmitter())) {
- effectiveCount++;
- } else {
- PullRequestReview review = request.getReview(user);
- if (review != null && review.getExcludeDate() == null) {
- if (review.getResult() == null)
- requiredCount--;
- else if (review.getUpdate() != null && review.getUpdate().getId()>=update.getId())
- effectiveCount++;
- else
- potentialReviewers.add(user);
- } else {
+ PullRequestReview review = request.getReview(user);
+ if (review != null && review.getExcludeDate() == null) {
+ if (review.getResult() == null)
+ requiredCount--;
+ else if (review.getUpdate() != null && review.getUpdate().getId()>=update.getId())
+ effectiveCount++;
+ else
potentialReviewers.add(user);
- }
- }
+ } else {
+ potentialReviewers.add(user);
+ }
if (effectiveCount >= requiredCount)
break;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java
index 70fceb91f7..7be2680db4 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java
@@ -66,14 +66,6 @@ public enum MergeStrategy {
return GitUtils.rebase(repository, requestHead, targetHead, user);
}
- },
- DO_NOT_MERGE("Do not merge now, only for review") {
-
- @Override
- public ObjectId merge(PullRequest request) {
- throw new UnsupportedOperationException();
- }
-
};
private final String description;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java
index b9a5580f32..2a538e62e0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java
@@ -37,7 +37,6 @@ public class ReviewerProvider extends AbstractUserChoiceProvider {
if (review.getExcludeDate() == null && review.getResult() == null)
users.remove(review.getUser().getFacade());
}
- users.remove(SecurityUtils.getUser().getFacade());
List<UserFacade> reviewers = new ArrayList<>(users);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
index 9c6039fe96..f3e20b381a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
@@ -79,7 +79,6 @@
<select wicket:id="select" class="form-control"></select>
<div wicket:id="help" class="help-block"></div>
<div wicket:id="status" class="status"></div>
- <div wicket:id="mergeWithoutReviewNote" class="alert alert-warning merge-without-review"></div>
</td>
</tr>
<tr class="reviewers">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index a3a47ebed3..4041111f9c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -195,11 +195,14 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
update.setMergeBaseCommitHash(request.getBaseCommitHash());
OneDev.getInstance(PullRequestManager.class).checkQuality(request);
-
- if (request.isAllReviewsApproved())
- request.setMergeStrategy(MergeStrategy.DO_NOT_MERGE);
- else
- request.setMergeStrategy(MergeStrategy.CREATE_MERGE_COMMIT);
+
+ if (SecurityUtils.canWriteCode(getProject().getFacade()) && request.getReviews().isEmpty()) {
+ PullRequestReview review = new PullRequestReview();
+ review.setRequest(request);
+ review.setUser(SecurityUtils.getUser());
+ request.getReviews().add(review);
+ }
+ request.setMergeStrategy(MergeStrategy.CREATE_MERGE_COMMIT);
}
requestModel = new LoadableDetachableModel<PullRequest>() {
@@ -678,12 +681,6 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
attributes.getAjaxCallListeners().add(new DisableGlobalLoadingIndicatorListener());
}
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getPullRequest().getMergeStrategy() != MergeStrategy.DO_NOT_MERGE);
- }
-
@Override
public Component getLazyLoadComponent(String componentId) {
PullRequest request = getPullRequest();
@@ -718,18 +715,6 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
});
- container.add(new Label("mergeWithoutReviewNote", "This pull request will be merged into target branch automatically "
- + "as it is submitted by qualified user. Use strategy \"Do Not Merge\" if you want to review without "
- + "merging now") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getPullRequest().isAllReviewsApproved() && getPullRequest().getMergeStrategy() != MergeStrategy.DO_NOT_MERGE);
- }
-
- });
-
container.setOutputMarkupId(true);
return container;
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 1e6eee654b..6a1d730bd8 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
@@ -62,9 +62,6 @@
</wicket:enclosure>
</div>
</div>
- <div wicket:id="doNotMerge" class="do-not-merge alert alert-warning">
- <i class="fa fa-info-circle"></i> This pull request is for review only and does not need to be merged
- </div>
<div wicket:id="operations" class="operations">
<div class="buttons">
<a wicket:id="approve" class="btn btn-primary">Approve</a>
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 09b37c9992..b3a0314bc0 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
@@ -7,8 +7,8 @@ import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SO
import static io.onedev.server.search.entity.EntityQuery.quote;
import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;
import static io.onedev.server.search.entity.build.BuildQueryLexer.And;
-import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;
import static io.onedev.server.search.entity.build.BuildQueryLexer.AssociatedWithPullRequest;
+import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;
import static io.onedev.server.util.BuildConstants.FIELD_JOB;
import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.APPROVE;
import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.DELETE_SOURCE_BRANCH;
@@ -363,15 +363,6 @@ public abstract class PullRequestDetailPage extends ProjectPage {
summaryContainer.add(newMergedNoteContainer());
summaryContainer.add(newMergeStatusContainer());
- summaryContainer.add(new WebMarkupContainer("doNotMerge") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getPullRequest().isOpen() && getPullRequest().getMergeStrategy() == MergeStrategy.DO_NOT_MERGE);
- }
-
- }.setOutputMarkupPlaceholderTag(true));
summaryContainer.add(newOperationsContainer());
@@ -841,7 +832,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {
super.onConfigure();
PullRequest request = getPullRequest();
- setVisible(request.isOpen() && request.getMergeStrategy() != MergeStrategy.DO_NOT_MERGE);
+ setVisible(request.isOpen());
}
};