From f339f5de2ee6d354f55e14e9340bebc4611535b3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 9 Jun 2011 19:04:24 -0400
Subject: Unit testing. Documentation. Simplified settings classes.

---
 src/com/gitblit/utils/DiffUtils.java   | 35 ++++++++++++++++++----------------
 src/com/gitblit/utils/StringUtils.java | 22 +++++++++++++++++++++
 2 files changed, 41 insertions(+), 16 deletions(-)

(limited to 'src/com/gitblit/utils')

diff --git a/src/com/gitblit/utils/DiffUtils.java b/src/com/gitblit/utils/DiffUtils.java
index 0f569074..c1401f96 100644
--- a/src/com/gitblit/utils/DiffUtils.java
+++ b/src/com/gitblit/utils/DiffUtils.java
@@ -25,6 +25,7 @@ import org.eclipse.jgit.diff.DiffEntry;
 import org.eclipse.jgit.diff.DiffFormatter;
 import org.eclipse.jgit.diff.RawText;
 import org.eclipse.jgit.diff.RawTextComparator;
+import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevTree;
@@ -69,6 +70,7 @@ public class DiffUtils {
 
 	public static String getDiff(Repository r, RevCommit baseCommit, RevCommit commit, String path,
 			DiffOutputType outputType) {
+		String diff = null;
 		try {
 			RevTree baseTree;
 			if (baseCommit == null) {
@@ -107,18 +109,17 @@ public class DiffUtils {
 			df.setRepository(r);
 			df.setDiffComparator(cmp);
 			df.setDetectRenames(true);
-			List<DiffEntry> diffs = df.scan(baseTree, commitTree);
+			List<DiffEntry> diffEntries = df.scan(baseTree, commitTree);
 			if (path != null && path.length() > 0) {
-				for (DiffEntry diff : diffs) {
-					if (diff.getNewPath().equalsIgnoreCase(path)) {
-						df.format(diff);
+				for (DiffEntry diffEntry : diffEntries) {
+					if (diffEntry.getNewPath().equalsIgnoreCase(path)) {
+						df.format(diffEntry);
 						break;
 					}
 				}
 			} else {
-				df.format(diffs);
+				df.format(diffEntries);
 			}
-			String diff;
 			if (df instanceof GitWebDiffFormatter) {
 				// workaround for complex private methods in DiffFormatter
 				diff = ((GitWebDiffFormatter) df).getHtml();
@@ -126,15 +127,15 @@ public class DiffUtils {
 				diff = os.toString();
 			}
 			df.flush();
-			return diff;
 		} catch (Throwable t) {
 			LOGGER.error("failed to generate commit diff!", t);
 		}
-		return null;
+		return diff;
 	}
 
 	public static String getCommitPatch(Repository r, RevCommit baseCommit, RevCommit commit,
 			String path) {
+		String diff = null;
 		try {
 			RevTree baseTree;
 			if (baseCommit == null) {
@@ -159,29 +160,31 @@ public class DiffUtils {
 			df.setRepository(r);
 			df.setDiffComparator(cmp);
 			df.setDetectRenames(true);
-			List<DiffEntry> diffs = df.scan(baseTree, commitTree);
+			List<DiffEntry> diffEntries = df.scan(baseTree, commitTree);
 			if (path != null && path.length() > 0) {
-				for (DiffEntry diff : diffs) {
-					if (diff.getNewPath().equalsIgnoreCase(path)) {
-						df.format(diff);
+				for (DiffEntry diffEntry : diffEntries) {
+					if (diffEntry.getNewPath().equalsIgnoreCase(path)) {
+						df.format(diffEntry);
 						break;
 					}
 				}
 			} else {
-				df.format(diffs);
+				df.format(diffEntries);
 			}
-			String diff = df.getPatch(commit);
+			diff = df.getPatch(commit);
 			df.flush();
-			return diff;
 		} catch (Throwable t) {
 			LOGGER.error("failed to generate commit diff!", t);
 		}
-		return null;
+		return diff;
 	}
 
 	public static List<AnnotatedLine> blame(Repository r, String blobPath, String objectId) {
 		List<AnnotatedLine> lines = new ArrayList<AnnotatedLine>();
 		try {
+			if (StringUtils.isEmpty(objectId)) {
+				objectId = Constants.HEAD;
+			}
 			BlameCommand blameCommand = new BlameCommand(r);
 			blameCommand.setFilePath(blobPath);
 			blameCommand.setStartCommit(r.resolve(objectId));
diff --git a/src/com/gitblit/utils/StringUtils.java b/src/com/gitblit/utils/StringUtils.java
index a881b58c..fa84fe8f 100644
--- a/src/com/gitblit/utils/StringUtils.java
+++ b/src/com/gitblit/utils/StringUtils.java
@@ -18,7 +18,9 @@ package com.gitblit.utils;
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.PatternSyntaxException;
 
 public class StringUtils {
 
@@ -142,4 +144,24 @@ public class StringUtils {
 		}
 		return relativePath;
 	}
+	
+	public static List<String> getStringsFromValue(String value) {
+		return getStringsFromValue(value, " ");
+	}
+		
+	public static List<String> getStringsFromValue(String value, String separator) {
+		List<String> strings = new ArrayList<String>();
+		try {
+			String[] chunks = value.split(separator);
+			for (String chunk : chunks) {
+				chunk = chunk.trim();
+				if (chunk.length() > 0) {
+					strings.add(chunk);
+				}
+			}
+		} catch (PatternSyntaxException e) {
+			throw new RuntimeException(e);
+		}
+		return strings;
+	}
 }
-- 
cgit v1.2.3