From 00afd77a2182ece3d9522d41b86b4ddd7e132288 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 19 May 2011 17:13:50 -0400
Subject: [PATCH] Owner editing. Frozen status. Grouped repositories. Documentation.
---
src/com/gitblit/utils/JGitUtils.java | 272 ++++++++++++++++++++++++------------------------------
1 files changed, 120 insertions(+), 152 deletions(-)
diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index eddd3df..c9c13c5 100644
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -4,10 +4,12 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+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;
@@ -43,8 +45,10 @@
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;
@@ -59,14 +63,8 @@
public class JGitUtils {
- /** Prefix for notes refs */
- public static final String R_NOTES = "refs/notes/";
-
- /** Standard notes ref */
- 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();
@@ -82,6 +80,9 @@
public static List<String> getNestedRepositories(File repositoriesFolder, File folder, boolean exportAll, boolean readNested) {
String basefile = repositoriesFolder.getAbsolutePath();
List<String> list = new ArrayList<String>();
+ if (folder == null || !folder.exists()) {
+ return list;
+ }
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
@@ -89,10 +90,11 @@
// 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
+
+ // then look for folder.git/HEAD or folder/HEAD and
+ // folder/config
if (!isGitRepository) {
- if (file.getName().endsWith(Constants.DOT_GIT_EXT) && new File(file, Constants.HEAD).exists()) {
+ if ((file.getName().endsWith(Constants.DOT_GIT_EXT) && new File(file, Constants.HEAD).exists()) || (new File(file, "config").exists() && new File(file, Constants.HEAD).exists())) {
gitFolder = file;
isGitRepository = true;
}
@@ -119,6 +121,9 @@
}
public static RevCommit getFirstCommit(Repository r, String branch) {
+ if (!hasCommits(r)) {
+ return null;
+ }
if (StringUtils.isEmpty(branch)) {
branch = Constants.HEAD;
}
@@ -141,7 +146,7 @@
RevCommit commit = getFirstCommit(r, branch);
if (commit == null) {
// fresh repository
- return new Date(r.getDirectory().lastModified());
+ return new Date(r.getDirectory().lastModified());
}
return getCommitDate(commit);
} catch (Throwable t) {
@@ -150,17 +155,24 @@
return null;
}
- public static Date getLastChange(Repository r) {
- RevCommit commit = getCommit(r, Constants.HEAD);
- if (commit == null) {
+ public static boolean hasCommits(Repository r) {
+ return new File(r.getDirectory(), Constants.R_HEADS).list().length > 0;
+ }
+
+ public static Date getLastChange(Repository r) {
+ if (!hasCommits(r)) {
// fresh repository
- return new Date(r.getDirectory().lastModified());
+ return new Date(r.getDirectory().lastModified());
}
+ RevCommit commit = getCommit(r, Constants.HEAD);
return getCommitDate(commit);
}
public static RevCommit getCommit(Repository r, String objectId) {
RevCommit commit = null;
+ if (!hasCommits(r)) {
+ return null;
+ }
try {
if (objectId == null || objectId.trim().length() == 0) {
objectId = Constants.HEAD;
@@ -171,7 +183,7 @@
commit = rev;
walk.dispose();
} catch (Throwable t) {
- LOGGER.error("Failed to determine last change", t);
+ LOGGER.error("Failed to get commit " + objectId, t);
}
return commit;
}
@@ -261,12 +273,14 @@
}
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(Constants.CHARACTER_ENCODING));
}
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(Constants.CHARACTER_ENCODING));
}
public static List<PathModel> getFilesInPath(Repository r, String basePath, String objectId) {
@@ -321,6 +335,10 @@
public static List<PathChangeModel> getFilesInCommit(Repository r, RevCommit commit) {
List<PathChangeModel> list = new ArrayList<PathChangeModel>();
+ if (commit == null) {
+ LOGGER.warn("getFilesInCommit for NULL commit");
+ return list;
+ }
try {
final RevWalk rw = new RevWalk(r);
RevCommit parent = rw.parseCommit(commit.getParent(0).getId());
@@ -350,6 +368,42 @@
} catch (Throwable t) {
LOGGER.error("failed to determine files in commit!", t);
}
+ return list;
+ }
+
+ 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;
}
@@ -563,6 +617,9 @@
public static List<RevCommit> getRevLog(Repository r, String objectId, String path, int offset, int maxCount) {
List<RevCommit> list = new ArrayList<RevCommit>();
+ if (!hasCommits(r)) {
+ return list;
+ }
try {
if (objectId == null || objectId.trim().length() == 0) {
objectId = Constants.HEAD;
@@ -621,6 +678,9 @@
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>();
+ if (!hasCommits(r)) {
+ return list;
+ }
try {
if (objectId == null || objectId.trim().length() == 0) {
objectId = Constants.HEAD;
@@ -733,98 +793,7 @@
return r.toString();
}
- public static String getRepositoryDescription(Repository r) {
- 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("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) {
+ public static StoredConfig readConfig(Repository r) {
StoredConfig c = r.getConfig();
if (c != null) {
try {
@@ -840,50 +809,53 @@
}
public static List<Metric> getDateMetrics(Repository r) {
- 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 {
- RevWalk walk = new RevWalk(r);
- ObjectId object = r.resolve(Constants.HEAD);
-
- 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");
+
+ if (hasCommits(r)) {
+ 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);
}
- walk.markStart(lastCommit);
+ try {
+ RevWalk walk = new RevWalk(r);
+ ObjectId object = r.resolve(Constants.HEAD);
- Iterable<RevCommit> revlog = walk;
- for (RevCommit rev : revlog) {
- Date d = getCommitDate(rev);
- String p = df.format(d);
- 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++;
+ 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 (!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);
}
- } catch (Throwable t) {
- LOGGER.error("Failed to mine log history for metrics", t);
}
List<String> keys = new ArrayList<String>(metricMap.keySet());
Collections.sort(keys);
@@ -893,10 +865,6 @@
}
metrics.add(0, total);
return metrics;
- }
-
- public static RefModel getDocumentsBranch(Repository r) {
- return getTicketsBranch(r);
}
public static RefModel getTicketsBranch(Repository r) {
--
Gitblit v1.9.1