The Unified and Autonomous Development Platform
feat: Add commit operation like gitea include cherry-pick and revert.
sususweetc8775ec6c1bc
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.javaindex 494b02cbb8..166f805eed 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@@ -254,6 +254,96 @@ public class DefaultGitService implements GitService, Serializable {return tagAndCommitId;}+ @Sessional+ @Override+ public RevertResult revert(Project project, String branchName, String revertRevision, String commitMessage, PersonIdent author) {+ Long projectId = project.getId();++ RevertResult revertResult = runOnProjectServer(projectId, () -> {+ Repository repository = getRepository(projectId);+ ObjectId revId = project.getObjectId(revertRevision, 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);+ Set<String> oldPaths = new HashSet<>();+ Map<String, BlobContent> newBlobs = new HashMap<>();++ for (DiffEntry diff : diffs) {+ 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());+ oldPaths.add(diff.getNewPath());+ newBlobs.put(diff.getOldPath(), 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());++ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ });++ project.cacheObjectId(revertRevision, revertResult.getRevertedCommitId());+ listenerRegistry.post(new RefUpdated(project,+ "refs/heads/" + branchName, ObjectId.zeroId(), revertResult.getRevertedCommitId()));++ return revertResult;+ }++ @Sessional+ @Override+ public RevertResult cherryPick(Project project, String branchName, String revertRevision, String commitMessage, PersonIdent author) {+ Long projectId = project.getId();++ RevertResult revertResult = runOnProjectServer(projectId, () -> {+ Repository repository = getRepository(projectId);+ ObjectId revId = project.getObjectId(revertRevision, 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);+ 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());+ if (diff.getChangeType() == DiffEntry.ChangeType.DELETE) {+ oldPaths.add(diff.getNewPath());+ newBlobs.put(diff.getNewPath(), null);+ } else if (diff.getChangeType() == DiffEntry.ChangeType.ADD+ || diff.getChangeType() == DiffEntry.ChangeType.MODIFY) {+ oldPaths.add(diff.getNewPath());+ 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());++ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ });++ project.cacheObjectId(revertRevision, revertResult.getRevertedCommitId());+ listenerRegistry.post(new RefUpdated(project,+ "refs/heads/" + branchName, ObjectId.zeroId(), revertResult.getRevertedCommitId()));++ return revertResult;+ }+@Overridepublic int countRefs(Long projectId, String prefix) {return runOnProjectServer(projectId, () -> getRepository(projectId).getRefDatabase().getRefsByPrefix(prefix).size());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.javaindex 340a096db2..b3caccd9f3 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@@ -41,7 +41,11 @@ public interface GitService {TaggingResult createTag(Project project, String tagName, String tagRevision,PersonIdent taggerIdent, @Nullable String tagMessage, boolean signRequired);-++ RevertResult revert(Project project, String branchName, String revertRevision, String commitMessage, PersonIdent author);++ RevertResult cherryPick(Project project, String branchName, String revertRevision, String commitMessage, PersonIdent author);+int countRefs(Long projectId, String prefix);@Nullablediff --git a/server-core/src/main/java/io/onedev/server/git/service/RevertResult.java b/server-core/src/main/java/io/onedev/server/git/service/RevertResult.javanew file mode 100644index 0000000000..15b8f4f825--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/git/service/RevertResult.java@@ -0,0 +1,21 @@+package io.onedev.server.git.service;++import org.eclipse.jgit.lib.ObjectId;++public class RevertResult {+ private ObjectId revertedCommitId;+ private ObjectId originalCommitId;++ public RevertResult(ObjectId revertedCommitId, ObjectId originalCommit) {+ this.revertedCommitId = revertedCommitId;+ this.originalCommitId = originalCommit;+ }++ public ObjectId getRevertedCommitId() {+ return revertedCommitId;+ }++ public ObjectId getOriginalCommitId() {+ return originalCommitId;+ }+}\ No newline at end of filediff --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/CommitRevertLink.javanew file mode 100644index 0000000000..a8f6d16405--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertLink.java@@ -0,0 +1,60 @@+package io.onedev.server.web.component.commit.revert;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.model.IModel;+import org.eclipse.jgit.lib.Constants;++import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;++@SuppressWarnings("serial")+public abstract class CommitRevertLink extends ModalLink {++ private final IModel<Project> projectModel;++ private final String revision;++ private final Integer type;++ public CommitRevertLink(String id, IModel<Project> projectModel, String revision, Integer type) {+ super(id);+ this.projectModel = projectModel;+ this.revision = revision;+ this.type = type;+ }++ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canCreateBranch(projectModel.getObject(), Constants.R_HEADS));+ }++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new CommitRevertPanel(id, projectModel, revision, type) {++ @Override+ protected void onCreate(AjaxRequestTarget target, String branch) {+ modal.close();+ CommitRevertLink.this.onCreated(target, branch);+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ };+ }++ @Override+ protected void onDetach() {+ projectModel.detach();++ super.onDetach();+ }++ protected abstract void onCreated(AjaxRequestTarget target, String branch);+}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/CommitRevertPanel.htmlnew file mode 100644index 0000000000..068685f264--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertPanel.html@@ -0,0 +1,17 @@+<wicket:panel>+ <form wicket:id="form" class="create-branch">+ <div class="modal-header">+ <h5 class="modal-title">Revert Commit</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>+ <div class="modal-footer">+ <button wicket:id="create" class="btn btn-primary">Create</button>+ <button wicket:id="cancel" class="btn btn-secondary">Cancel</button>+ </div>+ </form>+</wicket:panel>\ No newline at end of filediff --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/CommitRevertPanel.javanew file mode 100644index 0000000000..7c6dd43333--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/revert/CommitRevertPanel.java@@ -0,0 +1,180 @@+package io.onedev.server.web.component.commit.revert;++import io.onedev.commons.utils.ExceptionUtils;+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.page.project.pullrequests.detail.CommitMessageBean;+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.form.Form;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.IModel;++import io.onedev.server.OneDev;+import io.onedev.server.git.service.GitService;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+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 java.util.LinkedHashMap;+import java.util.Map;++@SuppressWarnings("serial")+abstract class CommitRevertPanel extends Panel {++ private final IModel<Project> projectModel;++ private final String revision;++ private final Integer type;++ private CommitMessageBean helperBean = new CommitMessageBean();++ private BranchSingleChoice baseChoice;++ private String baseBranch;++ public CommitRevertPanel(String id, IModel<Project> projectModel, String revision, Integer type) {+ super(id);+ this.projectModel = projectModel;+ this.revision = revision;+ this.type = type;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ 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));++ BeanEditor editor;+ form.add(editor = BeanContext.edit("editor", helperBean));++ form.add(baseChoice = new BranchSingleChoice("baseBranch", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return baseBranch;+ }++ @Override+ public void setObject(String object) {+ baseBranch = object;+ }++ }, new LoadableDetachableModel<>() {++ @Override+ protected Map<String, String> load() {+ Map<String, String> branches = new LinkedHashMap<>();+ for (RefFacade ref : projectModel.getObject().getBranchRefs()) {+ String branch = GitUtils.ref2branch(ref.getName());+ branches.put(branch, branch);+ }+ return branches;+ }++ }, false) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().setAllowClear(false);+ }++ });++ form.add(new AjaxButton("create") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ Project project = projectModel.getObject();+ String branch = baseChoice.getModel().getObject();+ User user = SecurityUtils.getAuthUser();+ String commitMessage = helperBean.getCommitMessage();+ if (!project.isCommitSignatureRequirementSatisfied(user, branch, project.getRevCommit(revision, true))) {+ getSession().error("Valid signature required for head commit of this branch per branch protection rule");+ } else {+ try {+ if (type == 0) {+ OneDev.getInstance(GitService.class).revert(project, branch, revision, commitMessage, user.asPerson());+ onCreate(target, branch);+ getSession().success("Revert successfully");+ } else if (type == 1) {+ OneDev.getInstance(GitService.class).cherryPick(project, branch, revision, commitMessage, user.asPerson());+ onCreate(target, branch);+ getSession().success("Cherry Pick successfully");+ }+ } catch (Exception e) {+ ExplicitException explicitException = ExceptionUtils.find(e, ExplicitException.class);+ if (explicitException != null) {+ getSession().error(explicitException.getMessage());+ } else {+ throw ExceptionUtils.unchecked(e);+ }+ }+ }+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });++ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });++ add(form);+ }++ protected abstract void onCreate(AjaxRequestTarget target, String branch);++ protected abstract void onCancel(AjaxRequestTarget target);++ @Override+ protected void onDetach() {+ projectModel.detach();++ super.onDetach();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.htmlindex d81308d534..7c156404f4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html@@ -6,9 +6,14 @@<div class="subject d-flex flex-wrap align-items-center"><h4 wicket:id="title" class="mr-3 mb-0"></h4><div class="ml-auto">- <a wicket:id="browseCode" title="browse code" class="btn btn-light btn-hover-primary btn-xs btn-icon"><wicket:svg href="files" class="icon"></wicket:svg></a>- <a wicket:id="createBranch" title="Branch from this commit" class="btn btn-light btn-hover-primary btn-xs btn-icon ml-1"><wicket:svg href="branch" class="icon"></wicket:svg></a>- <a wicket:id="createTag" title="Tag this commit" class="btn btn-light btn-hover-primary btn-xs btn-icon ml-1"><wicket:svg href="tag" class="icon"></wicket:svg></a>+ <a wicket:id="browseCode" title="Browse code" class="btn btn-light btn-hover-primary btn-xs btn-icon"><wicket:svg href="files" class="icon"></wicket:svg></a>+ <a wicket:id="commitOperations" type="button" class="btn btn-sm btn-light-primary btn-hover-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Operations</a>+ <div class="dropdown-menu">+ <a wicket:id="createBranch" title="Branch from this commit" class="dropdown-item">Create Branch</a>+ <a wicket:id="createTag" title="Tag this commit" class="dropdown-item">Create Tag</a>+ <a wicket:id="revert" title="Revert" class="dropdown-item">Revert</a>+ <a wicket:id="cherryPick" title="Cherry Pick" class="dropdown-item">Cherry Pick</a>+ </div></div></div><pre wicket:id="detail" class="detail mb-0 mt-3"></pre>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.javaindex 7731943be2..f8b592b130 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,6 +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.contributorpanel.ContributorPanel;import io.onedev.server.web.component.createtag.CreateTagLink;import io.onedev.server.web.component.diff.revision.RevisionAnnotationSupport;@@ -55,6 +56,7 @@ 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.Button;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;@@ -199,7 +201,20 @@ public class CommitDetailPage extends ProjectPage implements RevisionAnnotationS}});-++ add(new Button("commitOperations") {++ private boolean canOperate() {+ return SecurityUtils.canWriteCode(projectModel.getObject());+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(canOperate());+ }+ });+add(new CreateTagLink("createTag", projectModel, state.revision) {@Override@@ -208,7 +223,25 @@ public class CommitDetailPage extends ProjectPage implements RevisionAnnotationS}});-++ add(new CommitRevertLink("revert", projectModel, state.revision, 0) {++ @Override+ protected void onCreated(AjaxRequestTarget target, String tag) {+ target.add(refsContainer);+ }++ });++ add(new CommitRevertLink("cherryPick", projectModel, state.revision, 1) {++ @Override+ protected void onCreated(AjaxRequestTarget target, String tag) {+ target.add(refsContainer);+ }++ });+String message = GitUtils.getDetailMessage(getCommit());if (message != null) {transformed = transformReferences(