From a3bde69e9b3f3cc6212b0cd5fd7310b6a3301d8c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 01 Jun 2011 20:47:05 -0400
Subject: [PATCH] Documentation. Enforce ".git" suffix for created repositories.
---
src/com/gitblit/utils/JGitUtils.java | 566 ++++++++++++++++++++------------------------------------
1 files changed, 203 insertions(+), 363 deletions(-)
diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index 8814c1f..5f72c9a 100644
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -1,13 +1,27 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gitblit.utils;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
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;
@@ -15,8 +29,11 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.diff.DiffEntry;
@@ -54,38 +71,37 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-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;
+import com.gitblit.models.PathModel;
+import com.gitblit.models.PathModel.PathChangeModel;
+import com.gitblit.models.RefModel;
+import com.gitblit.models.TicketModel;
+import com.gitblit.models.TicketModel.Comment;
public class JGitUtils {
- /** Prefix for notes refs */
- public static final String R_NOTES = "refs/notes/";
+ static final Logger LOGGER = LoggerFactory.getLogger(JGitUtils.class);
- /** 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();
}
- public static List<String> getRepositoryList(File repositoriesFolder, boolean exportAll, boolean readNested) {
+ public static List<String> getRepositoryList(File repositoriesFolder, boolean exportAll,
+ boolean readNested) {
List<String> list = new ArrayList<String>();
- list.addAll(getNestedRepositories(repositoriesFolder, repositoriesFolder, exportAll, readNested));
+ list.addAll(getNestedRepositories(repositoriesFolder, repositoriesFolder, exportAll,
+ readNested));
Collections.sort(list);
return list;
}
- public static List<String> getNestedRepositories(File repositoriesFolder, File folder, boolean exportAll, boolean readNested) {
- String basefile = repositoriesFolder.getAbsolutePath();
+ public static List<String> getNestedRepositories(File repositoriesFolder, File folder,
+ boolean exportAll, boolean readNested) {
List<String> list = new ArrayList<String>();
+ if (folder == null || !folder.exists()) {
+ return list;
+ }
+ String basefile = repositoriesFolder.getAbsolutePath();
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
@@ -93,15 +109,20 @@
// 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;
}
}
- boolean exportRepository = isGitRepository && (exportAll || new File(gitFolder, "git-daemon-export-ok").exists());
+ boolean exportRepository = isGitRepository
+ && (exportAll || new File(gitFolder, "git-daemon-export-ok").exists());
if (exportRepository) {
// determine repository name relative to repositories folder
@@ -115,7 +136,8 @@
// look for nested repositories
if (readNested) {
- list.addAll(getNestedRepositories(repositoriesFolder, file, exportAll, readNested));
+ list.addAll(getNestedRepositories(repositoriesFolder, file, exportAll,
+ readNested));
}
}
}
@@ -123,6 +145,9 @@
}
public static RevCommit getFirstCommit(Repository r, String branch) {
+ if (!hasCommits(r)) {
+ return null;
+ }
if (StringUtils.isEmpty(branch)) {
branch = Constants.HEAD;
}
@@ -141,30 +166,42 @@
}
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());
+ RevCommit commit = getFirstCommit(r, branch);
+ if (commit == null) {
+ if (r == null || !r.getDirectory().exists()) {
+ return new Date(0);
}
- return getCommitDate(commit);
- } catch (Throwable t) {
- LOGGER.error("Failed to determine first change", t);
+ // fresh repository
+ return new Date(r.getDirectory().lastModified());
}
- return null;
+ return getCommitDate(commit);
}
- public static Date getLastChange(Repository r) {
- RevCommit commit = getCommit(r, Constants.HEAD);
- if (commit == null) {
- // fresh repository
- return new Date(r.getDirectory().lastModified());
+ public static boolean hasCommits(Repository r) {
+ if (r != null && r.getDirectory().exists()) {
+ return new File(r.getDirectory(), Constants.R_HEADS).list().length > 0;
}
+ return false;
+ }
+
+ public static Date getLastChange(Repository r) {
+ if (!hasCommits(r)) {
+ // null repository
+ if (r == null) {
+ return new Date(0);
+ }
+ // fresh repository
+ 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;
@@ -175,7 +212,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;
}
@@ -183,13 +220,13 @@
public static Map<ObjectId, List<String>> getAllRefs(Repository r) {
Map<ObjectId, List<String>> refs = new HashMap<ObjectId, List<String>>();
Map<AnyObjectId, Set<Ref>> allRefs = r.getAllRefsByPeeledObjectId();
- for (AnyObjectId id : allRefs.keySet()) {
+ for (Entry<AnyObjectId, Set<Ref>> setRefs : allRefs.entrySet()) {
List<String> list = new ArrayList<String>();
- for (Ref setRef : allRefs.get(id)) {
+ for (Ref setRef : setRefs.getValue()) {
String name = setRef.getName();
list.add(name);
}
- refs.put(id.toObjectId(), list);
+ refs.put(setRefs.getKey().toObjectId(), list);
}
return refs;
}
@@ -197,15 +234,15 @@
public static Map<ObjectId, List<String>> getRefs(Repository r, String baseRef) {
Map<ObjectId, List<String>> refs = new HashMap<ObjectId, List<String>>();
Map<AnyObjectId, Set<Ref>> allRefs = r.getAllRefsByPeeledObjectId();
- for (AnyObjectId id : allRefs.keySet()) {
+ for (Entry<AnyObjectId, Set<Ref>> setRefs : allRefs.entrySet()) {
List<String> list = new ArrayList<String>();
- for (Ref setRef : allRefs.get(id)) {
+ for (Ref setRef : setRefs.getValue()) {
String name = setRef.getName();
if (name.startsWith(baseRef)) {
list.add(name);
}
}
- refs.put(id.toObjectId(), list);
+ refs.put(setRefs.getKey().toObjectId(), list);
}
return refs;
}
@@ -265,14 +302,14 @@
}
public static String getRawContentAsString(Repository r, RevBlob blob) {
- byte [] content = getRawContent(r, blob);
- return new String(content, Charset.forName("UTF-8"));
+ 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);
- byte [] content = getRawContent(r, (RevBlob) obj);
- return new String(content, Charset.forName("UTF-8"));
+ 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) {
@@ -327,30 +364,47 @@
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());
- 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);
- walk.setFilter(TreeFilter.ANY_DIFF);
+ if (commit.getParentCount() == 0) {
+ walk.addTree(commitTree);
+ while (walk.next()) {
+ list.add(new PathChangeModel(walk.getPathString(), walk.getPathString(), 0,
+ walk.getRawMode(0), commit.getId().getName(), ChangeType.ADD));
+ }
+ } else {
+ RevCommit parent = rw.parseCommit(commit.getParent(0).getId());
+ RevTree parentTree = parent.getTree();
+ 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) {
- 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()));
+ 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) {
+ 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) {
@@ -358,16 +412,16 @@
}
return list;
}
-
+
public static List<PathModel> getDocuments(Repository r, List<String> extensions) {
List<PathModel> list = new ArrayList<PathModel>();
- RevCommit commit = getCommit(r, Constants.HEAD);
+ 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) {
+ for (String extension : extensions) {
if (extension.charAt(0) == '.') {
suffixFilters.add(PathSuffixFilter.create(extension));
} else {
@@ -419,136 +473,6 @@
}
}
- 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 {
- 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(baseTree);
- walk.addTree(commitTree);
- walk.setFilter(TreeFilter.ANY_DIFF);
-
- final ByteArrayOutputStream os = new ByteArrayOutputStream();
- RawTextComparator cmp = RawTextComparator.DEFAULT;
- DiffFormatter df;
- 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(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 (df instanceof GitWebDiffFormatter) {
- // workaround for complex private methods in DiffFormatter
- 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) {
- LOGGER.error("failed to generate commit diff!", t);
- }
- return null;
- }
-
private static PathModel getPathModel(TreeWalk walk, String basePath, RevCommit commit) {
String name;
long size = 0;
@@ -563,12 +487,14 @@
}
try {
if (!walk.isSubtree()) {
- size = walk.getObjectReader().getObjectSize(walk.getObjectId(0), Constants.OBJ_BLOB);
+ size = walk.getObjectReader()
+ .getObjectSize(walk.getObjectId(0), Constants.OBJ_BLOB);
}
} catch (Throwable t) {
LOGGER.error("Failed to retrieve blob size", t);
}
- return new PathModel(name, walk.getPathString(), size, walk.getFileMode(0).getBits(), commit.getName());
+ return new PathModel(name, walk.getPathString(), size, walk.getFileMode(0).getBits(),
+ commit.getName());
}
public static String getPermissionsFromMode(int mode) {
@@ -591,10 +517,6 @@
return "" + mode;
}
- public static boolean isTreeFromMode(int mode) {
- return FileMode.TREE.equals(mode);
- }
-
public static List<RevCommit> getRevLog(Repository r, int maxCount) {
return getRevLog(r, Constants.HEAD, 0, maxCount);
}
@@ -603,8 +525,12 @@
return getRevLog(r, objectId, null, offset, maxCount);
}
- public static List<RevCommit> getRevLog(Repository r, String objectId, String path, int offset, int maxCount) {
+ 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;
@@ -613,7 +539,9 @@
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);
+ TreeFilter filter = AndTreeFilter.create(
+ PathFilterGroup.createFromStrings(Collections.singleton(path)),
+ TreeFilter.ANY_DIFF);
walk.setTreeFilter(filter);
}
Iterable<RevCommit> revlog = walk;
@@ -660,9 +588,13 @@
}
}
- public static List<RevCommit> searchRevlogs(Repository r, String objectId, String value, final SearchType type, int offset, int maxCount) {
+ 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;
@@ -676,12 +608,17 @@
}
@Override
- public boolean include(RevWalk walker, RevCommit commit) throws StopWalkException, MissingObjectException, IncorrectObjectTypeException, IOException {
+ 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);
+ 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);
+ return (commit.getCommitterIdent().getName().toLowerCase().indexOf(lcValue) > -1)
+ || (commit.getCommitterIdent().getEmailAddress().toLowerCase()
+ .indexOf(lcValue) > -1);
case COMMIT:
return commit.getFullMessage().toLowerCase().indexOf(lcValue) > -1;
}
@@ -734,10 +671,10 @@
List<RefModel> list = new ArrayList<RefModel>();
try {
Map<String, Ref> map = r.getRefDatabase().getRefs(refs);
- for (String name : map.keySet()) {
- Ref ref = map.get(name);
+ for (Entry<String, Ref> entry : map.entrySet()) {
+ Ref ref = entry.getValue();
RevCommit commit = getCommit(r, ref.getObjectId().getName());
- list.add(new RefModel(name, ref, commit));
+ list.add(new RefModel(entry.getKey(), ref, commit));
}
Collections.sort(list);
Collections.reverse(list);
@@ -751,10 +688,11 @@
}
public static Ref getRef(Repository r, String id) {
+ // FIXME
try {
Map<String, Ref> map = r.getRefDatabase().getRefs(id);
- for (String name : map.keySet()) {
- return map.get(name);
+ for (Entry<String, Ref> entry : map.entrySet()) {
+ return entry.getValue();
}
} catch (IOException e) {
LOGGER.error("Failed to retrieve ref " + id, e);
@@ -763,7 +701,7 @@
}
public static Date getCommitDate(RevCommit commit) {
- return new Date(commit.getCommitTime() * 1000l);
+ return new Date(commit.getCommitTime() * 1000L);
}
public static String getDisplayName(PersonIdent person) {
@@ -771,102 +709,11 @@
r.append(person.getName());
r.append(" <");
r.append(person.getEmailAddress());
- r.append(">");
+ r.append('>');
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 {
@@ -881,68 +728,61 @@
return null;
}
- 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);
+ public static boolean zip(Repository r, String basePath, String objectId, OutputStream os)
+ throws Exception {
+ RevCommit commit = getCommit(r, objectId);
+ if (commit == null) {
+ return false;
}
- Metric total = new Metric("TOTAL");
- final Map<String, Metric> metricMap = new HashMap<String, Metric>();
+ final RevWalk rw = new RevWalk(r);
+ final TreeWalk walk = new TreeWalk(r);
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");
+ walk.addTree(commit.getTree());
+ ZipOutputStream zos = new ZipOutputStream(os);
+ zos.setComment("Generated by Git:Blit");
+ if (basePath != null && basePath.length() > 0) {
+ PathFilter f = PathFilter.create(basePath);
+ walk.setFilter(f);
}
- walk.markStart(lastCommit);
+ walk.setRecursive(true);
+ while (walk.next()) {
+ ZipEntry entry = new ZipEntry(walk.getPathString());
+ entry.setSize(walk.getObjectReader().getObjectSize(walk.getObjectId(0),
+ Constants.OBJ_BLOB));
+ entry.setComment(commit.getName());
+ zos.putNextEntry(entry);
- 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++;
+ ObjectId entid = walk.getObjectId(0);
+ FileMode entmode = walk.getFileMode(0);
+ RevBlob blob = (RevBlob) rw.lookupAny(entid, entmode.getObjectType());
+ rw.parseBody(blob);
+
+ ObjectLoader ldr = r.open(blob.getId(), Constants.OBJ_BLOB);
+ byte[] tmp = new byte[4096];
+ InputStream in = ldr.openStream();
+ int n;
+ while ((n = in.read(tmp)) > 0) {
+ zos.write(tmp, 0, n);
}
+ in.close();
}
- } catch (Throwable t) {
- LOGGER.error("Failed to mine log history for metrics", t);
+ zos.finish();
+ return true;
+ } catch (IOException e) {
+ LOGGER.error("Failed to zip files from commit " + commit.getName(), e);
+ } finally {
+ walk.release();
+ rw.dispose();
}
- List<String> keys = new ArrayList<String>(metricMap.keySet());
- Collections.sort(keys);
- List<Metric> metrics = new ArrayList<Metric>();
- for (String key : keys) {
- metrics.add(metricMap.get(key));
- }
- metrics.add(0, total);
- return metrics;
+ return false;
}
-
+
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")) {
+ if (ref.displayName.endsWith("ticgit")) {
ticgitBranch = ref;
break;
}
@@ -951,7 +791,7 @@
// search for ticgit branch in remote heads
if (ticgitBranch == null) {
for (RefModel ref : getRemoteBranches(r, -1)) {
- if (ref.getDisplayName().endsWith("ticgit")) {
+ if (ref.displayName.endsWith("ticgit")) {
ticgitBranch = ref;
break;
}
@@ -965,7 +805,7 @@
public static List<TicketModel> getTickets(Repository r) {
RefModel ticgitBranch = getTicketsBranch(r);
- List<PathModel> paths = getFilesInPath(r, null, ticgitBranch.getCommit());
+ List<PathModel> paths = getFilesInPath(r, null, ticgitBranch.commit);
List<TicketModel> tickets = new ArrayList<TicketModel>();
for (PathModel ticketFolder : paths) {
if (ticketFolder.isTree()) {
@@ -998,9 +838,9 @@
}
private static void readTicketContents(Repository r, RefModel ticketsBranch, TicketModel ticket) {
- List<PathModel> ticketFiles = getFilesInPath(r, ticket.name, ticketsBranch.getCommit());
+ List<PathModel> ticketFiles = getFilesInPath(r, ticket.name, ticketsBranch.commit);
for (PathModel file : ticketFiles) {
- String content = getRawContentAsString(r, ticketsBranch.getCommit(), file.path).trim();
+ String content = getRawContentAsString(r, ticketsBranch.commit, file.path).trim();
if (file.name.equals("TICKET_ID")) {
ticket.id = content;
} else if (file.name.equals("TITLE")) {
@@ -1033,7 +873,7 @@
public static String getTicketContent(Repository r, String filePath) {
RefModel ticketsBranch = getTicketsBranch(r);
if (ticketsBranch != null) {
- return getRawContentAsString(r, ticketsBranch.getCommit(), filePath);
+ return getRawContentAsString(r, ticketsBranch.commit, filePath);
}
return "";
}
--
Gitblit v1.9.1