The Unified and Autonomous Development Platform
feat: Optional non-date sort for commit list (OD-2675)
Robin Shen6dc3434f4e11
diff --git a/server-core/src/main/java/io/onedev/server/git/command/RevListCommand.java b/server-core/src/main/java/io/onedev/server/git/command/RevListCommand.javaindex 0b1c4b17fc..59fc89fae8 100644--- a/server-core/src/main/java/io/onedev/server/git/command/RevListCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/command/RevListCommand.java@@ -42,54 +42,7 @@ public class RevListCommand {Commandline git = newGit().workingDir(workingDir);git.addArgs("rev-list");- boolean hasRevisions = false;- if (!options.revisions().isEmpty()) {- for (String revision: options.revisions()) {- git.addArgs(revision);- if (!revision.startsWith("^"))- hasRevisions = true;- }- }- if (!hasRevisions)- git.addArgs("--branches");-- if (options.before() != null)- git.addArgs("--before", options.before());-- if (options.after() != null)- git.addArgs("--after", options.after());-- if (options.count() != 0)- git.addArgs("-" + options.count());- if (options.skip() != 0)- git.addArgs("--skip=" + options.skip());-- if (options.order() == Order.DATE)- git.addArgs("--date-order");- else if (options.order() == Order.AUTHOR_DATE)- git.addArgs("--author-date-order");- else if (options.order() == Order.TOPO)- git.addArgs("--topo-order");-- if (options.firstParent())- git.addArgs("--first-parent");-- for (String author: options.authors())- git.addArgs("--author=" + author);-- for (String committer: options.committers())- git.addArgs("--committer=" + committer);-- for (String message: options.messages())- git.addArgs("--grep=" + message);-- if (options.ignoreCase())- git.addArgs("-i");-- git.addArgs("--");-- for (String path: options.paths())- git.addArgs(path);+ options.configure(git);List<String> commitHashes = new ArrayList<>();git.execute(new LineConsumer() {diff --git a/server-core/src/main/java/io/onedev/server/git/command/RevListOptions.java b/server-core/src/main/java/io/onedev/server/git/command/RevListOptions.javaindex 08b54b594b..0692e775ef 100644--- a/server-core/src/main/java/io/onedev/server/git/command/RevListOptions.java+++ b/server-core/src/main/java/io/onedev/server/git/command/RevListOptions.java@@ -5,13 +5,11 @@ import java.util.ArrayList;import java.util.Date;import java.util.List;-import io.onedev.commons.utils.command.Commandline;import org.apache.commons.lang3.time.DateFormatUtils;+import io.onedev.commons.utils.command.Commandline;import io.onedev.server.git.command.RevListCommand.Order;-import org.jspecify.annotations.Nullable;-public class RevListOptions implements Serializable {private static final long serialVersionUID = 1L;@@ -28,7 +26,7 @@ public class RevListOptions implements Serializable {private int skip;- private Order order;+ private List<Order> orders = new ArrayList<>();private boolean firstParent;@@ -58,13 +56,12 @@ public class RevListOptions implements Serializable {return this;}- @Nullable- public Order order() {- return order;+ public List<Order> orders() {+ return orders;}- public RevListOptions order(@Nullable Order order) {- this.order = order;+ public RevListOptions orders(List<Order> orders) {+ this.orders = orders;return this;}@@ -182,12 +179,19 @@ public class RevListOptions implements Serializable {if (skip() != 0)git.addArgs("--skip=" + skip());- if (order() == Order.DATE)- git.addArgs("--date-order");- else if (order() == Order.AUTHOR_DATE)- git.addArgs("--author-date-order");- else if (order() == Order.TOPO)- git.addArgs("--topo-order");+ for (Order order: orders()) {+ switch (order) {+ case DATE:+ git.addArgs("--date-order");+ break;+ case AUTHOR_DATE:+ git.addArgs("--author-date-order");+ break;+ case TOPO:+ git.addArgs("--topo-order");+ break;+ }+ }if (firstParent())git.addArgs("--first-parent");diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4 b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4index 5ec96e289a..87ac5ca2d6 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4@@ -13,7 +13,8 @@ criteria| authorCriteria| pathCriteria| messageCriteria- | fuzzyCriteria+ | orderCriteria+ | fuzzyCriteria;revisionCriteria@@ -46,6 +47,12 @@ messageCriteria: MESSAGE Value+;+orderCriteria+ : OrderByDate+ | OrderByAuthorDate+ | OrderByTopo+ ;+SINCE: 'since';@@ -106,6 +113,18 @@ DefaultBranch: 'default-branch';+OrderByDate+ : 'order-by-date'+ ;++OrderByAuthorDate+ : 'order-by-author-date'+ ;++OrderByTopo+ : 'order-by-topo'+ ;+WS: ' ';diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.javaindex 6ef765737a..57d6d96778 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java@@ -11,8 +11,6 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import org.jspecify.annotations.Nullable;-import org.antlr.v4.runtime.BailErrorStrategy;import org.antlr.v4.runtime.BaseErrorListener;import org.antlr.v4.runtime.CharStream;@@ -22,9 +20,11 @@ import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;import org.antlr.v4.runtime.tree.TerminalNode;import org.eclipse.jgit.lib.ObjectId;+import org.jspecify.annotations.Nullable;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.event.project.RefUpdated;+import io.onedev.server.git.command.RevListCommand.Order;import io.onedev.server.git.command.RevListOptions;import io.onedev.server.model.Project;import io.onedev.server.search.commit.CommitQueryParser.CriteriaContext;@@ -122,6 +122,18 @@ public class CommitQuery implements Serializable {criteriaValues.computeIfAbsent(RevisionCriteria.class, k->new ArrayList<>()).add(new Revision(type, getValue(valueNode), isSince));}}+ } else if (criteria.orderCriteria() != null) {+ Order orderValue;+ if (criteria.orderCriteria().OrderByDate() != null) {+ orderValue = Order.DATE;+ } else if (criteria.orderCriteria().OrderByAuthorDate() != null) {+ orderValue = Order.AUTHOR_DATE;+ } else if (criteria.orderCriteria().OrderByTopo() != null) {+ orderValue = Order.TOPO;+ } else {+ throw new ExplicitException("Unknown order: " + criteria.orderCriteria().getText());+ }+ criteriaValues.computeIfAbsent(OrderCriteria.class, k->new ArrayList<>()).add(orderValue);}}diff --git a/server-core/src/main/java/io/onedev/server/search/commit/OrderCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/OrderCriteria.javanew file mode 100644index 0000000000..b3ac81b050--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/commit/OrderCriteria.java@@ -0,0 +1,59 @@+package io.onedev.server.search.commit;++import java.util.ArrayList;+import java.util.List;++import com.google.common.base.Preconditions;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.event.project.RefUpdated;+import io.onedev.server.git.command.RevListCommand.Order;+import io.onedev.server.git.command.RevListOptions;+import io.onedev.server.model.Project;++public class OrderCriteria extends CommitCriteria {++ private static final long serialVersionUID = 1L;++ private final List<Order> values;++ public OrderCriteria(List<Order> values) {+ Preconditions.checkArgument(!values.isEmpty());+ this.values = values;+ }++ public List<Order> getValues() {+ return values;+ }++ @Override+ public void fill(Project project, RevListOptions options) {+ options.orders(values);+ }++ @Override+ public boolean matches(RefUpdated event) {+ // Order doesn't affect whether a commit matches, only the ordering of results+ return true;+ }++ @Override+ public String toString() {+ List<String> parts = new ArrayList<>();+ for (Order value: values) {+ switch (value) {+ case DATE:+ parts.add(getRuleName(CommitQueryLexer.OrderByDate));+ break;+ case AUTHOR_DATE:+ parts.add(getRuleName(CommitQueryLexer.OrderByAuthorDate));+ break;+ case TOPO:+ parts.add(getRuleName(CommitQueryLexer.OrderByTopo));+ break;+ }+ }+ return StringUtils.join(parts, " ");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.javaindex bd1f099c88..2ba44a54f2 100644--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.java+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.java@@ -773,18 +773,20 @@ public class DefaultCommitInfoService extends AbstractEnvironmentServiceprivate void processCommitRange(Project project, ObjectId untilCommitId,@Nullable ObjectId sinceCommitId, CommitRangeProcessor commitRangeProcessor) {- RevListCommand revList = new RevListCommand(projectService.getGitDir(project.getId()));+ var gitDir = projectService.getGitDir(project.getId());++ RevListCommand revList = new RevListCommand(gitDir);List<String> revisions = new ArrayList<>();revisions.add(untilCommitId.name());if (sinceCommitId != null)revisions.add("^" + sinceCommitId.name());- revList.options().revisions(revisions).order(Order.TOPO);+ revList.options().revisions(revisions).orders(List.of(Order.TOPO));List<ObjectId> historyIds = new ArrayList<>();for (String commitHash : revList.run())historyIds.add(ObjectId.fromString(commitHash));- revList = new RevListCommand(projectService.getGitDir(project.getId()));+ revList = new RevListCommand(gitDir);revList.options().revisions(revisions).firstParent(true);Set<ObjectId> firstParentIds = new HashSet<>();