The Unified and Autonomous Development Platform
Fix the issue that tags are out of order
Robin Shen032ed48571d8
diff --git a/commons.git/src/main/java/com/pmease/commons/git/RefInfo.java b/commons.git/src/main/java/com/pmease/commons/git/RefInfo.javaindex 9571c6bcc6..dd0b2a13bb 100644--- a/commons.git/src/main/java/com/pmease/commons/git/RefInfo.java+++ b/commons.git/src/main/java/com/pmease/commons/git/RefInfo.java@@ -1,6 +1,7 @@package com.pmease.commons.git;import java.io.IOException;+import java.util.Date;import org.eclipse.jgit.lib.Ref;import org.eclipse.jgit.revwalk.RevCommit;@@ -46,30 +47,33 @@ public class RefInfo implements Comparable<RefInfo> {@Overridepublic int compareTo(RefInfo other) {+ Date date;if (obj instanceof RevTag && ((RevTag)obj).getTaggerIdent() != null) {- if (other.obj instanceof RevTag && ((RevTag)other.obj).getTaggerIdent() != null) {- return ((RevTag)obj).getTaggerIdent().getWhen().compareTo(((RevTag)other.obj).getTaggerIdent().getWhen());- } else {- return -1;- }+ date = ((RevTag)obj).getTaggerIdent().getWhen();+ } else if (peeledObj instanceof RevCommit) {+ date = ((RevCommit)peeledObj).getCommitterIdent().getWhen();+ } else {+ date = null;+ }+ Date otherDate;+ if (other.obj instanceof RevTag && ((RevTag)other.obj).getTaggerIdent() != null) {+ otherDate = ((RevTag)other.obj).getTaggerIdent().getWhen();+ } else if (other.peeledObj instanceof RevCommit) {+ otherDate = ((RevCommit)other.peeledObj).getCommitterIdent().getWhen();} else {- if (other.obj instanceof RevTag && ((RevTag)other.obj).getTaggerIdent() != null) {+ otherDate = null;+ }++ if (date != null) {+ if (otherDate != null)+ return date.compareTo(otherDate);+ elsereturn 1;- } else {- if (obj instanceof RevCommit) {- if (other.peeledObj instanceof RevCommit) {- return ((RevCommit)peeledObj).getCommitTime() - ((RevCommit)other.peeledObj).getCommitTime();- } else {- return -1;- }- } else {- if (other.peeledObj instanceof RevCommit) {- return 1;- } else {- return ref.getName().compareTo(other.ref.getName());- }- }- }+ } else {+ if (otherDate != null)+ return -1;+ else+ return getRef().getName().compareTo(other.getRef().getName());}}diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/revision-selector.css b/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/revision-selector.cssindex 79fbc9484f..946e612a1a 100644--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/revision-selector.css+++ b/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/revision-selector.css@@ -20,6 +20,11 @@ div.revision-selector {}div.revision-selector ul.items {margin-bottom: 0;+ /*+ * Configure max height to make sure scroll bar appears if there are many refs as we initially only+ * loads a page of items+ */+ max-height: 600px;}div.revision-selector ul.items>li {position: relative;