diff options
Diffstat (limited to 'src/com/gitblit/utils')
| -rw-r--r-- | src/com/gitblit/utils/GitBlitDiffFormatter.java | 12 | ||||
| -rw-r--r-- | src/com/gitblit/utils/GitWebDiffFormatter.java | 11 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/com/gitblit/utils/GitBlitDiffFormatter.java b/src/com/gitblit/utils/GitBlitDiffFormatter.java index 0e393fef..e9fbf528 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 @@ public class GitBlitDiffFormatter extends GitWebDiffFormatter { 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 @@ public class GitBlitDiffFormatter extends GitWebDiffFormatter { */
@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;
diff --git a/src/com/gitblit/utils/GitWebDiffFormatter.java b/src/com/gitblit/utils/GitWebDiffFormatter.java index 00ea121c..50c6c724 100644 --- a/src/com/gitblit/utils/GitWebDiffFormatter.java +++ b/src/com/gitblit/utils/GitWebDiffFormatter.java @@ -15,6 +15,7 @@ */
package com.gitblit.utils;
+import static org.eclipse.jgit.lib.Constants.encode;
import static org.eclipse.jgit.lib.Constants.encodeASCII;
import java.io.ByteArrayOutputStream;
@@ -23,6 +24,7 @@ import java.io.OutputStream; import org.eclipse.jgit.diff.DiffFormatter;
import org.eclipse.jgit.diff.RawText;
+import org.eclipse.jgit.util.RawParseUtils;
/**
* Returns an html snippet of the diff in the standard Gitweb style.
@@ -111,11 +113,9 @@ public class GitWebDiffFormatter extends DiffFormatter { 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 '-':
@@ -133,7 +133,8 @@ public class GitWebDiffFormatter extends DiffFormatter { * @return
*/
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();
sb.append("<div class=\"diff\">");
|