From 3e087ada55f8b0e83b146578b695552db9dc8d97 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 27 Apr 2011 20:55:38 -0400
Subject: [PATCH] Integrated pagelinks into RepositoryPage. Fixed string encoding.
---
src/com/gitblit/utils/JGitUtils.java | 558 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 473 insertions(+), 85 deletions(-)
diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index abecac4..8814c1f 100644
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -4,22 +4,29 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.io.RandomAccessFile;
+import java.nio.charset.Charset;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.diff.DiffFormatter;
import org.eclipse.jgit.diff.RawTextComparator;
import org.eclipse.jgit.errors.ConfigInvalidException;
+import org.eclipse.jgit.errors.IncorrectObjectTypeException;
+import org.eclipse.jgit.errors.MissingObjectException;
+import org.eclipse.jgit.errors.StopWalkException;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
@@ -32,20 +39,27 @@
import org.eclipse.jgit.revwalk.RevBlob;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevObject;
+import org.eclipse.jgit.revwalk.RevSort;
import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.revwalk.filter.RevFilter;
import org.eclipse.jgit.treewalk.TreeWalk;
+import org.eclipse.jgit.treewalk.filter.AndTreeFilter;
+import org.eclipse.jgit.treewalk.filter.OrTreeFilter;
import org.eclipse.jgit.treewalk.filter.PathFilter;
import org.eclipse.jgit.treewalk.filter.PathFilterGroup;
+import org.eclipse.jgit.treewalk.filter.PathSuffixFilter;
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.PathModel.PathChangeModel;
import com.gitblit.wicket.models.RefModel;
+import com.gitblit.wicket.models.TicketModel;
+import com.gitblit.wicket.models.TicketModel.Comment;
public class JGitUtils {
@@ -56,6 +70,11 @@
public static final String R_NOTES_COMMITS = R_NOTES + "commits";
private final static Logger LOGGER = LoggerFactory.getLogger(JGitUtils.class);
+
+ public static Repository createRepository(File repositoriesFolder, String name, boolean bare) {
+ Git git = Git.init().setDirectory(new File(repositoriesFolder, name)).setBare(bare).call();
+ return git.getRepository();
+ }
public static List<String> getRepositoryList(File repositoriesFolder, boolean exportAll, boolean readNested) {
List<String> list = new ArrayList<String>();
@@ -70,8 +89,18 @@
for (File file : folder.listFiles()) {
if (file.isDirectory() && !file.getName().equalsIgnoreCase(Constants.DOT_GIT)) {
// if this is a git repository add it to the list
+ //
+ // first look for standard folder/.git structure
File gitFolder = new File(file, Constants.DOT_GIT);
boolean isGitRepository = gitFolder.exists() && gitFolder.isDirectory();
+
+ // then look for folder.git/HEAD
+ if (!isGitRepository) {
+ if (file.getName().endsWith(Constants.DOT_GIT_EXT) && new File(file, Constants.HEAD).exists()) {
+ gitFolder = file;
+ isGitRepository = true;
+ }
+ }
boolean exportRepository = isGitRepository && (exportAll || new File(gitFolder, "git-daemon-export-ok").exists());
if (exportRepository) {
@@ -93,17 +122,56 @@
return list;
}
- public static Date getLastChange(Repository r) {
+ public static RevCommit getFirstCommit(Repository r, String branch) {
+ if (StringUtils.isEmpty(branch)) {
+ branch = Constants.HEAD;
+ }
+ try {
+ RevWalk walk = new RevWalk(r);
+ walk.sort(RevSort.REVERSE);
+ RevCommit head = walk.parseCommit(r.resolve(branch));
+ walk.markStart(head);
+ RevCommit commit = walk.next();
+ walk.dispose();
+ return commit;
+ } catch (Throwable t) {
+ LOGGER.error("Failed to determine first commit", t);
+ }
+ return null;
+ }
+
+ public static Date getFirstChange(Repository r, String branch) {
+ try {
+ RevCommit commit = getFirstCommit(r, branch);
+ if (commit == null) {
+ // fresh repository
+ return new Date(r.getDirectory().lastModified());
+ }
+ return getCommitDate(commit);
+ } catch (Throwable t) {
+ LOGGER.error("Failed to determine first change", t);
+ }
+ return null;
+ }
+
+ public static Date getLastChange(Repository r) {
RevCommit commit = getCommit(r, Constants.HEAD);
+ if (commit == null) {
+ // fresh repository
+ return new Date(r.getDirectory().lastModified());
+ }
return getCommitDate(commit);
}
- public static RevCommit getCommit(Repository r, String commitId) {
+ public static RevCommit getCommit(Repository r, String objectId) {
RevCommit commit = null;
try {
- ObjectId objectId = r.resolve(commitId);
+ if (objectId == null || objectId.trim().length() == 0) {
+ objectId = Constants.HEAD;
+ }
+ ObjectId object = r.resolve(objectId);
RevWalk walk = new RevWalk(r);
- RevCommit rev = walk.parseCommit(objectId);
+ RevCommit rev = walk.parseCommit(object);
commit = rev;
walk.dispose();
} catch (Throwable t) {
@@ -197,21 +265,26 @@
}
public static String getRawContentAsString(Repository r, RevBlob blob) {
- return new String(getRawContent(r, blob));
+ byte [] content = getRawContent(r, blob);
+ return new String(content, Charset.forName("UTF-8"));
}
public static String getRawContentAsString(Repository r, RevCommit commit, String blobPath) {
RevObject obj = getRevObject(r, commit.getTree(), blobPath);
- return new String(getRawContent(r, (RevBlob) obj));
+ byte [] content = getRawContent(r, (RevBlob) obj);
+ return new String(content, Charset.forName("UTF-8"));
}
- public static List<PathModel> getFilesInPath(Repository r, String basePath, String commitId) {
- RevCommit commit = getCommit(r, commitId);
+ public static List<PathModel> getFilesInPath(Repository r, String basePath, String objectId) {
+ RevCommit commit = getCommit(r, objectId);
return getFilesInPath(r, basePath, commit);
}
public static List<PathModel> getFilesInPath(Repository r, String basePath, RevCommit commit) {
List<PathModel> list = new ArrayList<PathModel>();
+ if (commit == null) {
+ return list;
+ }
final TreeWalk walk = new TreeWalk(r);
try {
walk.addTree(commit.getTree());
@@ -247,13 +320,13 @@
return list;
}
- public static List<PathModel> getFilesInCommit(Repository r, String commitId) {
+ public static List<PathChangeModel> getFilesInCommit(Repository r, String commitId) {
RevCommit commit = getCommit(r, commitId);
return getFilesInCommit(r, commit);
}
- public static List<PathModel> getFilesInCommit(Repository r, RevCommit commit) {
- List<PathModel> list = new ArrayList<PathModel>();
+ public static List<PathChangeModel> getFilesInCommit(Repository r, RevCommit commit) {
+ List<PathChangeModel> list = new ArrayList<PathChangeModel>();
try {
final RevWalk rw = new RevWalk(r);
RevCommit parent = rw.parseCommit(commit.getParent(0).getId());
@@ -274,56 +347,200 @@
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()));
+ if (diff.getChangeType().equals(ChangeType.DELETE)) {
+ list.add(new PathChangeModel(diff.getOldPath(), diff.getOldPath(), 0, diff.getNewMode().getBits(), commit.getId().getName(), diff.getChangeType()));
+ } else {
+ list.add(new PathChangeModel(diff.getNewPath(), diff.getNewPath(), 0, diff.getNewMode().getBits(), commit.getId().getName(), diff.getChangeType()));
+ }
}
} 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 List<PathModel> getDocuments(Repository r, List<String> extensions) {
+ List<PathModel> list = new ArrayList<PathModel>();
+ RevCommit commit = getCommit(r, Constants.HEAD);
+ final TreeWalk walk = new TreeWalk(r);
+ try {
+ walk.addTree(commit.getTree());
+ if (extensions != null && extensions.size() > 0) {
+ Collection<TreeFilter> suffixFilters = new ArrayList<TreeFilter>();
+ for (String extension:extensions) {
+ if (extension.charAt(0) == '.') {
+ suffixFilters.add(PathSuffixFilter.create(extension));
+ } else {
+ // escape the . since this is a regexp filter
+ suffixFilters.add(PathSuffixFilter.create("\\." + extension));
+ }
+ }
+ TreeFilter filter = OrTreeFilter.create(suffixFilters);
+ walk.setFilter(filter);
+ walk.setRecursive(true);
+ while (walk.next()) {
+ list.add(getPathModel(walk, null, commit));
+ }
+ } else {
+ while (walk.next()) {
+ list.add(getPathModel(walk, null, commit));
+ }
+ }
+ } catch (IOException e) {
+ LOGGER.error("Failed to get files for commit " + commit.getName(), e);
+ } finally {
+ walk.release();
+ }
+ Collections.sort(list);
+ return list;
}
- public static String getCommitDiff(Repository r, RevCommit commit, String path, boolean outputHtml) {
+ public static Map<ChangeType, AtomicInteger> getChangedPathsStats(List<PathChangeModel> paths) {
+ Map<ChangeType, AtomicInteger> stats = new HashMap<ChangeType, AtomicInteger>();
+ for (PathChangeModel path : paths) {
+ if (!stats.containsKey(path.changeType)) {
+ stats.put(path.changeType, new AtomicInteger(0));
+ }
+ stats.get(path.changeType).incrementAndGet();
+ }
+ return stats;
+ }
+
+ public static enum DiffOutputType {
+ PLAIN, GITWEB, GITBLIT;
+
+ public static DiffOutputType forName(String name) {
+ for (DiffOutputType type : values()) {
+ if (type.name().equalsIgnoreCase(name)) {
+ return type;
+ }
+ }
+ return null;
+ }
+ }
+
+ public static String getCommitDiff(Repository r, RevCommit commit, DiffOutputType outputType) {
+ return getCommitDiff(r, null, commit, null, outputType);
+ }
+
+ public static String getCommitDiff(Repository r, RevCommit commit, String path, DiffOutputType outputType) {
+ return getCommitDiff(r, null, commit, path, outputType);
+ }
+
+ public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit, DiffOutputType outputType) {
+ return getCommitDiff(r, baseCommit, commit, null, outputType);
+ }
+
+ public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit, String path, DiffOutputType outputType) {
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);
- if (path != null && path.trim().length() > 0) {
- walk.setFilter(PathFilter.create(path));
- } else {
- walk.setFilter(TreeFilter.ANY_DIFF);
- }
+ walk.setFilter(TreeFilter.ANY_DIFF);
final ByteArrayOutputStream os = new ByteArrayOutputStream();
RawTextComparator cmp = RawTextComparator.DEFAULT;
DiffFormatter df;
- if (outputHtml) {
- df = new HtmlDiffFormatter(os);
- } else {
+ switch (outputType) {
+ case GITWEB:
+ df = new GitWebDiffFormatter(os);
+ break;
+ case GITBLIT:
+ df = new GitBlitDiffFormatter(os);
+ break;
+ case PLAIN:
+ default:
df = new DiffFormatter(os);
+ break;
}
df.setRepository(r);
df.setDiffComparator(cmp);
df.setDetectRenames(true);
- List<DiffEntry> diffs = df.scan(parentTree, commitTree);
- df.format(diffs);
+ List<DiffEntry> diffs = df.scan(baseTree, commitTree);
+ if (path != null && path.length() > 0) {
+ for (DiffEntry diff : diffs) {
+ if (diff.getNewPath().equalsIgnoreCase(path)) {
+ df.format(diff);
+ break;
+ }
+ }
+ } else {
+ df.format(diffs);
+ }
String diff;
- if (outputHtml) {
+ if (df instanceof GitWebDiffFormatter) {
// workaround for complex private methods in DiffFormatter
- diff = ((HtmlDiffFormatter) df).getHtml();
+ diff = ((GitWebDiffFormatter) df).getHtml();
} else {
diff = os.toString();
}
+ df.flush();
+ return diff;
+ } catch (Throwable t) {
+ LOGGER.error("failed to generate commit diff!", t);
+ }
+ return null;
+ }
+
+ public static String getCommitPatch(Repository r, RevCommit commit) {
+ return getCommitPatch(r, commit);
+ }
+
+ 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 {
+ 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(baseTree);
+ walk.addTree(commitTree);
+ walk.setFilter(TreeFilter.ANY_DIFF);
+
+ final ByteArrayOutputStream os = new ByteArrayOutputStream();
+ RawTextComparator cmp = RawTextComparator.DEFAULT;
+ PatchFormatter df = new PatchFormatter(os);
+ df.setRepository(r);
+ df.setDiffComparator(cmp);
+ df.setDetectRenames(true);
+ List<DiffEntry> diffs = df.scan(baseTree, commitTree);
+ if (path != null && path.length() > 0) {
+ for (DiffEntry diff : diffs) {
+ if (diff.getNewPath().equalsIgnoreCase(path)) {
+ df.format(diff);
+ break;
+ }
+ }
+ } else {
+ df.format(diffs);
+ }
+ String diff = df.getPatch(commit);
df.flush();
return diff;
} catch (Throwable t) {
@@ -383,12 +600,95 @@
}
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) {
objectId = Constants.HEAD;
}
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;
+ for (RevCommit rev : revlog) {
+ count++;
+ if (count > offset) {
+ list.add(rev);
+ if (maxCount > 0 && list.size() == maxCount) {
+ break;
+ }
+ }
+ }
+ } else {
+ for (RevCommit rev : revlog) {
+ list.add(rev);
+ if (maxCount > 0 && list.size() == maxCount) {
+ break;
+ }
+ }
+ }
+ walk.dispose();
+ } catch (Throwable t) {
+ LOGGER.error("Failed to determine last change", t);
+ }
+ return list;
+ }
+
+ public static enum SearchType {
+ AUTHOR, COMMITTER, COMMIT;
+
+ public static SearchType forName(String name) {
+ for (SearchType type : values()) {
+ if (type.name().equalsIgnoreCase(name)) {
+ return type;
+ }
+ }
+ return null;
+ }
+
+ public String toString() {
+ return name().toLowerCase();
+ }
+ }
+
+ public static List<RevCommit> searchRevlogs(Repository r, String objectId, String value, final SearchType type, int offset, int maxCount) {
+ final String lcValue = value.toLowerCase();
+ List<RevCommit> list = new ArrayList<RevCommit>();
+ try {
+ if (objectId == null || objectId.trim().length() == 0) {
+ objectId = Constants.HEAD;
+ }
+ RevWalk walk = new RevWalk(r);
+ walk.setRevFilter(new RevFilter() {
+
+ @Override
+ public RevFilter clone() {
+ return this;
+ }
+
+ @Override
+ public boolean include(RevWalk walker, RevCommit commit) throws StopWalkException, MissingObjectException, IncorrectObjectTypeException, IOException {
+ switch (type) {
+ case AUTHOR:
+ return (commit.getAuthorIdent().getName().toLowerCase().indexOf(lcValue) > -1) || (commit.getAuthorIdent().getEmailAddress().toLowerCase().indexOf(lcValue) > -1);
+ case COMMITTER:
+ return (commit.getCommitterIdent().getName().toLowerCase().indexOf(lcValue) > -1) || (commit.getCommitterIdent().getEmailAddress().toLowerCase().indexOf(lcValue) > -1);
+ case COMMIT:
+ return commit.getFullMessage().toLowerCase().indexOf(lcValue) > -1;
+ }
+ return false;
+ }
+
+ });
ObjectId object = r.resolve(objectId);
walk.markStart(walk.parseCommit(object));
Iterable<RevCommit> revlog = walk;
@@ -476,35 +776,94 @@
}
public static String getRepositoryDescription(Repository r) {
- File dir = r.getDirectory();
- if (dir.exists()) {
- File description = new File(dir, "description");
- if (description.exists() && description.length() > 0) {
- RandomAccessFile raf = null;
- try {
- raf = new RandomAccessFile(description, "r");
- byte[] buffer = new byte[(int) description.length()];
- raf.readFully(buffer);
- return new String(buffer);
- } catch (Throwable t) {
- } finally {
- try {
- raf.close();
- } catch (Throwable t) {
- }
- }
- }
- }
- return "";
+ return getRepositoryConfigString(r, "description");
+ }
+
+ public static void setRepositoryDescription(Repository r, String value) {
+ setRepositoryConfigString(r, "description", value);
}
public static String getRepositoryOwner(Repository r) {
+ return getRepositoryConfigString(r, "owner");
+ }
+
+ public static void setRepositoryOwner(Repository r, String owner) {
+ setRepositoryConfigString(r, "owner", owner);
+ }
+
+ public static String getRepositoryGroup(Repository r) {
+ return getRepositoryConfigString(r, "group");
+ }
+
+ public static void setRepositoryGroup(Repository r, String group) {
+ setRepositoryConfigString(r, "group", group);
+ }
+
+ public static boolean getRepositoryUseTickets(Repository r) {
+ return getRepositoryConfigBoolean(r, "useTickets", false);
+ }
+
+ public static void setRepositoryUseTickets(Repository r, boolean value) {
+ setRepositoryConfigBoolean(r, "useTickets", value);
+ }
+
+ public static boolean getRepositoryUseDocs(Repository r) {
+ return getRepositoryConfigBoolean(r, "useDocs", false);
+ }
+
+ public static void setRepositoryUseDocs(Repository r, boolean value) {
+ setRepositoryConfigBoolean(r, "useDocs", value);
+ }
+
+ public static boolean getRepositoryRestrictedAccess(Repository r) {
+ return getRepositoryConfigBoolean(r, "restrictedAccess", false);
+ }
+
+ public static void setRepositoryRestrictedAccess(Repository r, boolean value) {
+ setRepositoryConfigBoolean(r, "restrictedAccess", value);
+ }
+
+ public static String getRepositoryConfigString(Repository r, String field) {
StoredConfig c = readConfig(r);
if (c == null) {
return "";
}
- String o = c.getString("gitweb", null, "owner");
+ String o = c.getString("gitblit", null, field);
return o == null ? "" : o;
+ }
+
+ public static void setRepositoryConfigString(Repository r, String field, String value) {
+ StoredConfig c = readConfig(r);
+ if (c == null) {
+ throw new RuntimeException("Can't find stored config for " + r);
+ }
+ c.setString("gitblit", null, field, value);
+ try {
+ c.save();
+ } catch (IOException e) {
+ LOGGER.error("Failed to save repository config field " + field, e);
+ }
+ }
+
+ public static boolean getRepositoryConfigBoolean(Repository r, String field, boolean defaultValue) {
+ StoredConfig c = readConfig(r);
+ if (c == null) {
+ return defaultValue;
+ }
+ return c.getBoolean("gitblit", null, field, defaultValue);
+ }
+
+ public static void setRepositoryConfigBoolean(Repository r, String field, boolean value) {
+ StoredConfig c = readConfig(r);
+ if (c == null) {
+ throw new RuntimeException("Can't find stored config for " + r);
+ }
+ c.setBoolean("gitblit", null, field, value);
+ try {
+ c.save();
+ } catch (IOException e) {
+ LOGGER.error("Failed to save repository config field " + field, e);
+ }
}
private static StoredConfig readConfig(Repository r) {
@@ -523,38 +882,67 @@
}
public static List<Metric> getDateMetrics(Repository r) {
- final Map<String, Metric> map = new HashMap<String, Metric>();
+ final List<RefModel> tags = getTags(r, -1);
+ final Map<ObjectId, RefModel> tagMap = new HashMap<ObjectId, RefModel>();
+ for (RefModel tag : tags) {
+ tagMap.put(tag.getCommitId(), tag);
+ }
+ Metric total = new Metric("TOTAL");
+ final Map<String, Metric> metricMap = new HashMap<String, Metric>();
try {
- DateFormat df = new SimpleDateFormat("yyyy-MM");
RevWalk walk = new RevWalk(r);
ObjectId object = r.resolve(Constants.HEAD);
- walk.markStart(walk.parseCommit(object));
+
+ RevCommit firstCommit = getFirstCommit(r, Constants.HEAD);
+ RevCommit lastCommit = walk.parseCommit(object);
+ int diffDays = (lastCommit.getCommitTime() - firstCommit.getCommitTime()) / (60 * 60 * 24);
+ total.duration = diffDays;
+ DateFormat df;
+ if (diffDays <= 90) {
+ // Days
+ df = new SimpleDateFormat("yyyy-MM-dd");
+ } else if (diffDays > 90 && diffDays < 365) {
+ // Weeks
+ df = new SimpleDateFormat("yyyy-MM (w)");
+ } else {
+ // Months
+ df = new SimpleDateFormat("yyyy-MM");
+ }
+ walk.markStart(lastCommit);
+
Iterable<RevCommit> revlog = walk;
for (RevCommit rev : revlog) {
Date d = getCommitDate(rev);
String p = df.format(d);
- if (!map.containsKey(p))
- map.put(p, new Metric(p));
- map.get(p).count++;
+ if (!metricMap.containsKey(p))
+ metricMap.put(p, new Metric(p));
+ Metric m = metricMap.get(p);
+ m.count++;
+ total.count++;
+ if (tagMap.containsKey(rev.getId())) {
+ m.tag++;
+ total.tag++;
+ }
}
} catch (Throwable t) {
LOGGER.error("Failed to mine log history for metrics", t);
}
- List<String> keys = new ArrayList<String>(map.keySet());
+ List<String> keys = new ArrayList<String>(metricMap.keySet());
Collections.sort(keys);
List<Metric> metrics = new ArrayList<Metric>();
for (String key : keys) {
- metrics.add(map.get(key));
+ metrics.add(metricMap.get(key));
}
+ metrics.add(0, total);
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;
}
@@ -563,7 +951,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;
}
@@ -575,18 +963,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);
}
}
}
@@ -595,24 +983,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")) {
@@ -642,10 +1030,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