From 3f5b8f5d9203aa7ffb7fbe9cdbaf9dba3da6cae6 Mon Sep 17 00:00:00 2001
From: Hybris95 <hybris_95@hotmail.com>
Date: Thu, 01 May 2014 16:14:15 -0400
Subject: [PATCH] Fixes sort, page building and search functions on "my tickets" page.
---
src/main/java/com/gitblit/models/RepositoryCommit.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/models/RepositoryCommit.java b/src/main/java/com/gitblit/models/RepositoryCommit.java
index e68e861..765b489 100644
--- a/src/main/java/com/gitblit/models/RepositoryCommit.java
+++ b/src/main/java/com/gitblit/models/RepositoryCommit.java
@@ -17,15 +17,17 @@
import java.io.Serializable;
import java.text.MessageFormat;
+import java.util.Date;
import java.util.List;
+import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.revwalk.RevCommit;
/**
* Model class to represent a RevCommit, it's source repository, and the branch.
* This class is used by the activity page.
- *
+ *
* @author James Moger
*/
public class RepositoryCommit implements Serializable, Comparable<RepositoryCommit> {
@@ -54,6 +56,10 @@
return refs;
}
+ public ObjectId getId() {
+ return commit.getId();
+ }
+
public String getName() {
return commit.getName();
}
@@ -66,8 +72,16 @@
return commit.getShortMessage();
}
+ public Date getCommitDate() {
+ return new Date(commit.getCommitTime() * 1000L);
+ }
+
public int getParentCount() {
return commit.getParentCount();
+ }
+
+ public RevCommit [] getParents() {
+ return commit.getParents();
}
public PersonIdent getAuthorIdent() {
@@ -102,10 +116,14 @@
}
return 0;
}
-
+
+ public RepositoryCommit clone(String withRef) {
+ return new RepositoryCommit(repository, withRef, commit);
+ }
+
@Override
public String toString() {
- return MessageFormat.format("{0} {1} {2,date,yyyy-MM-dd HH:mm} {3} {4}",
+ return MessageFormat.format("{0} {1} {2,date,yyyy-MM-dd HH:mm} {3} {4}",
getShortName(), branch, getCommitterIdent().getWhen(), getAuthorIdent().getName(),
getShortMessage());
}
--
Gitblit v1.9.1