/* * Copyright 2011 gitblit.com. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package com.gitblit.utils; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; import org.eclipse.jgit.diff.RawText; public class GitBlitDiffFormatter extends GitWebDiffFormatter { private final OutputStream os; private int left = 0, right = 0; public GitBlitDiffFormatter(OutputStream os) { super(os); this.os = os; } /** * Output a hunk header * * @param aStartLine * within first source * @param aEndLine * within first source * @param bStartLine * within second source * @param bEndLine * within second source * @throws IOException */ @Override protected void writeHunkHeader(int aStartLine, int aEndLine, int bStartLine, int bEndLine) throws IOException { os.write("....".getBytes()); os.write('@'); os.write('@'); writeRange('-', aStartLine + 1, aEndLine - aStartLine); writeRange('+', bStartLine + 1, bEndLine - bStartLine); os.write(' '); os.write('@'); os.write('@'); os.write("\n".getBytes()); left = aStartLine + 1; right = bStartLine + 1; } @Override protected void writeLine(final char prefix, final RawText text, final int cur) throws IOException { os.write("".getBytes()); switch (prefix) { case '+': os.write(("" + (right++) + "").getBytes()); os.write("
".getBytes()); break; case '-': os.write(("" + (left++) + "").getBytes()); os.write("
".getBytes()); break; default: os.write(("" + (left++) + "" + (right++) + "").getBytes()); os.write("".getBytes()); break; } os.write(prefix); ByteArrayOutputStream bos = new ByteArrayOutputStream(); text.writeLine(bos, cur); String line = bos.toString(); line = StringUtils.escapeForHtml(line, false); os.write(line.getBytes()); switch (prefix) { case '+': case '-': os.write("
".getBytes()); break; default: os.write("".getBytes()); } os.write("\n".getBytes()); } /** * Workaround function for complex private methods in DiffFormatter. This * sets the html for the diff headers. * * @return */ @Override public String getHtml() { String html = os.toString(); String[] lines = html.split("\n"); StringBuilder sb = new StringBuilder(); boolean inFile = false; String oldnull = "a/dev/null"; for (String line : lines) { if (line.startsWith("index")) { // skip index lines } else if (line.startsWith("new file")) { // skip new file lines } else if (line.startsWith("\\ No newline")) { // skip no new line } else if (line.startsWith("---") || line.startsWith("+++")) { // skip --- +++ lines } else if (line.startsWith("diff")) { if (line.indexOf(oldnull) > -1) { // a is null, use b line = line.substring(("diff --git " + oldnull).length()).trim(); line = line.substring(2); // trim b/ } else { // use a line = line.substring("diff --git a/".length()).trim(); line = line.substring(0, line.indexOf(" b/")).trim(); } if (inFile) { sb.append("
\n"); inFile = false; } sb.append("
").append(line).append("
"); sb.append("
"); sb.append(""); inFile = true; } else { sb.append(line); } } sb.append("
"); return sb.toString(); } }