From f602a2f552e1389ee465307723b492b1af378fd5 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sat, 16 Apr 2011 16:28:19 -0400 Subject: [PATCH] Working history feature. Tweak to paging. --- src/com/gitblit/utils/JGitUtils.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java index fa31391..7128f72 100644 --- a/src/com/gitblit/utils/JGitUtils.java +++ b/src/com/gitblit/utils/JGitUtils.java @@ -35,6 +35,7 @@ import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; +import org.eclipse.jgit.treewalk.filter.AndTreeFilter; import org.eclipse.jgit.treewalk.filter.PathFilter; import org.eclipse.jgit.treewalk.filter.PathFilterGroup; import org.eclipse.jgit.treewalk.filter.TreeFilter; @@ -436,6 +437,10 @@ } public static List<RevCommit> getRevLog(Repository r, String objectId, int offset, int maxCount) { + return getRevLog(r, objectId, null, offset, maxCount); + } + + public static List<RevCommit> getRevLog(Repository r, String objectId, String path, int offset, int maxCount) { List<RevCommit> list = new ArrayList<RevCommit>(); try { if (objectId == null || objectId.trim().length() == 0) { @@ -444,6 +449,12 @@ RevWalk walk = new RevWalk(r); ObjectId object = r.resolve(objectId); walk.markStart(walk.parseCommit(object)); + if (!StringUtils.isEmpty(path)) { + TreeFilter filter = AndTreeFilter.create(PathFilterGroup + .createFromStrings(Collections.singleton(path)), + TreeFilter.ANY_DIFF); + walk.setTreeFilter(filter); + } Iterable<RevCommit> revlog = walk; if (offset > 0) { int count = 0; -- Gitblit v1.9.1