Skip to content

The Unified and Autonomous Development Platform

Fix issue #690 - Able to change target branch of existing pull request

Robin Shen52d56d02b20a
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.java
index b8a8ac6ea9..2729ae324c 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
@@ -13,6 +13,8 @@ public interface PullRequestChangeManager extends EntityManager<PullRequestChang
void changeTitle(PullRequest request, String title);
+ void changeTargetBranch(PullRequest request, String targetBranch);
+
void save(PullRequestChange change, @Nullable String note);
}
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.java
index 1669aac041..07f7419ee5 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
@@ -13,6 +13,7 @@ import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
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.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
@@ -79,6 +80,26 @@ public class DefaultPullRequestChangeManager extends BaseEntityManager<PullReque
change.setData(new PullRequestTitleChangeData(prevTitle, title));
change.setUser(SecurityUtils.getUser());
save(change);
+
+ dao.persist(request);
+ }
+ }
+
+ @Transactional
+ @Override
+ public void changeTargetBranch(PullRequest request, String targetBranch) {
+ String prevTargetBranch = request.getTargetBranch();
+ if (!targetBranch.equals(prevTargetBranch)) {
+ request.setTargetBranch(targetBranch);
+
+ PullRequestChange change = new PullRequestChange();
+ change.setDate(new Date());
+ change.setRequest(request);
+ change.setData(new PullRequestTargetBranchChangeData(prevTargetBranch, targetBranch));
+ change.setUser(SecurityUtils.getUser());
+ save(change);
+
+ dao.persist(request);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index b623f3a087..929fd25c69 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
@@ -114,6 +114,7 @@ import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewer
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerRemoveData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchDeleteData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchRestoreData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestTargetBranchChangeData;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
@@ -658,7 +659,8 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
public void on(PullRequestChanged event) {
PullRequestChangeData data = event.getChange().getData();
if (data instanceof PullRequestApproveData || data instanceof PullRequestDiscardData
- || data instanceof PullRequestMergeStrategyChangeData) {
+ || data instanceof PullRequestMergeStrategyChangeData
+ || data instanceof PullRequestTargetBranchChangeData) {
checkAsync(Lists.newArrayList(event.getRequest()));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java
index bdabda1be5..4a88492091 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java
@@ -29,7 +29,7 @@ public class PullRequestMergeStrategyChangeData extends PullRequestChangeData {
Map<String, String> oldProperties = new HashMap<>();
oldProperties.put("Merge Strategy", oldStrategy.name());
Map<String, String> newProperties = new HashMap<>();
- oldProperties.put("Merge Strategy", newStrategy.name());
+ newProperties.put("Merge Strategy", newStrategy.name());
return ActivityDetail.compare(oldProperties, newProperties, true);
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTargetBranchChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTargetBranchChangeData.java
new file mode 100644
index 0000000000..545b8dbafb
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTargetBranchChangeData.java
@@ -0,0 +1,36 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.onedev.server.notification.ActivityDetail;
+
+public class PullRequestTargetBranchChangeData extends PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String oldBranch;
+
+ private final String newBranch;
+
+ public PullRequestTargetBranchChangeData(String oldBranch, String newBranch) {
+ this.oldBranch = oldBranch;
+ this.newBranch = newBranch;
+ }
+
+ @Override
+ public String getActivity() {
+ return "changed target branch";
+ }
+
+ @Override
+ public ActivityDetail getActivityDetail() {
+ Map<String, String> oldProperties = new HashMap<>();
+ oldProperties.put("Target Branch", oldBranch);
+ Map<String, String> newProperties = new HashMap<>();
+ newProperties.put("Target Branch", newBranch);
+
+ return ActivityDetail.compare(oldProperties, newProperties, true);
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java
index a3d6d98f82..aa669e637f 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java
@@ -28,7 +28,7 @@ public class PullRequestTitleChangeData extends PullRequestChangeData {
Map<String, String> oldProperties = new HashMap<>();
oldProperties.put("Title", oldTitle);
Map<String, String> newProperties = new HashMap<>();
- oldProperties.put("Title", newTitle);
+ newProperties.put("Title", newTitle);
return ActivityDetail.compare(oldProperties, newProperties, true);
}
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 af0f38d3be..d5acebe4d1 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
@@ -115,7 +115,10 @@
</tr>
<tr>
<td class="name">Target</td>
- <td class="value text-right"><a wicket:id="targetBranch"></a></td>
+ <td class="value text-right">
+ <a wicket:id="changeTargetBranch" title="Change"><wicket:svg href="arrow" class="rotate-90 icon"/></a>
+ <a wicket:id="targetBranch"></a>
+ </td>
</tr>
<tr>
<td class="name">Source</td>
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 8c117844a8..7b71879796 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
@@ -22,6 +22,7 @@ import org.apache.wicket.Page;
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.OnChangeAjaxBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -61,6 +62,8 @@ import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
import io.onedev.server.entitymanager.PullRequestWatchManager;
import io.onedev.server.entityreference.Referenceable;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.RefInfo;
import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Build;
@@ -80,6 +83,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.web.WebSession;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
@@ -90,6 +94,8 @@ import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+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.project.gitprotocol.GitProtocolPanel;
@@ -691,11 +697,72 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected Component newBody(String componentId) {
- Fragment fragment = new Fragment(componentId, "moreInfoFrag", PullRequestDetailPage.this);
+ Fragment fragment = new Fragment(componentId, "moreInfoFrag", PullRequestDetailPage.this) {
+
+ @Override
+ protected void onBeforeRender() {
+ replace(new BranchLink("targetBranch", getPullRequest().getTarget()));
+ super.onBeforeRender();
+ }
+
+ };
fragment.add(new UserIdentPanel("submitter", getPullRequest().getSubmitter(), Mode.NAME));
-
fragment.add(new BranchLink("targetBranch", getPullRequest().getTarget()));
+
+ fragment.add(new MenuLink("changeTargetBranch") {
+
+ @Override
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+ Project project = getProject();
+ for (RefInfo ref: project.getBranchRefInfos()) {
+ String branch = GitUtils.ref2branch(ref.getRef().getName());
+ PullRequest request = getPullRequest();
+ if (!branch.equals(request.getTargetBranch()) &&
+ (!project.equals(request.getSourceProject()) || !branch.equals(request.getSourceBranch()))) {
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return branch;
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(
+ "Do you really want to change target branch to " + branch + "?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ OneDev.getInstance(PullRequestChangeManager.class).changeTargetBranch(getPullRequest(), branch);
+ }
+
+ };
+ }
+
+ });
+ }
+ }
+
+ return menuItems;
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getPullRequest().isOpen() && SecurityUtils.canModify(getPullRequest()));
+ }
+
+ });
+
if (getPullRequest().getSourceProject() != null) {
fragment.add(new BranchLink("sourceBranch", getPullRequest().getSource()));
} else {