From e5cb554318f2be8c288789e47f80beb242f3cea6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 23 Feb 2012 17:06:46 -0500
Subject: [PATCH] Fixed UTF-8 encoding bug in diff formatter (issue 66)
---
src/com/gitblit/utils/GitBlitDiffFormatter.java | 12 +++++++-----
tests/com/gitblit/tests/GitServletTest.java | 9 +++++----
src/com/gitblit/utils/GitWebDiffFormatter.java | 11 ++++++-----
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/com/gitblit/utils/GitBlitDiffFormatter.java b/src/com/gitblit/utils/GitBlitDiffFormatter.java
index 0e393fe..e9fbf52 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;
diff --git a/src/com/gitblit/utils/GitWebDiffFormatter.java b/src/com/gitblit/utils/GitWebDiffFormatter.java
index 00ea121..50c6c72 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 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 @@
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 @@
* @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\">");
diff --git a/tests/com/gitblit/tests/GitServletTest.java b/tests/com/gitblit/tests/GitServletTest.java
index 38d7fa9..2f9a9c4 100644
--- a/tests/com/gitblit/tests/GitServletTest.java
+++ b/tests/com/gitblit/tests/GitServletTest.java
@@ -13,6 +13,7 @@
import org.eclipse.jgit.api.CloneCommand;
import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
import org.eclipse.jgit.util.FileUtils;
import org.junit.AfterClass;
@@ -113,9 +114,9 @@
public void testAnonymousPush() throws Exception {
Git git = Git.open(ticgitFolder);
File file = new File(ticgitFolder, "TODO");
- OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true));
+ OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true), Constants.CHARSET);
BufferedWriter w = new BufferedWriter(os);
- w.write("// " + new Date().toString() + "\n");
+ w.write("// hellol中文 " + new Date().toString() + "\n");
w.close();
git.add().addFilepattern(file.getName()).call();
git.commit().setMessage("test commit").call();
@@ -136,7 +137,7 @@
Git git = Git.open(jgitFolder);
File file = new File(jgitFolder, "TODO");
- OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true));
+ OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true), Constants.CHARSET);
BufferedWriter w = new BufferedWriter(os);
w.write("// " + new Date().toString() + "\n");
w.close();
@@ -159,7 +160,7 @@
Git git = Git.open(jgit2Folder);
File file = new File(jgit2Folder, "NONBARE");
- OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true));
+ OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true), Constants.CHARSET);
BufferedWriter w = new BufferedWriter(os);
w.write("// " + new Date().toString() + "\n");
w.close();
--
Gitblit v1.9.1