From 005ac05887d14d439a50274aed3edd4ab54af34a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 27 Sep 2012 21:04:42 -0400
Subject: [PATCH] Automatically delete obsolete artifacts from ext
---
src/com/gitblit/utils/GitBlitDiffFormatter.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/utils/GitBlitDiffFormatter.java b/src/com/gitblit/utils/GitBlitDiffFormatter.java
index 0e393fe..2966aa8 100644
--- a/src/com/gitblit/utils/GitBlitDiffFormatter.java
+++ b/src/com/gitblit/utils/GitBlitDiffFormatter.java
@@ -15,11 +15,14 @@
*/
package com.gitblit.utils;
+import static org.eclipse.jgit.lib.Constants.encode;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import org.eclipse.jgit.diff.RawText;
+import org.eclipse.jgit.util.RawParseUtils;
/**
* Generates an html snippet of a diff in Gitblit's style.
@@ -86,11 +89,9 @@
break;
}
os.write(prefix);
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- text.writeLine(bos, cur);
- String line = bos.toString();
+ String line = text.getString(cur);
line = StringUtils.escapeForHtml(line, false);
- os.write(line.getBytes());
+ os.write(encode(line));
switch (prefix) {
case '+':
case '-':
@@ -110,7 +111,8 @@
*/
@Override
public String getHtml() {
- String html = os.toString();
+ ByteArrayOutputStream bos = (ByteArrayOutputStream) os;
+ String html = RawParseUtils.decode(bos.toByteArray());
String[] lines = html.split("\n");
StringBuilder sb = new StringBuilder();
boolean inFile = false;
@@ -125,15 +127,24 @@
} else if (line.startsWith("---") || line.startsWith("+++")) {
// skip --- +++ lines
} else if (line.startsWith("diff")) {
+ line = StringUtils.convertOctal(line);
if (line.indexOf(oldnull) > -1) {
// a is null, use b
line = line.substring(("diff --git " + oldnull).length()).trim();
// trim b/
- line = line.substring(2);
+ line = line.substring(2).trim();
} else {
// use a
- line = line.substring("diff --git a/".length()).trim();
- line = line.substring(0, line.indexOf(" b/")).trim();
+ line = line.substring("diff --git ".length()).trim();
+ line = line.substring(line.startsWith("\"a/") ? 3 : 2);
+ line = line.substring(0, line.indexOf(" b/") > -1 ? line.indexOf(" b/") : line.indexOf("\"b/")).trim();
+ }
+
+ if (line.charAt(0) == '"') {
+ line = line.substring(1);
+ }
+ if (line.charAt(line.length() - 1) == '"') {
+ line = line.substring(0, line.length() - 1);
}
if (inFile) {
sb.append("</tbody></table></div>\n");
--
Gitblit v1.9.1