Unit testing. Start of git-notes display feature.

16 files changed, 360 insertions, 366 deletions

diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 7182d9b7..595a5ee1 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -142,7 +142,7 @@ public class GitBlit implements ServletContextListener {
 

 	public List<String> getRepositoryList() {

 		return JGitUtils.getRepositoryList(repositoriesFolder, exportAll,

-				storedSettings.getBoolean(Keys.git.nestedRepositories, true));

+				storedSettings.getBoolean(Keys.git.searchRepositoriesSubfolders, true));

 	}

 

 	public Repository getRepository(String repositoryName) {

diff --git a/src/com/gitblit/models/GitNote.java b/src/com/gitblit/models/GitNote.java
new file mode 100644
index 00000000..0083637c
--- /dev/null
+++ b/src/com/gitblit/models/GitNote.java
@@ -0,0 +1,31 @@
+/*

+ * 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.models;

+

+import java.io.Serializable;

+

+public class GitNote implements Serializable {

+

+	private static final long serialVersionUID = 1L;

+

+	public String content;

+	public RefModel notesRef;	

+

+	public GitNote(RefModel notesRef, String text) {

+		this.notesRef = notesRef;

+		this.content = text;

+	}

+}
\ No newline at end of file
diff --git a/src/com/gitblit/utils/DiffUtils.java b/src/com/gitblit/utils/DiffUtils.java
index 969cb916..fab9f43b 100644
--- a/src/com/gitblit/utils/DiffUtils.java
+++ b/src/com/gitblit/utils/DiffUtils.java
@@ -30,12 +30,23 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter;
 import org.slf4j.Logger;

 import org.slf4j.LoggerFactory;

 

-import com.gitblit.utils.JGitUtils.DiffOutputType;

-

 public class DiffUtils {

 

 	private static final Logger LOGGER = LoggerFactory.getLogger(DiffUtils.class);

 

+	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 getDiff(r, null, commit, null, outputType);

 	}

diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index 32602b94..fd2eaf36 100644
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -21,7 +21,6 @@ import java.io.IOException;
 import java.io.InputStream;

 import java.io.OutputStream;

 import java.nio.charset.Charset;

-import java.text.ParseException;

 import java.util.ArrayList;

 import java.util.Collection;

 import java.util.Collections;

@@ -31,7 +30,6 @@ 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;

 

@@ -52,6 +50,7 @@ import org.eclipse.jgit.lib.ObjectLoader;
 import org.eclipse.jgit.lib.PersonIdent;

 import org.eclipse.jgit.lib.Ref;

 import org.eclipse.jgit.lib.Repository;

+import org.eclipse.jgit.lib.RepositoryCache.FileKey;

 import org.eclipse.jgit.lib.StoredConfig;

 import org.eclipse.jgit.revwalk.RevBlob;

 import org.eclipse.jgit.revwalk.RevCommit;

@@ -67,77 +66,69 @@ 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.FS;

 import org.eclipse.jgit.util.io.DisabledOutputStream;

 import org.slf4j.Logger;

 import org.slf4j.LoggerFactory;

 

+import com.gitblit.models.GitNote;

 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 {

 

 	static final Logger LOGGER = LoggerFactory.getLogger(JGitUtils.class);

 

+	public static String getDisplayName(PersonIdent person) {

+		if (StringUtils.isEmpty(person.getEmailAddress())) {

+			return person.getName();

+		}

+		final StringBuilder r = new StringBuilder();

+		r.append(person.getName());

+		r.append(" <");

+		r.append(person.getEmailAddress());

+		r.append('>');

+		return r.toString().trim();

+	}

+

 	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) {

+			boolean searchSubfolders) {

 		List<String> list = new ArrayList<String>();

-		list.addAll(getNestedRepositories(repositoriesFolder, repositoriesFolder, exportAll,

-				readNested));

+		if (repositoriesFolder == null || !repositoriesFolder.exists()) {

+			return list;

+		}

+		list.addAll(getRepositoryList(repositoriesFolder.getAbsolutePath(), repositoriesFolder,

+				exportAll, searchSubfolders));

 		Collections.sort(list);

 		return list;

 	}

 

-	public static List<String> getNestedRepositories(File repositoriesFolder, File folder,

-			boolean exportAll, boolean readNested) {

+	private static List<String> getRepositoryList(String basePath, File searchFolder,

+			boolean exportAll, boolean searchSubfolders) {

 		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

-				//

-				// 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 or folder/HEAD and

-				// folder/config

-				if (!isGitRepository) {

-					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());

-

-				if (exportRepository) {

-					// determine repository name relative to repositories folder

-					String filename = file.getAbsolutePath();

-					String repo = filename.substring(basefile.length()).replace('\\', '/');

-					if (repo.charAt(0) == '/') {

-						repo = repo.substring(1);

+		for (File file : searchFolder.listFiles()) {

+			if (file.isDirectory()) {

+				File gitDir = FileKey.resolve(new File(searchFolder, file.getName()), FS.DETECTED);

+				if (gitDir != null) {

+					boolean exportRepository = exportAll

+							|| new File(gitDir, "git-daemon-export-ok").exists();

+

+					if (!exportRepository) {

+						continue;

 					}

-					list.add(repo);

-				}

-

-				// look for nested repositories

-				if (readNested) {

-					list.addAll(getNestedRepositories(repositoriesFolder, file, exportAll,

-							readNested));

+					// determine repository name relative to base path

+					String repository = StringUtils.getRelativePath(basePath,

+							file.getAbsolutePath());

+					list.add(repository);

+				} else if (searchSubfolders) {

+					// look for repositories in subfolders

+					list.addAll(getRepositoryList(basePath, file, exportAll, searchSubfolders));

 				}

 			}

 		}

@@ -151,18 +142,18 @@ public class JGitUtils {
 		if (StringUtils.isEmpty(branch)) {

 			branch = Constants.HEAD;

 		}

+		RevCommit commit = null;

 		try {

 			RevWalk walk = new RevWalk(r);

 			walk.sort(RevSort.REVERSE);

 			RevCommit head = walk.parseCommit(r.resolve(branch));

 			walk.markStart(head);

-			RevCommit commit = walk.next();

+			commit = walk.next();

 			walk.dispose();

-			return commit;

 		} catch (Throwable t) {

 			LOGGER.error("Failed to determine first commit", t);

 		}

-		return null;

+		return commit;

 	}

 

 	public static Date getFirstChange(Repository r, String branch) {

@@ -197,13 +188,17 @@ public class JGitUtils {
 		return getCommitDate(commit);

 	}

 

+	public static Date getCommitDate(RevCommit commit) {

+		return new Date(commit.getCommitTime() * 1000L);

+	}

+

 	public static RevCommit getCommit(Repository r, String objectId) {

-		RevCommit commit = null;

 		if (!hasCommits(r)) {

 			return null;

 		}

+		RevCommit commit = null;

 		try {

-			if (objectId == null || objectId.trim().length() == 0) {

+			if (StringUtils.isEmpty(objectId)) {

 				objectId = Constants.HEAD;

 			}

 			ObjectId object = r.resolve(objectId);

@@ -231,22 +226,6 @@ public class JGitUtils {
 		return refs;

 	}

 

-	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 (Entry<AnyObjectId, Set<Ref>> setRefs : allRefs.entrySet()) {

-			List<String> list = new ArrayList<String>();

-			for (Ref setRef : setRefs.getValue()) {

-				String name = setRef.getName();

-				if (name.startsWith(baseRef)) {

-					list.add(name);

-				}

-			}

-			refs.put(setRefs.getKey().toObjectId(), list);

-		}

-		return refs;

-	}

-

 	/**

 	 * Lookup an entry stored in a tree, failing if not present.

 	 * 

@@ -257,13 +236,17 @@ public class JGitUtils {
 	 * @return the parsed object entry at this path

 	 * @throws Exception

 	 */

-	public static RevObject getRevObject(Repository r, final RevTree tree, final String path) {

-		RevObject ro = null;

+	public static byte[] getRawContent(Repository r, RevCommit commit, final String path) {

 		RevWalk rw = new RevWalk(r);

 		TreeWalk tw = new TreeWalk(r);

 		tw.setFilter(PathFilterGroup.createFromStrings(Collections.singleton(path)));

+		byte[] content = null;

 		try {

-			tw.reset(tree);

+			if (commit == null) {

+				ObjectId object = r.resolve(Constants.HEAD);

+				commit = rw.parseCommit(object);

+			}

+			tw.reset(commit.getTree());

 			while (tw.next()) {

 				if (tw.isSubtree() && !path.equals(tw.getPathString())) {

 					tw.enterSubtree();

@@ -271,123 +254,104 @@ public class JGitUtils {
 				}

 				ObjectId entid = tw.getObjectId(0);

 				FileMode entmode = tw.getFileMode(0);

-				ro = rw.lookupAny(entid, entmode.getObjectType());

+				RevObject ro = rw.lookupAny(entid, entmode.getObjectType());

 				rw.parseBody(ro);

+				ByteArrayOutputStream os = new ByteArrayOutputStream();

+				ObjectLoader ldr = r.open(ro.getId(), Constants.OBJ_BLOB);

+				byte[] tmp = new byte[4096];

+				InputStream in = ldr.openStream();

+				int n;

+				while ((n = in.read(tmp)) > 0) {

+					os.write(tmp, 0, n);

+				}

+				in.close();

+				content = os.toByteArray();

 			}

 		} catch (Throwable t) {

-			LOGGER.error("Can't find " + path + " in tree " + tree.name(), t);

+			LOGGER.error("Can't find " + path + " in tree " + commit.getTree().name(), t);

 		} finally {

-			if (rw != null) {

-				rw.dispose();

-			}

-		}

-		return ro;

-	}

-

-	public static byte[] getRawContent(Repository r, RevBlob blob) {

-		ByteArrayOutputStream os = new ByteArrayOutputStream();

-		try {

-			ObjectLoader ldr = r.open(blob.getId(), Constants.OBJ_BLOB);

-			byte[] tmp = new byte[1024];

-			InputStream in = ldr.openStream();

-			int n;

-			while ((n = in.read(tmp)) > 0) {

-				os.write(tmp, 0, n);

-			}

-			in.close();

-		} catch (Throwable t) {

-			LOGGER.error("Failed to read raw content", t);

+			rw.dispose();

+			tw.release();

 		}

-		return os.toByteArray();

-	}

-

-	public static String getRawContentAsString(Repository r, RevBlob blob) {

-		byte[] content = getRawContent(r, blob);

-		return new String(content, Charset.forName(Constants.CHARACTER_ENCODING));

+		return content;

 	}

 

 	public static String getRawContentAsString(Repository r, RevCommit commit, String blobPath) {

-		RevObject obj = getRevObject(r, commit.getTree(), blobPath);

-		byte[] content = getRawContent(r, (RevBlob) obj);

+		byte[] content = getRawContent(r, commit, blobPath);

+		if (content == null) {

+			return null;

+		}

 		return new String(content, Charset.forName(Constants.CHARACTER_ENCODING));

 	}

 

-	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) {

+		if (!hasCommits(r)) {

 			return list;

 		}

-		final TreeWalk walk = new TreeWalk(r);

+		if (commit == null) {

+			commit = getCommit(r, Constants.HEAD);

+		}

+		final TreeWalk tw = new TreeWalk(r);

 		try {

-			walk.addTree(commit.getTree());

-			if (basePath != null && basePath.length() > 0) {

+			tw.addTree(commit.getTree());

+			if (!StringUtils.isEmpty(basePath)) {

 				PathFilter f = PathFilter.create(basePath);

-				walk.setFilter(f);

-				walk.setRecursive(false);

+				tw.setFilter(f);

+				tw.setRecursive(false);

 				boolean foundFolder = false;

-				while (walk.next()) {

-					if (!foundFolder && walk.isSubtree()) {

-						walk.enterSubtree();

+				while (tw.next()) {

+					if (!foundFolder && tw.isSubtree()) {

+						tw.enterSubtree();

 					}

-					if (walk.getPathString().equals(basePath)) {

+					if (tw.getPathString().equals(basePath)) {

 						foundFolder = true;

 						continue;

 					}

 					if (foundFolder) {

-						list.add(getPathModel(walk, basePath, commit));

+						list.add(getPathModel(tw, basePath, commit));

 					}

 				}

 			} else {

-				walk.setRecursive(false);

-				while (walk.next()) {

-					list.add(getPathModel(walk, null, commit));

+				tw.setRecursive(false);

+				while (tw.next()) {

+					list.add(getPathModel(tw, null, commit));

 				}

 			}

 		} catch (IOException e) {

 			LOGGER.error("Failed to get files for commit " + commit.getName(), e);

 		} finally {

-			walk.release();

+			tw.release();

 		}

 		Collections.sort(list);

 		return list;

 	}

 

-	public static List<PathChangeModel> getFilesInCommit(Repository r, String commitId) {

-		RevCommit commit = getCommit(r, commitId);

-		return getFilesInCommit(r, commit);

-	}

-

 	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;

-		}

+		RevWalk rw = new RevWalk(r);

+		TreeWalk tw = new TreeWalk(r);

 		try {

-			final RevWalk rw = new RevWalk(r);

-

+			if (commit == null) {

+				ObjectId object = r.resolve(Constants.HEAD);

+				commit = rw.parseCommit(object);

+			}

 			RevTree commitTree = commit.getTree();

 

-			final TreeWalk walk = new TreeWalk(r);

-			walk.reset();

-			walk.setRecursive(true);

+			tw.reset();

+			tw.setRecursive(true);

 			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));

+				tw.addTree(commitTree);

+				while (tw.next()) {

+					list.add(new PathChangeModel(tw.getPathString(), tw.getPathString(), 0, tw

+							.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);

+				tw.addTree(parentTree);

+				tw.addTree(commitTree);

+				tw.setFilter(TreeFilter.ANY_DIFF);

 

 				RawTextComparator cmp = RawTextComparator.DEFAULT;

 				DiffFormatter df = new DiffFormatter(DisabledOutputStream.INSTANCE);

@@ -409,6 +373,9 @@ public class JGitUtils {
 			}

 		} catch (Throwable t) {

 			LOGGER.error("failed to determine files in commit!", t);

+		} finally {

+			rw.dispose();

+			tw.release();

 		}

 		return list;

 	}

@@ -416,84 +383,51 @@ public class JGitUtils {
 	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);

+		final TreeWalk tw = new TreeWalk(r);

 		try {

-			walk.addTree(commit.getTree());

+			tw.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));

+						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));

-				}

+				tw.setFilter(filter);

+				tw.setRecursive(true);

+			}

