From 73f1adb2e84b8b9cd4045bcdd7d9afa72d3875b5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 27 Nov 2012 17:13:03 -0500
Subject: [PATCH] Added short commit id column to log and history tables (issue 168)
---
src/com/gitblit/utils/StringUtils.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/utils/StringUtils.java b/src/com/gitblit/utils/StringUtils.java
index 02cc49f..8684004 100644
--- a/src/com/gitblit/utils/StringUtils.java
+++ b/src/com/gitblit/utils/StringUtils.java
@@ -263,13 +263,25 @@
*/
public static String getMD5(String string) {
try {
- MessageDigest md = MessageDigest.getInstance("MD5");
- md.reset();
- md.update(string.getBytes("iso-8859-1"));
- byte[] digest = md.digest();
- return toHex(digest);
+ return getMD5(string.getBytes("iso-8859-1"));
} catch (UnsupportedEncodingException u) {
throw new RuntimeException(u);
+ }
+ }
+
+ /**
+ * Calculates the MD5 of the string.
+ *
+ * @param string
+ * @return md5 of the string
+ */
+ public static String getMD5(byte [] bytes) {
+ try {
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ md.reset();
+ md.update(bytes);
+ byte[] digest = md.digest();
+ return toHex(digest);
} catch (NoSuchAlgorithmException t) {
throw new RuntimeException(t);
}
@@ -427,6 +439,8 @@
public static int compareRepositoryNames(String r1, String r2) {
// sort root repositories first, alphabetically
// then sort grouped repositories, alphabetically
+ r1 = r1.toLowerCase();
+ r2 = r2.toLowerCase();
int s1 = r1.indexOf('/');
int s2 = r2.indexOf('/');
if (s1 == -1 && s2 == -1) {
--
Gitblit v1.9.1