From cebf455f3fd54b72e530942f308097ec54b408cd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 07 Apr 2011 09:46:30 -0400
Subject: [PATCH] Let Wicket manage resources and use markup inheritance.
---
src/com/gitblit/utils/JGitUtils.java | 210 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 191 insertions(+), 19 deletions(-)
diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index 31b5677..1b418b0 100644
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -6,6 +6,7 @@
import java.io.InputStream;
import java.io.RandomAccessFile;
import java.text.DateFormat;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
@@ -16,6 +17,9 @@
import java.util.Set;
import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.diff.DiffFormatter;
+import org.eclipse.jgit.diff.RawTextComparator;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.Constants;
@@ -34,9 +38,12 @@
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.PathFilter;
import org.eclipse.jgit.treewalk.filter.PathFilterGroup;
+import org.eclipse.jgit.treewalk.filter.TreeFilter;
+import org.eclipse.jgit.util.io.DisabledOutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.gitblit.utils.TicGitTicket.Comment;
import com.gitblit.wicket.models.Metric;
import com.gitblit.wicket.models.PathModel;
import com.gitblit.wicket.models.RefModel;
@@ -241,29 +248,89 @@
return list;
}
- public static List<PathModel> getCommitChangedPaths(Repository r, String commitId) {
+ public static List<PathModel> getFilesInCommit(Repository r, String commitId) {
RevCommit commit = getCommit(r, commitId);
- return getCommitChangedPaths(r, commit);
+ return getFilesInCommit(r, commit);
}
- public static List<PathModel> getCommitChangedPaths(Repository r, RevCommit commit) {
+ public static List<PathModel> getFilesInCommit(Repository r, RevCommit commit) {
List<PathModel> list = new ArrayList<PathModel>();
- final TreeWalk walk = new TreeWalk(r);
- walk.setRecursive(false);
try {
- walk.addTree(commit.getTree());
- while (walk.next()) {
- list.add(getPathModel(walk, null, commit));
- }
+ final RevWalk rw = new RevWalk(r);
+ RevCommit parent = rw.parseCommit(commit.getParent(0).getId());
+ RevTree parentTree = parent.getTree();
+ RevTree commitTree = commit.getTree();
- } catch (IOException e) {
- LOGGER.error("Failed to get files for commit " + commit.getName(), e);
- } finally {
- if (walk != null) {
- walk.release();
+ final TreeWalk walk = new TreeWalk(r);
+ walk.reset();
+ walk.setRecursive(true);
+ walk.addTree(parentTree);
+ walk.addTree(commitTree);
+ walk.setFilter(TreeFilter.ANY_DIFF);
+
+ RawTextComparator cmp = RawTextComparator.DEFAULT;
+ DiffFormatter df = new DiffFormatter(DisabledOutputStream.INSTANCE);
+ df.setRepository(r);
+ df.setDiffComparator(cmp);
+ df.setDetectRenames(true);
+ List<DiffEntry> diffs = df.scan(parentTree, commitTree);
+ for (DiffEntry diff : diffs) {
+ list.add(new PathModel(diff.getNewPath(), diff.getNewPath(), 0, diff.getNewMode().getBits(), commit.getId().getName()));
}
+ } catch (Throwable t) {
+ LOGGER.error("failed to determine files in commit!", t);
}
return list;
+ }
+
+ public static String getCommitDiff(Repository r, RevCommit commit, boolean outputHtml) {
+ return getCommitDiff(r, commit, null, outputHtml);
+ }
+
+ public static String getCommitDiff(Repository r, 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 commitTree = commit.getTree();
+
+ final TreeWalk walk = new TreeWalk(r);
+ walk.reset();
+ walk.setRecursive(true);
+ walk.addTree(parentTree);
+ walk.addTree(commitTree);
+ if (path != null && path.trim().length() > 0) {
+ walk.setFilter(PathFilter.create(path));
+ } else {
+ walk.setFilter(TreeFilter.ANY_DIFF);
+ }
+
+ final ByteArrayOutputStream os = new ByteArrayOutputStream();
+ RawTextComparator cmp = RawTextComparator.DEFAULT;
+ DiffFormatter df;
+ if (outputHtml) {
+ df = new HtmlDiffFormatter(os);
+ } else {
+ df = new DiffFormatter(os);
+ }
+ df.setRepository(r);
+ df.setDiffComparator(cmp);
+ df.setDetectRenames(true);
+ List<DiffEntry> diffs = df.scan(parentTree, commitTree);
+ df.format(diffs);
+ String diff;
+ if (outputHtml) {
+ // workaround for complex private methods in DiffFormatter
+ diff = ((HtmlDiffFormatter) df).getHtml();
+ } else {
+ diff = os.toString();
+ }
+ df.flush();
+ return diff;
+ } catch (Throwable t) {
+ LOGGER.error("failed to generate commit diff!", t);
+ }
+ return null;
}
private static PathModel getPathModel(TreeWalk walk, String basePath, RevCommit commit) {
@@ -283,7 +350,7 @@
size = walk.getObjectReader().getObjectSize(walk.getObjectId(0), Constants.OBJ_BLOB);
}
} catch (Throwable t) {
- LOGGER.error("Failed to retrieve blobl size", t);
+ LOGGER.error("Failed to retrieve blob size", t);
}
return new PathModel(name, walk.getPathString(), size, walk.getFileMode(0).getBits(), commit.getName());
}
@@ -333,8 +400,12 @@
return getRefs(r, Constants.R_TAGS, maxCount);
}
- public static List<RefModel> getHeads(Repository r, int maxCount) {
+ public static List<RefModel> getLocalBranches(Repository r, int maxCount) {
return getRefs(r, Constants.R_HEADS, maxCount);
+ }
+
+ public static List<RefModel> getRemoteBranches(Repository r, int maxCount) {
+ return getRefs(r, Constants.R_REMOTES, maxCount);
}
public static List<RefModel> getRefs(Repository r, String refs, int maxCount) {
@@ -349,7 +420,7 @@
Collections.sort(list);
Collections.reverse(list);
if (maxCount > 0 && list.size() > maxCount) {
- list = list.subList(0, maxCount);
+ list = new ArrayList<RefModel>(list.subList(0, maxCount));
}
} catch (IOException e) {
LOGGER.error("Failed to retrieve " + refs, e);
@@ -448,9 +519,110 @@
List<String> keys = new ArrayList<String>(map.keySet());
Collections.sort(keys);
List<Metric> metrics = new ArrayList<Metric>();
- for (String key:keys) {
+ for (String key : keys) {
metrics.add(map.get(key));
- }
+ }
return metrics;
}
+
+ public static RefModel getTicGitBranch(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")) {
+ ticgitBranch = ref;
+ break;
+ }
+ }
+
+ // 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")) {
+ ticgitBranch = ref;
+ break;
+ }
+ }
+ }
+ } catch (Throwable t) {
+ LOGGER.error("Failed to find ticgit branch!", t);
+ }
+ return ticgitBranch;
+ }
+
+ public static List<TicGitTicket> getTicGitTickets(Repository r) {
+ RefModel ticgitBranch = getTicGitBranch(r);
+ List<PathModel> paths = getFilesInPath(r, null, ticgitBranch.getCommit());
+ List<TicGitTicket> tickets = new ArrayList<TicGitTicket>();
+ for (PathModel ticketFolder : paths) {
+ if (ticketFolder.isTree()) {
+ try {
+ TicGitTicket t = new TicGitTicket(ticketFolder.name);
+ readTicketContents(r, ticgitBranch, t);
+ tickets.add(t);
+ } catch (Throwable t) {
+ LOGGER.error("Failed to get a ticgit ticket!", t);
+ }
+ }
+ }
+ Collections.sort(tickets);
+ Collections.reverse(tickets);
+ return tickets;
+ }
+
+ public static TicGitTicket getTicGitTicket(Repository r, String ticketFolder) {
+ RefModel ticgitBranch = getTicGitBranch(r);
+ if (ticgitBranch != null) {
+ try {
+ TicGitTicket ticket = new TicGitTicket(ticketFolder);
+ readTicketContents(r, ticgitBranch, ticket);
+ return ticket;
+ } catch (Throwable t) {
+ LOGGER.error("Failed to get ticgit ticket " + ticketFolder, t);
+ }
+ }
+ return null;
+ }
+
+ private static void readTicketContents(Repository r, RefModel ticgitBranch, TicGitTicket ticket) {
+ List<PathModel> ticketFiles = getFilesInPath(r, ticket.name, ticgitBranch.getCommit());
+ for (PathModel file : ticketFiles) {
+ String content = getRawContentAsString(r, ticgitBranch.getCommit(), file.path).trim();
+ if (file.name.equals("TICKET_ID")) {
+ ticket.id = content;
+ } else if (file.name.equals("TITLE")) {
+ ticket.title = content;
+ } else {
+ String[] chunks = file.name.split("_");
+ if (chunks[0].equals("ASSIGNED")) {
+ ticket.handler = content;
+ } else if (chunks[0].equals("COMMENT")) {
+ try {
+ Comment c = new Comment(file.name, content);
+ ticket.comments.add(c);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ } else if (chunks[0].equals("TAG")) {
+ if (content.startsWith("TAG_")) {
+ ticket.tags.add(content.substring(4));
+ } else {
+ ticket.tags.add(content);
+ }
+ } else if (chunks[0].equals("STATE")) {
+ ticket.state = content;
+ }
+ }
+ }
+ 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);
+ }
+ return "";
+ }
}
--
Gitblit v1.9.1