From 4910c13d1049a03895972878ff268a10149ad033 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 23 Apr 2011 21:00:32 -0400
Subject: [PATCH] Restylized search form. Used GNOME's search icon.
---
src/com/gitblit/utils/JGitUtils.java | 187 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 148 insertions(+), 39 deletions(-)
diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index daeb638..df7be6b 100644
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -4,7 +4,6 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.io.RandomAccessFile;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -15,11 +14,13 @@
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.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
@@ -65,6 +66,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>();
@@ -79,8 +85,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) {
@@ -123,6 +139,10 @@
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);
@@ -130,8 +150,12 @@
return null;
}
- public static Date getLastChange(Repository r) {
+ 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);
}
@@ -252,6 +276,9 @@
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());
@@ -326,19 +353,43 @@
return list;
}
- public static String getCommitDiff(Repository r, RevCommit commit, boolean outputHtml) {
- return getCommitDiff(r, null, commit, null, 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 String getCommitDiff(Repository r, RevCommit commit, String path, boolean outputHtml) {
- return getCommitDiff(r, null, commit, path, outputHtml);
+ 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 baseCommit, RevCommit commit, boolean outputHtml) {
- return getCommitDiff(r, baseCommit, commit, null, outputHtml);
+ public static String getCommitDiff(Repository r, RevCommit commit, DiffOutputType outputType) {
+ return getCommitDiff(r, null, commit, null, outputType);
}
- public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit, String path, boolean outputHtml) {
+ 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 {
RevTree baseTree;
if (baseCommit == null) {
@@ -362,10 +413,17 @@
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);
@@ -382,9 +440,9 @@
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();
}
@@ -676,35 +734,86 @@
}
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 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 getRepositoryUseNamedUsers(Repository r) {
+ return getRepositoryConfigBoolean(r, "useNamedUsers", false);
+ }
+
+ public static void setRepositoryUseNamedUsers(Repository r, boolean value) {
+ setRepositoryConfigBoolean(r, "useNamedUsers", 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) {
@@ -750,21 +859,21 @@
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);
+ 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);
}
--
Gitblit v1.9.1