+			while (tw.next()) {

+				list.add(getPathModel(tw, null, commit));

 			}

 		} catch (IOException e) {

-			LOGGER.error("Failed to get files for commit " + commit.getName(), e);

+			LOGGER.error("Failed to get documents for commit " + commit.getName(), e);

 		} finally {

-			walk.release();

+			tw.release();

 		}

 		Collections.sort(list);

 		return list;

 	}

 

-	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;

-		}

-	}

-

-	private static PathModel getPathModel(TreeWalk walk, String basePath, RevCommit commit) {

+	private static PathModel getPathModel(TreeWalk tw, String basePath, RevCommit commit) {

 		String name;

 		long size = 0;

-		if (basePath == null) {

-			name = walk.getPathString();

+		if (StringUtils.isEmpty(basePath)) {

+			name = tw.getPathString();

 		} else {

-			try {

-				name = walk.getPathString().substring(basePath.length() + 1);

-			} catch (Throwable t) {

-				name = walk.getPathString();

-			}

+			name = tw.getPathString().substring(basePath.length() + 1);

 		}

 		try {

-			if (!walk.isSubtree()) {

-				size = walk.getObjectReader()

-						.getObjectSize(walk.getObjectId(0), Constants.OBJ_BLOB);

+			if (!tw.isSubtree()) {

+				size = tw.getObjectReader().getObjectSize(tw.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(),

+		return new PathModel(name, tw.getPathString(), size, tw.getFileMode(0).getBits(),

 				commit.getName());

 	}

 

@@ -510,11 +444,9 @@ public class JGitUtils {
 		} else if (FileMode.GITLINK.equals(mode)) {

 			// FIXME gitlink permissions

 			return "gitlink";

-		} else if (FileMode.MISSING.equals(mode)) {

-			// FIXME missing permissions

-			return "missing";

 		}

-		return "" + mode;

+		// FIXME missing permissions

+		return "missing";

 	}

 

 	public static List<RevCommit> getRevLog(Repository r, int maxCount) {

@@ -532,19 +464,19 @@ public class JGitUtils {
 			return list;

 		}

 		try {

-			if (objectId == null || objectId.trim().length() == 0) {

+			if (StringUtils.isEmpty(objectId)) {

 				objectId = Constants.HEAD;

 			}

-			RevWalk walk = new RevWalk(r);

+			RevWalk rw = new RevWalk(r);

 			ObjectId object = r.resolve(objectId);

-			walk.markStart(walk.parseCommit(object));

+			rw.markStart(rw.parseCommit(object));

 			if (!StringUtils.isEmpty(path)) {

 				TreeFilter filter = AndTreeFilter.create(

 						PathFilterGroup.createFromStrings(Collections.singleton(path)),

 						TreeFilter.ANY_DIFF);

-				walk.setTreeFilter(filter);

+				rw.setTreeFilter(filter);

 			}

-			Iterable<RevCommit> revlog = walk;

+			Iterable<RevCommit> revlog = rw;

 			if (offset > 0) {

 				int count = 0;

 				for (RevCommit rev : revlog) {

@@ -564,9 +496,9 @@ public class JGitUtils {
 					}

 				}

 			}

-			walk.dispose();

+			rw.dispose();

 		} catch (Throwable t) {

-			LOGGER.error("Failed to determine last change", t);

+			LOGGER.error("Failed to get revlog", t);

 		}

 		return list;

 	}

@@ -580,9 +512,10 @@ public class JGitUtils {
 					return type;

 				}

 			}

-			return null;

+			return COMMIT;

 		}

 

+		@Override

 		public String toString() {

 			return name().toLowerCase();

 		}

@@ -596,11 +529,11 @@ public class JGitUtils {
 			return list;

 		}

 		try {

-			if (objectId == null || objectId.trim().length() == 0) {

+			if (StringUtils.isEmpty(objectId)) {

 				objectId = Constants.HEAD;

 			}

-			RevWalk walk = new RevWalk(r);

-			walk.setRevFilter(new RevFilter() {

+			RevWalk rw = new RevWalk(r);

+			rw.setRevFilter(new RevFilter() {

 

 				@Override

 				public RevFilter clone() {

@@ -610,25 +543,30 @@ public class JGitUtils {
 				@Override

 				public boolean include(RevWalk walker, RevCommit commit) throws StopWalkException,

 						MissingObjectException, IncorrectObjectTypeException, IOException {

+					boolean include = false;

 					switch (type) {

 					case AUTHOR:

-						return (commit.getAuthorIdent().getName().toLowerCase().indexOf(lcValue) > -1)

+						include = (commit.getAuthorIdent().getName().toLowerCase().indexOf(lcValue) > -1)

 								|| (commit.getAuthorIdent().getEmailAddress().toLowerCase()

 										.indexOf(lcValue) > -1);

+						break;

 					case COMMITTER:

-						return (commit.getCommitterIdent().getName().toLowerCase().indexOf(lcValue) > -1)

+						include = (commit.getCommitterIdent().getName().toLowerCase()

+								.indexOf(lcValue) > -1)

 								|| (commit.getCommitterIdent().getEmailAddress().toLowerCase()

 										.indexOf(lcValue) > -1);

+						break;

 					case COMMIT:

-						return commit.getFullMessage().toLowerCase().indexOf(lcValue) > -1;

+						include = commit.getFullMessage().toLowerCase().indexOf(lcValue) > -1;

+						break;

 					}

-					return false;

+					return include;

 				}

 

 			});

 			ObjectId object = r.resolve(objectId);

-			walk.markStart(walk.parseCommit(object));

-			Iterable<RevCommit> revlog = walk;

+			rw.markStart(rw.parseCommit(object));

+			Iterable<RevCommit> revlog = rw;

 			if (offset > 0) {

 				int count = 0;

 				for (RevCommit rev : revlog) {

@@ -648,9 +586,9 @@ public class JGitUtils {
 					}

 				}

 			}

-			walk.dispose();

+			rw.dispose();

 		} catch (Throwable t) {

-			LOGGER.error("Failed to determine last change", t);

+			LOGGER.error("Failed to search revlogs", t);

 		}

 		return list;

 	}

@@ -667,7 +605,11 @@ public class JGitUtils {
 		return getRefs(r, Constants.R_REMOTES, maxCount);

 	}

 

-	public static List<RefModel> getRefs(Repository r, String refs, int maxCount) {

+	public static List<RefModel> getNotes(Repository r, int maxCount) {

+		return getRefs(r, Constants.R_NOTES, maxCount);

+	}

+

+	private static List<RefModel> getRefs(Repository r, String refs, int maxCount) {

 		List<RefModel> list = new ArrayList<RefModel>();

 		try {

 			Map<String, Ref> map = r.getRefDatabase().getRefs(refs);

@@ -687,45 +629,32 @@ public class JGitUtils {
 		return list;

 	}

 

-	public static Ref getRef(Repository r, String id) {

-		// FIXME

-		try {

-			Map<String, Ref> map = r.getRefDatabase().getRefs(id);

-			for (Entry<String, Ref> entry : map.entrySet()) {

-				return entry.getValue();

+	public static List<GitNote> getNotesOnCommit(Repository repository, RevCommit commit) {

+		List<GitNote> list = new ArrayList<GitNote>();

+		List<RefModel> notesRefs = getNotes(repository, -1);

+		for (RefModel notesRef : notesRefs) {

+			RevCommit notes = JGitUtils.getCommit(repository, notesRef.getName());

+			StringBuilder sb = new StringBuilder(commit.getName());

+			sb.insert(2, '/');

+			String text = getRawContentAsString(repository, notes, sb.toString());

+			if (!StringUtils.isEmpty(text)) {

+				GitNote gitNote = new GitNote(notesRef, text);

+				list.add(gitNote);

 			}

-		} catch (IOException e) {

-			LOGGER.error("Failed to retrieve ref " + id, e);

 		}

-		return null;

-	}

-

-	public static Date getCommitDate(RevCommit commit) {

-		return new Date(commit.getCommitTime() * 1000L);

-	}

-

-	public static String getDisplayName(PersonIdent person) {

-		final StringBuilder r = new StringBuilder();

-		r.append(person.getName());

-		r.append(" <");

-		r.append(person.getEmailAddress());

-		r.append('>');

-		return r.toString();

+		return list;

 	}

 

 	public static StoredConfig readConfig(Repository r) {

 		StoredConfig c = r.getConfig();

-		if (c != null) {

-			try {

-				c.load();

-			} catch (ConfigInvalidException cex) {

-				LOGGER.error("Repository configuration is invalid!", cex);

-			} catch (IOException cex) {

-				LOGGER.error("Could not open repository configuration!", cex);

-			}

-			return c;

+		try {

+			c.load();

+		} catch (ConfigInvalidException cex) {

+			LOGGER.error("Repository configuration is invalid!", cex);

+		} catch (IOException cex) {

+			LOGGER.error("Could not open repository configuration!", cex);

 		}

-		return null;

+		return c;

 	}

 

 	public static boolean zip(Repository r, String basePath, String objectId, OutputStream os)

@@ -734,26 +663,27 @@ public class JGitUtils {
 		if (commit == null) {

 			return false;

 		}

-		final RevWalk rw = new RevWalk(r);

-		final TreeWalk walk = new TreeWalk(r);

+		boolean success = false;

+		RevWalk rw = new RevWalk(r);

+		TreeWalk tw = new TreeWalk(r);

 		try {

-			walk.addTree(commit.getTree());

+			tw.addTree(commit.getTree());

 			ZipOutputStream zos = new ZipOutputStream(os);

 			zos.setComment("Generated by Git:Blit");

-			if (basePath != null && basePath.length() > 0) {

+			if (!StringUtils.isEmpty(basePath)) {

 				PathFilter f = PathFilter.create(basePath);

-				walk.setFilter(f);

+				tw.setFilter(f);

 			}

-			walk.setRecursive(true);

-			while (walk.next()) {

-				ZipEntry entry = new ZipEntry(walk.getPathString());

-				entry.setSize(walk.getObjectReader().getObjectSize(walk.getObjectId(0),

+			tw.setRecursive(true);

+			while (tw.next()) {

+				ZipEntry entry = new ZipEntry(tw.getPathString());

+				entry.setSize(tw.getObjectReader().getObjectSize(tw.getObjectId(0),

 						Constants.OBJ_BLOB));

 				entry.setComment(commit.getName());

 				zos.putNextEntry(entry);

 

-				ObjectId entid = walk.getObjectId(0);

-				FileMode entmode = walk.getFileMode(0);

+				ObjectId entid = tw.getObjectId(0);

+				FileMode entmode = tw.getFileMode(0);

 				RevBlob blob = (RevBlob) rw.lookupAny(entid, entmode.getObjectType());

 				rw.parseBody(blob);

 

@@ -767,13 +697,13 @@ public class JGitUtils {
 				in.close();

 			}

 			zos.finish();

-			return true;

+			success = true;

 		} catch (IOException e) {

 			LOGGER.error("Failed to zip files from commit " + commit.getName(), e);

 		} finally {

-			walk.release();

+			tw.release();

 			rw.dispose();

 		}

-		return false;

+		return success;

 	}

 }

diff --git a/src/com/gitblit/utils/MarkdownUtils.java b/src/com/gitblit/utils/MarkdownUtils.java
index 15d59cfe..697fa99b 100644
--- a/src/com/gitblit/utils/MarkdownUtils.java
+++ b/src/com/gitblit/utils/MarkdownUtils.java
@@ -26,22 +26,10 @@ import org.tautua.markdownpapers.parser.ParseException;
 public class MarkdownUtils {

 

 	public static String transformMarkdown(String markdown) throws java.text.ParseException {

-		// Read raw markdown content and transform it to html

-		StringReader reader = new StringReader(markdown);

-		StringWriter writer = new StringWriter();

 		try {

-			Markdown md = new Markdown();

-			md.transform(reader, writer);

-			return writer.toString();

-		} catch (ParseException p) {

-			throw new java.text.ParseException(p.getMessage(), 0);

-		} finally {

-			reader.close();

-			try {

-				writer.close();

-			} catch (IOException e) {

-				// IGNORE

-			}

+			return transformMarkdown(new StringReader(markdown));

+		} catch (NullPointerException p) {

+			throw new java.text.ParseException("Markdown string is null!", 0);

 		}

 	}

 

@@ -51,7 +39,7 @@ public class MarkdownUtils {
 		try {

 			Markdown md = new Markdown();

 			md.transform(markdownReader, writer);

-			return writer.toString();

+			return writer.toString().trim();

 		} catch (ParseException p) {

 			throw new java.text.ParseException(p.getMessage(), 0);

 		} finally {

@@ -67,5 +55,4 @@ public class MarkdownUtils {
 			}

 		}

 	}

-

 }

diff --git a/src/com/gitblit/utils/MetricUtils.java b/src/com/gitblit/utils/MetricUtils.java
index b1da2738..4ca9f36a 100644
--- a/src/com/gitblit/utils/MetricUtils.java
+++ b/src/com/gitblit/utils/MetricUtils.java
@@ -42,45 +42,7 @@ public class MetricUtils {
 	public static List<Metric> getDateMetrics(Repository r, boolean includeTotal, String format) {

 		Metric total = new Metric("TOTAL");

 		final Map<String, Metric> metricMap = new HashMap<String, Metric>();

-	

-		if (JGitUtils.hasCommits(r)) {			

-			try {

-				RevWalk walk = new RevWalk(r);

-				ObjectId object = r.resolve(Constants.HEAD);

-				RevCommit lastCommit = walk.parseCommit(object);

-				walk.markStart(lastCommit);

-				SimpleDateFormat df = new SimpleDateFormat(format);

-				Iterable<RevCommit> revlog = walk;

-				for (RevCommit rev : revlog) {

-					Date d = JGitUtils.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++;					

-				}

-			} catch (Throwable t) {

-				JGitUtils.LOGGER.error("Failed to mine log history for metrics", t);

-			}

-		}

-		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));

-		}

-		if (includeTotal) {

-			metrics.add(0, total);

-		}

-		return metrics;

-	}

 

-	public static List<Metric> getDateMetrics(Repository r, boolean includeTotal) {

-		Metric total = new Metric("TOTAL");

-		final Map<String, Metric> metricMap = new HashMap<String, Metric>();

-	

 		if (JGitUtils.hasCommits(r)) {

 			final List<RefModel> tags = JGitUtils.getTags(r, -1);

 			final Map<ObjectId, RefModel> tagMap = new HashMap<ObjectId, RefModel>();

@@ -90,25 +52,31 @@ public class MetricUtils {
 			try {

 				RevWalk walk = new RevWalk(r);

 				ObjectId object = r.resolve(Constants.HEAD);

-	

-				RevCommit firstCommit = JGitUtils.getFirstCommit(r, Constants.HEAD);

 				RevCommit lastCommit = walk.parseCommit(object);

-				int diffDays = (lastCommit.getCommitTime() - firstCommit.getCommitTime())

-						/ (60 * 60 * 24);

-				total.duration = diffDays;

+				walk.markStart(lastCommit);

+

 				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)");

+				if (StringUtils.isEmpty(format)) {

+					// dynamically determine date format

+					RevCommit firstCommit = JGitUtils.getFirstCommit(r, Constants.HEAD);

+					int diffDays = (lastCommit.getCommitTime() - firstCommit.getCommitTime())

+							/ (60 * 60 * 24);

+					total.duration = diffDays;

+					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");

+					}

 				} else {

-					// Months

-					df = new SimpleDateFormat("yyyy-MM");

+					// use specified date format

+					df = new SimpleDateFormat(format);

 				}

-				walk.markStart(lastCommit);

-	

+

 				Iterable<RevCommit> revlog = walk;

 				for (RevCommit rev : revlog) {

 					Date d = JGitUtils.getCommitDate(rev);

@@ -125,7 +93,7 @@ public class MetricUtils {
 					}

 				}

 			} catch (Throwable t) {

-				JGitUtils.LOGGER.error("Failed to mine log history for metrics", t);

+				LOGGER.error("Failed to mine log history for date metrics", t);

 			}

 		}

 		List<String> keys = new ArrayList<String>(metricMap.keySet());

@@ -140,32 +108,38 @@ public class MetricUtils {
 		return metrics;

 	}

 

-	public static List<Metric> getAuthorMetrics(Repository r) {

-		Metric total = new Metric("TOTAL");

+	public static List<Metric> getAuthorMetrics(Repository r, boolean byEmail) {

 		final Map<String, Metric> metricMap = new HashMap<String, Metric>();

-	

+

 		if (JGitUtils.hasCommits(r)) {

 			try {

 				RevWalk walk = new RevWalk(r);

 				ObjectId object = r.resolve(Constants.HEAD);

 				RevCommit lastCommit = walk.parseCommit(object);

 				walk.markStart(lastCommit);

-	

+

 				Iterable<RevCommit> revlog = walk;

 				for (RevCommit rev : revlog) {

-					String p = rev.getAuthorIdent().getName();

-					if (StringUtils.isEmpty(p)) {

+					String p;

+					if (byEmail) {

 						p = rev.getAuthorIdent().getEmailAddress();

+						if (StringUtils.isEmpty(p)) {

+							p = rev.getAuthorIdent().getName();

+						}

+					} else {

+						p = rev.getAuthorIdent().getName();

+						if (StringUtils.isEmpty(p)) {

+							p = rev.getAuthorIdent().getEmailAddress();

+						}

 					}

 					if (!metricMap.containsKey(p)) {

 						metricMap.put(p, new Metric(p));

 					}

 					Metric m = metricMap.get(p);

 					m.count++;

-					total.count++;

 				}

 			} catch (Throwable t) {

-				JGitUtils.LOGGER.error("Failed to mine log history for metrics", t);

+				LOGGER.error("Failed to mine log history for author metrics", t);

 			}

 		}

 		List<String> keys = new ArrayList<String>(metricMap.keySet());

diff --git a/src/com/gitblit/utils/StringUtils.java b/src/com/gitblit/utils/StringUtils.java
index fd6ca98b..2a10a59a 100644
--- a/src/com/gitblit/utils/StringUtils.java
+++ b/src/com/gitblit/utils/StringUtils.java
@@ -134,4 +134,12 @@ public class StringUtils {
 		}

 		return "";

 	}

+	

+	public static String getRelativePath(String basePath, String fullPath) {		

+		String relativePath = fullPath.substring(basePath.length()).replace('\\', '/');

+		if (relativePath.charAt(0) == '/') {

+			relativePath = relativePath.substring(1);

+		}

+		return relativePath;

+	}

 }

diff --git a/src/com/gitblit/utils/TicgitUtils.java b/src/com/gitblit/utils/TicgitUtils.java
index 914b8139..576de349 100644
--- a/src/com/gitblit/utils/TicgitUtils.java
+++ b/src/com/gitblit/utils/TicgitUtils.java
@@ -61,6 +61,9 @@ public class TicgitUtils {
 

 	public static List<TicketModel> getTickets(Repository r) {

 		RefModel ticgitBranch = getTicketsBranch(r);

+		if (ticgitBranch == null) {

+			return null;

+		}

 		List<PathModel> paths = JGitUtils.getFilesInPath(r, null, ticgitBranch.commit);

 		List<TicketModel> tickets = new ArrayList<TicketModel>();

 		for (PathModel ticketFolder : paths) {

@@ -112,7 +115,7 @@ public class TicgitUtils {
 						Comment c = new Comment(file.name, content);

 						ticket.comments.add(c);

 					} catch (ParseException e) {

-						e.printStackTrace();

+						LOGGER.error("Failed to parse ticket comment", e);

 					}

 				} else if (chunks[0].equals("TAG")) {

 					if (content.startsWith("TAG_")) {

@@ -127,12 +130,4 @@ public class TicgitUtils {
 		}

 		Collections.sort(ticket.comments);

 	}

-

-	public static String getTicketContent(Repository r, String filePath) {

-		RefModel ticketsBranch = getTicketsBranch(r);

-		if (ticketsBranch != null) {

-			return JGitUtils.getRawContentAsString(r, ticketsBranch.commit, filePath);

-		}

-		return "";

-	}

 }

diff --git a/src/com/gitblit/wicket/pages/BlobDiffPage.java b/src/com/gitblit/wicket/pages/BlobDiffPage.java
index b94da011..a8f8b3c1 100644
--- a/src/com/gitblit/wicket/pages/BlobDiffPage.java
+++ b/src/com/gitblit/wicket/pages/BlobDiffPage.java
@@ -24,8 +24,8 @@ import org.eclipse.jgit.revwalk.RevCommit;
 import com.gitblit.GitBlit;

 import com.gitblit.Keys;

 import com.gitblit.utils.DiffUtils;

+import com.gitblit.utils.DiffUtils.DiffOutputType;

 import com.gitblit.utils.JGitUtils;

-import com.gitblit.utils.JGitUtils.DiffOutputType;

 import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.WicketUtils;

 import com.gitblit.wicket.panels.CommitHeaderPanel;

diff --git a/src/com/gitblit/wicket/pages/CommitDiffPage.java b/src/com/gitblit/wicket/pages/CommitDiffPage.java
index e7af833d..4815b2c7 100644
--- a/src/com/gitblit/wicket/pages/CommitDiffPage.java
+++ b/src/com/gitblit/wicket/pages/CommitDiffPage.java
@@ -32,8 +32,8 @@ import com.gitblit.GitBlit;
 import com.gitblit.Keys;

 import com.gitblit.models.PathModel.PathChangeModel;

 import com.gitblit.utils.DiffUtils;

+import com.gitblit.utils.DiffUtils.DiffOutputType;

 import com.gitblit.utils.JGitUtils;

-import com.gitblit.utils.JGitUtils.DiffOutputType;

 import com.gitblit.wicket.WicketUtils;

 import com.gitblit.wicket.panels.CommitHeaderPanel;

 import com.gitblit.wicket.panels.CommitLegendPanel;

diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/com/gitblit/wicket/pages/CommitPage.html
index 1b5fffed..bd317b7a 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.html
+++ b/src/com/gitblit/wicket/pages/CommitPage.html
@@ -44,6 +44,14 @@
 	<!-- full message -->

 	<div class="commit_message" wicket:id="fullMessage">[commit message]</div>

 

+	<!--  git notes -->

+	<table style="padding-bottom:5px;">

+		<tr wicket:id="notes">

+			<td style="vertical-align:top;"><span class="headRef" wicket:id="refName"></span><br/><span wicket:id="authorName"></span><br/><span wicket:id="authorDate"></span></td>

+			<td><span wicket:id="noteContent"></span></td>

+		</tr>

+	</table>

+	

 	<!--  commit legend -->

 	<div style="text-align:right;" wicket:id="commitLegend"></div>

 	

diff --git a/src/com/gitblit/wicket/pages/CommitPage.java b/src/com/gitblit/wicket/pages/CommitPage.java
index bc0d8792..3af9cf1d 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.java
+++ b/src/com/gitblit/wicket/pages/CommitPage.java
@@ -18,6 +18,7 @@ package com.gitblit.wicket.pages;
 import java.util.ArrayList;

 import java.util.List;

 

+import org.apache.wicket.Component;

 import org.apache.wicket.PageParameters;

 import org.apache.wicket.markup.html.basic.Label;

 import org.apache.wicket.markup.html.link.BookmarkablePageLink;

@@ -33,8 +34,10 @@ import org.eclipse.jgit.revwalk.RevCommit;
 import com.gitblit.DownloadZipServlet;

 import com.gitblit.GitBlit;

 import com.gitblit.Keys;

+import com.gitblit.models.GitNote;

 import com.gitblit.models.PathModel.PathChangeModel;

 import com.gitblit.utils.JGitUtils;

+import com.gitblit.utils.StringUtils;

 import com.gitblit.utils.JGitUtils.SearchType;

 import com.gitblit.wicket.WicketUtils;

 import com.gitblit.wicket.panels.CommitHeaderPanel;

@@ -112,6 +115,27 @@ public class CommitPage extends RepositoryPage {
 

 		addFullText("fullMessage", c.getFullMessage(), true);

 

+		// git notes

+		List<GitNote> notes = JGitUtils.getNotesOnCommit(r, c);

+		ListDataProvider<GitNote> notesDp = new ListDataProvider<GitNote>(notes);

+		DataView<GitNote> notesView = new DataView<GitNote>("notes", notesDp) {

+			private static final long serialVersionUID = 1L;

+

+			public void populateItem(final Item<GitNote> item) {

+				GitNote entry = item.getModelObject();

+				Component c = new LinkPanel("refName", null, entry.notesRef.displayName,

+						CommitPage.class, newCommitParameter(entry.notesRef.commit.getName()));

+				WicketUtils.setCssClass(c, "headRef");

+				item.add(c);

+				item.add(createPersonPanel("authorName", entry.notesRef.commit.getAuthorIdent(), SearchType.AUTHOR));

+				item.add(WicketUtils.createTimestampLabel("authorDate",

+						entry.notesRef.commit.getAuthorIdent().getWhen(), getTimeZone()));

+				item.add(new Label("noteContent", StringUtils.breakLinesForHtml(entry.content)).setEscapeModelStrings(false));

+			}

+		};

+		add(notesView.setVisible(notes.size() > 0));

+		

+		

 		// changed paths list

 		List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, c);

 		add(new CommitLegendPanel("commitLegend", paths));

diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index eb2a8e64..e5496a1a 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -19,7 +19,6 @@ import java.text.MessageFormat;
 import java.util.ArrayList;

 import java.util.Arrays;

 import java.util.Collections;

-import java.util.Date;

 import java.util.Iterator;

 import java.util.List;

 import java.util.Map;

@@ -104,6 +103,22 @@ public class EditRepositoryPage extends BasePage {
 

 					// automatically convert backslashes to forward slashes

 					repositoryModel.name = repositoryModel.name.replace('\\', '/');

+					// Automatically replace // with /

+					repositoryModel.name = repositoryModel.name.replace("//", "/");

+

+					// prohibit folder paths

+					if (repositoryModel.name.startsWith("/")) {						

+						error("Leading root folder references (/) are prohibited.");

+						return;

+					}

+					if (repositoryModel.name.startsWith("../")) {						

+						error("Relative folder references (../) are prohibited.");

+						return;

+					}

+					if (repositoryModel.name.contains("/../")) {

+						error("Relative folder references (../) are prohibited.");

+						return;

+					}

 

 					// confirm valid characters in repository name

 					char[] validChars = { '/', '.', '_', '-' };

@@ -120,7 +135,7 @@ public class EditRepositoryPage extends BasePage {
 							}

 						}

 					}

-

+					

 					// confirm access restriction selection

 					if (repositoryModel.accessRestriction == null) {

 						error("Please select access restriction!");

diff --git a/src/com/gitblit/wicket/pages/MetricsPage.java b/src/com/gitblit/wicket/pages/MetricsPage.java
index 2186ae37..c6231e9d 100644
--- a/src/com/gitblit/wicket/pages/MetricsPage.java
+++ b/src/com/gitblit/wicket/pages/MetricsPage.java
@@ -47,7 +47,7 @@ public class MetricsPage extends RepositoryPage {
 	public MetricsPage(PageParameters params) {

 		super(params);

 		Repository r = getRepository();

-		insertLinePlot("commitsChart", MetricUtils.getDateMetrics(r, false));

+		insertLinePlot("commitsChart", MetricUtils.getDateMetrics(r, false, null));

 		insertBarPlot("dayOfWeekChart", getDayOfWeekMetrics(r));

 		insertLinePlot("timeOfDayChart", getTimeOfDayMetrics(r));

 		insertPieChart("authorsChart", getAuthorMetrics(r));

@@ -57,7 +57,7 @@ public class MetricsPage extends RepositoryPage {
 		if ((metrics != null) && (metrics.size() > 0)) {

 			IChartData data = WicketUtils.getChartData(metrics);

 

-			ChartProvider provider = new ChartProvider(new Dimension(400, 100), ChartType.LINE,

+			ChartProvider provider = new ChartProvider(new Dimension(500, 100), ChartType.LINE,

 					data);

 			ChartAxis dateAxis = new ChartAxis(ChartAxisType.BOTTOM);

 			dateAxis.setLabels(new String[] { metrics.get(0).name,

@@ -82,7 +82,7 @@ public class MetricsPage extends RepositoryPage {
 		if ((metrics != null) && (metrics.size() > 0)) {

 			IChartData data = WicketUtils.getChartData(metrics);

 

-			ChartProvider provider = new ChartProvider(new Dimension(400, 100),

+			ChartProvider provider = new ChartProvider(new Dimension(500, 100),

 					ChartType.BAR_VERTICAL_SET, data);

 			ChartAxis dateAxis = new ChartAxis(ChartAxisType.BOTTOM);

 			List<String> labels = new ArrayList<String>();

@@ -110,7 +110,7 @@ public class MetricsPage extends RepositoryPage {
 			for (Metric metric : metrics) {

 				labels.add(metric.name);

 			}

-			ChartProvider provider = new ChartProvider(new Dimension(400, 200), ChartType.PIE, data);

+			ChartProvider provider = new ChartProvider(new Dimension(500, 200), ChartType.PIE, data);

 			provider.setPieLabels(labels.toArray(new String[labels.size()]));

 			add(new Chart(wicketId, provider));

 		} else {

@@ -164,7 +164,7 @@ public class MetricsPage extends RepositoryPage {
 	}

 

 	private List<Metric> getAuthorMetrics(Repository repository) {

-		List<Metric> authors = MetricUtils.getAuthorMetrics(repository);

+		List<Metric> authors = MetricUtils.getAuthorMetrics(repository, true);

 		Collections.sort(authors, new Comparator<Metric>() {

 			@Override

 			public int compare(Metric o1, Metric o2) {

diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java
index c054fcca..a2d36d2e 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/com/gitblit/wicket/pages/SummaryPage.java
@@ -77,7 +77,7 @@ public class SummaryPage extends RepositoryPage {
 		List<Metric> metrics = null;

 		Metric metricsTotal = null;

 		if (GitBlit.getBoolean(Keys.web.generateActivityGraph, true)) {

-			metrics = MetricUtils.getDateMetrics(r, true);

+			metrics = MetricUtils.getDateMetrics(r, true, null);

 			metricsTotal = metrics.remove(0);

 		}

 

diff --git a/src/com/gitblit/wicket/panels/CommitLegendPanel.java b/src/com/gitblit/wicket/panels/CommitLegendPanel.java
index bbfa1855..d875233a 100644
--- a/src/com/gitblit/wicket/panels/CommitLegendPanel.java
+++ b/src/com/gitblit/wicket/panels/CommitLegendPanel.java
@@ -17,6 +17,7 @@ package com.gitblit.wicket.panels;
 

 import java.text.MessageFormat;

 import java.util.ArrayList;

+import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

 import java.util.concurrent.atomic.AtomicInteger;

@@ -29,7 +30,6 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;
 import org.eclipse.jgit.diff.DiffEntry.ChangeType;

 

 import com.gitblit.models.PathModel.PathChangeModel;

-import com.gitblit.utils.JGitUtils;

 import com.gitblit.wicket.WicketUtils;

 

 public class CommitLegendPanel extends Panel {

@@ -38,7 +38,7 @@ public class CommitLegendPanel extends Panel {
 

 	public CommitLegendPanel(String id, List<PathChangeModel> paths) {

 		super(id);

-		final Map<ChangeType, AtomicInteger> stats = JGitUtils.getChangedPathsStats(paths);

+		final Map<ChangeType, AtomicInteger> stats = getChangedPathsStats(paths);

 		ListDataProvider<ChangeType> legendDp = new ListDataProvider<ChangeType>(

 				new ArrayList<ChangeType>(stats.keySet()));

 		DataView<ChangeType> legendsView = new DataView<ChangeType>("legend", legendDp) {

@@ -74,4 +74,15 @@ public class CommitLegendPanel extends Panel {
 		};

 		add(legendsView);

 	}

+	

+	protected 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;

+	}

 }
\ No newline at end of file