From 99450c557d895c94e7eec618218d0f4bc5c16ffd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 22 May 2015 12:45:34 -0400
Subject: [PATCH] Merged #252 "Cleanup diff rename output"
---
src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java b/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java
index edaed70..35549d4 100644
--- a/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java
+++ b/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java
@@ -74,6 +74,8 @@
*/
private static final int GLOBAL_DIFF_LIMIT = 20000;
+ private static final boolean CONVERT_TABS = true;
+
private final DiffOutputStream os;
private final DiffStat diffStat;
@@ -150,7 +152,7 @@
{
String binaryDiff = binaryDiffHandler.renderBinaryDiff(formatter.entry);
if (binaryDiff != null) {
- byte[] bb = ("<tr><td colspan='4'>" + binaryDiff + "</td></tr>").getBytes(StandardCharsets.UTF_8);
+ byte[] bb = ("<tr><td colspan='4' align='center'>" + binaryDiff + "</td></tr>").getBytes(StandardCharsets.UTF_8);
super.write(bb, 0, bb.length);
return;
}
@@ -451,14 +453,14 @@
// Highlight trailing whitespace on deleted/added lines.
Matcher matcher = trailingWhitespace.matcher(line);
if (matcher.find()) {
- StringBuilder result = new StringBuilder(StringUtils.escapeForHtml(line.substring(0, matcher.start()), false));
+ StringBuilder result = new StringBuilder(StringUtils.escapeForHtml(line.substring(0, matcher.start()), CONVERT_TABS));
result.append("<span class='trailingws-").append(prefix == '+' ? "add" : "sub").append("'>");
result.append(StringUtils.escapeForHtml(matcher.group(1), false));
result.append("</span>");
return result.toString();
}
}
- return StringUtils.escapeForHtml(line, false);
+ return StringUtils.escapeForHtml(line, CONVERT_TABS);
}
/**
@@ -471,7 +473,8 @@
String[] lines = html.split("\n");
StringBuilder sb = new StringBuilder();
for (String line : lines) {
- if (line.startsWith("index")) {
+ if (line.startsWith("index") || line.startsWith("similarity")
+ || line.startsWith("rename from ") || line.startsWith("rename to ")) {
// skip index lines
} else if (line.startsWith("new file") || line.startsWith("deleted file")) {
// skip new file lines
@@ -490,7 +493,7 @@
} else {
sb.append("<th class='diff-state diff-state-sub'></th><td class=\"diff-cell remove2\">");
}
- line = StringUtils.escapeForHtml(line.substring(1), false);
+ line = StringUtils.escapeForHtml(line.substring(1), CONVERT_TABS);
}
sb.append(line);
if (gitLinkDiff) {
--
Gitblit v1.9.1