From 0adceb4b64dfe0dd509da33c6d733a47fbf803a2 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 01 Aug 2012 21:21:32 -0400
Subject: [PATCH] Regex exclusions for repository search (issue 103)
---
src/com/gitblit/utils/GitBlitDiffFormatter.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/utils/GitBlitDiffFormatter.java b/src/com/gitblit/utils/GitBlitDiffFormatter.java
index 1441361..e9fbf52 100644
--- a/src/com/gitblit/utils/GitBlitDiffFormatter.java
+++ b/src/com/gitblit/utils/GitBlitDiffFormatter.java
@@ -15,12 +15,21 @@
*/
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.
+ *
+ * @author James Moger
+ *
+ */
public class GitBlitDiffFormatter extends GitWebDiffFormatter {
private final OutputStream os;
@@ -80,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 '-':
@@ -104,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;
--
Gitblit v1.9.1