Skip to content

The Unified and Autonomous Development Platform

fix: Cherry pick error when source and target branch are different.

sususweetb95de09cedd1
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 166f805eed..6d08178544 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
@@ -271,13 +271,15 @@ public class DefaultGitService implements GitService, Serializable {
Map<String, BlobContent> newBlobs = new HashMap<>();
for (DiffEntry diff : diffs) {
+ BlobContent blobContent = new BlobContent(revWalk.getObjectReader()
+ .open(diff.getOldId().toObjectId()).getBytes(), FileMode.REGULAR_FILE.getBits());
+
if (diff.getChangeType() == DiffEntry.ChangeType.ADD) {
oldPaths.add(diff.getNewPath());
newBlobs.put(diff.getOldPath(), null);
- } else if (diff.getChangeType() == DiffEntry.ChangeType.DELETE
- || diff.getChangeType() == DiffEntry.ChangeType.MODIFY) {
- BlobContent blobContent = new BlobContent(revWalk.getObjectReader()
- .open(diff.getOldId().toObjectId()).getBytes(), FileMode.REGULAR_FILE.getBits());
+ } else if (diff.getChangeType() == DiffEntry.ChangeType.DELETE) {
+ newBlobs.put(diff.getOldPath(), blobContent);
+ } else if (diff.getChangeType() == DiffEntry.ChangeType.MODIFY) {
oldPaths.add(diff.getNewPath());
newBlobs.put(diff.getOldPath(), blobContent);
}
@@ -301,43 +303,45 @@ public class DefaultGitService implements GitService, Serializable {
@Sessional
@Override
- public RevertResult cherryPick(Project project, String branchName, String revertRevision, String commitMessage, PersonIdent author) {
+ public RevertResult cherryPick(Project project, String branchName, String cherryPickRevision, String commitMessage, PersonIdent author) {
Long projectId = project.getId();
RevertResult revertResult = runOnProjectServer(projectId, () -> {
Repository repository = getRepository(projectId);
- ObjectId revId = project.getObjectId(revertRevision, true);
+ ObjectId revId = project.getObjectId(cherryPickRevision, true);
try (RevWalk revWalk = new RevWalk(repository)) {
- RevCommit commitToRevert = revWalk.parseCommit(revId);
- RevCommit parentCommit = revWalk.parseCommit(commitToRevert.getParent(0).getId());
- List<DiffEntry> diffs = GitUtils.diff(repository, parentCommit, commitToRevert);
+ RevCommit commitToCherryPick = revWalk.parseCommit(revId);
+ RevCommit parentCommit = revWalk.parseCommit(commitToCherryPick.getParent(0).getId());
+ List<DiffEntry> diffs = GitUtils.diff(repository, parentCommit, commitToCherryPick);
Set<String> oldPaths = new HashSet<>();
Map<String, BlobContent> newBlobs = new HashMap<>();
for (DiffEntry diff : diffs) {
BlobContent blobContent = new BlobContent(revWalk.getObjectReader()
- .open(diff.getOldId().toObjectId()).getBytes(), FileMode.REGULAR_FILE.getBits());
+ .open(diff.getNewId().toObjectId()).getBytes(), FileMode.REGULAR_FILE.getBits());
if (diff.getChangeType() == DiffEntry.ChangeType.DELETE) {
- oldPaths.add(diff.getNewPath());
+ oldPaths.add(diff.getOldPath());
newBlobs.put(diff.getNewPath(), null);
- } else if (diff.getChangeType() == DiffEntry.ChangeType.ADD
- || diff.getChangeType() == DiffEntry.ChangeType.MODIFY) {
- oldPaths.add(diff.getNewPath());
+ } else if (diff.getChangeType() == DiffEntry.ChangeType.ADD) {
+ newBlobs.put(diff.getNewPath(), blobContent);
+ } else if (diff.getChangeType() == DiffEntry.ChangeType.MODIFY) {
+ oldPaths.add(diff.getOldPath());
newBlobs.put(diff.getNewPath(), blobContent);
}
}
BlobEdits blobEdits = new BlobEdits(oldPaths, newBlobs);
- ObjectId newCommitId = this.commit(project, blobEdits, "refs/heads/" + branchName,
- commitToRevert, commitToRevert, author, commitMessage, false);
- return new RevertResult(newCommitId, commitToRevert.copy());
+ RevCommit commitToAppend = (RevCommit) project.getBranchRef("refs/heads/" + branchName).getObj();
+ ObjectId newCommitId = this.commit(project, blobEdits, "refs/heads/" + branchName,
+ commitToAppend, commitToAppend, author, commitMessage, false);
+ return new RevertResult(newCommitId, commitToAppend.copy());
} catch (IOException e) {
throw new RuntimeException(e);
}
});
- project.cacheObjectId(revertRevision, revertResult.getRevertedCommitId());
+ project.cacheObjectId(cherryPickRevision, revertResult.getRevertedCommitId());
listenerRegistry.post(new RefUpdated(project,
"refs/heads/" + branchName, ObjectId.zeroId(), revertResult.getRevertedCommitId()));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertLink.java b/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertCherryPickLink.java
similarity index 79%
rename from server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertLink.java
rename to server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertCherryPickLink.java
index a8f6d16405..f70a9ffc3f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertCherryPickLink.java
@@ -11,7 +11,7 @@ import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
@SuppressWarnings("serial")
-public abstract class CommitRevertLink extends ModalLink {
+public abstract class CommitRevertCherryPickLink extends ModalLink {
private final IModel<Project> projectModel;
@@ -19,7 +19,7 @@ public abstract class CommitRevertLink extends ModalLink {
private final Integer type;
- public CommitRevertLink(String id, IModel<Project> projectModel, String revision, Integer type) {
+ public CommitRevertCherryPickLink(String id, IModel<Project> projectModel, String revision, Integer type) {
super(id);
this.projectModel = projectModel;
this.revision = revision;
@@ -33,12 +33,12 @@ public abstract class CommitRevertLink extends ModalLink {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new CommitRevertPanel(id, projectModel, revision, type) {
+ return new CommitRevertCherryPickPanel(id, projectModel, revision, type) {
@Override
protected void onCreate(AjaxRequestTarget target, String branch) {
modal.close();
- CommitRevertLink.this.onCreated(target, branch);
+ CommitRevertCherryPickLink.this.onCreated(target, branch);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertCherryPickPanel.html
similarity index 82%
rename from server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertPanel.html
rename to server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertCherryPickPanel.html
index 068685f264..fc3b0071ef 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertCherryPickPanel.html
@@ -1,13 +1,13 @@
<wicket:panel>
<form wicket:id="form" class="create-branch">
<div class="modal-header">
- <h5 class="modal-title">Revert Commit</h5>
+ <h5 wicket:id="title" class="modal-title"></h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
<div class="title">Target Branch: <input wicket:id="baseBranch" type="hidden" class="form-control"></div>
<div wicket:id="feedback"></div>
- <div wicket:id="editor"></div>
+ <div wicket:id="editor" style="margin-top: 10px"></div>
</div>
<div class="modal-footer">
<button wicket:id="create" class="btn btn-primary">Create</button>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertCherryPickPanel.java
similarity index 90%
rename from server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertPanel.java
rename to server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertCherryPickPanel.java
index 7c6dd43333..34a02b2ab4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertCherryPickPanel.java
@@ -5,13 +5,17 @@ import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.service.RefFacade;
import io.onedev.server.web.component.branch.choice.BranchSingleChoice;
+import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.project.pullrequests.detail.CommitMessageBean;
+import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import io.onedev.server.OneDev;
@@ -22,12 +26,13 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.cycle.RequestCycle;
import java.util.LinkedHashMap;
import java.util.Map;
@SuppressWarnings("serial")
-abstract class CommitRevertPanel extends Panel {
+abstract class CommitRevertCherryPickPanel extends Panel {
private final IModel<Project> projectModel;
@@ -41,7 +46,7 @@ abstract class CommitRevertPanel extends Panel {
private String baseBranch;
- public CommitRevertPanel(String id, IModel<Project> projectModel, String revision, Integer type) {
+ public CommitRevertCherryPickPanel(String id, IModel<Project> projectModel, String revision, Integer type) {
super(id);
this.projectModel = projectModel;
this.revision = revision;
@@ -51,18 +56,23 @@ abstract class CommitRevertPanel extends Panel {
@Override
protected void onInitialize() {
super.onInitialize();
- String oldCommitMessage = projectModel.getObject().getRevCommit(revision, true).getShortMessage();
+ String oldCommitMessage = projectModel.getObject().getRevCommit(revision, true).getShortMessage();
if (type == 0) {
helperBean.setCommitMessage("Revert \"" + oldCommitMessage + "\"" + "\n\nThis reverts commit " + revision);
} else if (type == 1) {
helperBean.setCommitMessage("Cherry Pick \"" + oldCommitMessage + "\"" + "\n\nThis cherry-pick commit " + revision);
}
baseBranch = projectModel.getObject().getDefaultBranch();
+
Form<?> form = new Form<Void>("form");
form.setOutputMarkupId(true);
form.add(new FencedFeedbackPanel("feedback", form));
-
+ if (type == 0) {
+ form.add(new Label("title", "Revert Commit"));
+ } else if (type == 1) {
+ form.add(new Label("title", "Cherry-Pick Commit"));
+ }
BeanEditor editor;
form.add(editor = BeanContext.edit("editor", helperBean));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index f8b592b130..dc3f9c25d4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -30,7 +30,7 @@ import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.component.AjaxLazyLoadPanel;
import io.onedev.server.web.component.branch.create.CreateBranchLink;
-import io.onedev.server.web.component.commit.revert.CommitRevertLink;
+import io.onedev.server.web.component.commit.revert.CommitRevertCherryPickLink;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.createtag.CreateTagLink;
import io.onedev.server.web.component.diff.revision.RevisionAnnotationSupport;
@@ -44,7 +44,6 @@ import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
-import io.onedev.server.web.util.AnnotationSupport;
import io.onedev.server.xodus.CommitInfoManager;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
@@ -224,7 +223,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionAnnotationS
});
- add(new CommitRevertLink("revert", projectModel, state.revision, 0) {
+ add(new CommitRevertCherryPickLink("revert", projectModel, state.revision, 0) {
@Override
protected void onCreated(AjaxRequestTarget target, String tag) {
@@ -233,7 +232,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionAnnotationS
});
- add(new CommitRevertLink("cherryPick", projectModel, state.revision, 1) {
+ add(new CommitRevertCherryPickLink("cherryPick", projectModel, state.revision, 1) {
@Override
protected void onCreated(AjaxRequestTarget target, String tag) {