From a125cf6876e0edc5a2498df57a9df06d60b1f572 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 02 Jun 2011 22:40:23 -0400
Subject: [PATCH] Unit testing. Start of git-notes display feature.
---
src/com/gitblit/utils/TicgitUtils.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/com/gitblit/utils/TicgitUtils.java b/src/com/gitblit/utils/TicgitUtils.java
index 914b813..576de34 100644
--- a/src/com/gitblit/utils/TicgitUtils.java
+++ b/src/com/gitblit/utils/TicgitUtils.java
@@ -61,6 +61,9 @@
public static List<TicketModel> getTickets(Repository r) {
RefModel ticgitBranch = getTicketsBranch(r);
+ if (ticgitBranch == null) {
+ return null;
+ }
List<PathModel> paths = JGitUtils.getFilesInPath(r, null, ticgitBranch.commit);
List<TicketModel> tickets = new ArrayList<TicketModel>();
for (PathModel ticketFolder : paths) {
@@ -112,7 +115,7 @@
Comment c = new Comment(file.name, content);
ticket.comments.add(c);
} catch (ParseException e) {
- e.printStackTrace();
+ LOGGER.error("Failed to parse ticket comment", e);
}
} else if (chunks[0].equals("TAG")) {
if (content.startsWith("TAG_")) {
@@ -126,13 +129,5 @@
}
}
Collections.sort(ticket.comments);
- }
-
- public static String getTicketContent(Repository r, String filePath) {
- RefModel ticketsBranch = getTicketsBranch(r);
- if (ticketsBranch != null) {
- return JGitUtils.getRawContentAsString(r, ticketsBranch.commit, filePath);
- }
- return "";
}
}
--
Gitblit v1.9.1