Restore tab conversion to 4 spaces in HTML diff output

James Moger

2015-02-26 8621be4f655ea222dd1f0063c8e65085f0b78caa

Restore tab conversion to 4 spaces in HTML diff output

 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;
@@ -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);
    }

    /**
@@ -490,7 +492,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) {