From e299e1e9071d02ceefa2b5154f0fd1af5cbe115e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 17 Apr 2011 16:57:41 -0400
Subject: [PATCH] Finished history tree/blob links.
---
src/com/gitblit/utils/JGitUtils.java | 92 +++++++++++++++++++++++++++++-----------------
1 files changed, 58 insertions(+), 34 deletions(-)
diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index 7128f72..5590ffe 100644
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -46,8 +46,8 @@
import com.gitblit.wicket.models.Metric;
import com.gitblit.wicket.models.PathModel;
import com.gitblit.wicket.models.RefModel;
-import com.gitblit.wicket.models.TicGitTicket;
-import com.gitblit.wicket.models.TicGitTicket.Comment;
+import com.gitblit.wicket.models.TicketModel;
+import com.gitblit.wicket.models.TicketModel.Comment;
public class JGitUtils {
@@ -288,20 +288,35 @@
}
public static String getCommitDiff(Repository r, RevCommit commit, boolean outputHtml) {
- return getCommitDiff(r, commit, null, outputHtml);
+ return getCommitDiff(r, null, commit, null, outputHtml);
}
public static String getCommitDiff(Repository r, RevCommit commit, String path, boolean outputHtml) {
+ return getCommitDiff(r, null, commit, path, outputHtml);
+ }
+
+ public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit, boolean outputHtml) {
+ return getCommitDiff(r, baseCommit, commit, null, outputHtml);
+ }
+
+ public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit, String path, boolean outputHtml) {
try {
- final RevWalk rw = new RevWalk(r);
- RevCommit parent = rw.parseCommit(commit.getParent(0).getId());
- RevTree parentTree = parent.getTree();
+ RevTree baseTree;
+ if (baseCommit == null) {
+ final RevWalk rw = new RevWalk(r);
+ RevCommit parent = rw.parseCommit(commit.getParent(0).getId());
+ rw.dispose();
+ baseTree = parent.getTree();
+ } else {
+ baseTree = baseCommit.getTree();
+ }
+
RevTree commitTree = commit.getTree();
final TreeWalk walk = new TreeWalk(r);
walk.reset();
walk.setRecursive(true);
- walk.addTree(parentTree);
+ walk.addTree(baseTree);
walk.addTree(commitTree);
walk.setFilter(TreeFilter.ANY_DIFF);
@@ -316,7 +331,7 @@
df.setRepository(r);
df.setDiffComparator(cmp);
df.setDetectRenames(true);
- List<DiffEntry> diffs = df.scan(parentTree, commitTree);
+ List<DiffEntry> diffs = df.scan(baseTree, commitTree);
if (path != null && path.length() > 0) {
for (DiffEntry diff : diffs) {
if (diff.getNewPath().equalsIgnoreCase(path)) {
@@ -347,16 +362,25 @@
}
public static String getCommitPatch(Repository r, RevCommit commit, String path) {
+ return getCommitPatch(r, null, commit, path);
+ }
+
+ public static String getCommitPatch(Repository r, RevCommit baseCommit, RevCommit commit, String path) {
try {
- final RevWalk rw = new RevWalk(r);
- RevCommit parent = rw.parseCommit(commit.getParent(0).getId());
- RevTree parentTree = parent.getTree();
+ RevTree baseTree;
+ if (baseCommit == null) {
+ final RevWalk rw = new RevWalk(r);
+ RevCommit parent = rw.parseCommit(commit.getParent(0).getId());
+ baseTree = parent.getTree();
+ } else {
+ baseTree = baseCommit.getTree();
+ }
RevTree commitTree = commit.getTree();
final TreeWalk walk = new TreeWalk(r);
walk.reset();
walk.setRecursive(true);
- walk.addTree(parentTree);
+ walk.addTree(baseTree);
walk.addTree(commitTree);
walk.setFilter(TreeFilter.ANY_DIFF);
@@ -366,7 +390,7 @@
df.setRepository(r);
df.setDiffComparator(cmp);
df.setDetectRenames(true);
- List<DiffEntry> diffs = df.scan(parentTree, commitTree);
+ List<DiffEntry> diffs = df.scan(baseTree, commitTree);
if (path != null && path.length() > 0) {
for (DiffEntry diff : diffs) {
if (diff.getNewPath().equalsIgnoreCase(path)) {
@@ -614,12 +638,12 @@
return metrics;
}
- public static RefModel getTicGitBranch(Repository r) {
+ public static RefModel getTicketsBranch(Repository r) {
RefModel ticgitBranch = null;
try {
// search for ticgit branch in local heads
for (RefModel ref : getLocalBranches(r, -1)) {
- if (ref.getDisplayName().endsWith("ticgit") || ref.getDisplayName().endsWith("ticgit-ng")) {
+ if (ref.getDisplayName().endsWith("ticgit")) {
ticgitBranch = ref;
break;
}
@@ -628,7 +652,7 @@
// search for ticgit branch in remote heads
if (ticgitBranch == null) {
for (RefModel ref : getRemoteBranches(r, -1)) {
- if (ref.getDisplayName().endsWith("ticgit") || ref.getDisplayName().endsWith("ticgit-ng")) {
+ if (ref.getDisplayName().endsWith("ticgit")) {
ticgitBranch = ref;
break;
}
@@ -640,18 +664,18 @@
return ticgitBranch;
}
- public static List<TicGitTicket> getTicGitTickets(Repository r) {
- RefModel ticgitBranch = getTicGitBranch(r);
+ public static List<TicketModel> getTickets(Repository r) {
+ RefModel ticgitBranch = getTicketsBranch(r);
List<PathModel> paths = getFilesInPath(r, null, ticgitBranch.getCommit());
- List<TicGitTicket> tickets = new ArrayList<TicGitTicket>();
+ List<TicketModel> tickets = new ArrayList<TicketModel>();
for (PathModel ticketFolder : paths) {
if (ticketFolder.isTree()) {
try {
- TicGitTicket t = new TicGitTicket(ticketFolder.name);
+ TicketModel t = new TicketModel(ticketFolder.name);
readTicketContents(r, ticgitBranch, t);
tickets.add(t);
} catch (Throwable t) {
- LOGGER.error("Failed to get a ticgit ticket!", t);
+ LOGGER.error("Failed to get a ticket!", t);
}
}
}
@@ -660,24 +684,24 @@
return tickets;
}
- public static TicGitTicket getTicGitTicket(Repository r, String ticketFolder) {
- RefModel ticgitBranch = getTicGitBranch(r);
- if (ticgitBranch != null) {
+ public static TicketModel getTicket(Repository r, String ticketFolder) {
+ RefModel ticketsBranch = getTicketsBranch(r);
+ if (ticketsBranch != null) {
try {
- TicGitTicket ticket = new TicGitTicket(ticketFolder);
- readTicketContents(r, ticgitBranch, ticket);
+ TicketModel ticket = new TicketModel(ticketFolder);
+ readTicketContents(r, ticketsBranch, ticket);
return ticket;
} catch (Throwable t) {
- LOGGER.error("Failed to get ticgit ticket " + ticketFolder, t);
+ LOGGER.error("Failed to get ticket " + ticketFolder, t);
}
}
return null;
}
- private static void readTicketContents(Repository r, RefModel ticgitBranch, TicGitTicket ticket) {
- List<PathModel> ticketFiles = getFilesInPath(r, ticket.name, ticgitBranch.getCommit());
+ private static void readTicketContents(Repository r, RefModel ticketsBranch, TicketModel ticket) {
+ List<PathModel> ticketFiles = getFilesInPath(r, ticket.name, ticketsBranch.getCommit());
for (PathModel file : ticketFiles) {
- String content = getRawContentAsString(r, ticgitBranch.getCommit(), file.path).trim();
+ String content = getRawContentAsString(r, ticketsBranch.getCommit(), file.path).trim();
if (file.name.equals("TICKET_ID")) {
ticket.id = content;
} else if (file.name.equals("TITLE")) {
@@ -707,10 +731,10 @@
Collections.sort(ticket.comments);
}
- public static String getTicGitContent(Repository r, String filePath) {
- RefModel ticgitBranch = getTicGitBranch(r);
- if (ticgitBranch != null) {
- return getRawContentAsString(r, ticgitBranch.getCommit(), filePath);
+ public static String getTicketContent(Repository r, String filePath) {
+ RefModel ticketsBranch = getTicketsBranch(r);
+ if (ticketsBranch != null) {
+ return getRawContentAsString(r, ticketsBranch.getCommit(), filePath);
}
return "";
}
--
Gitblit v1.9.1