From 27ae9095639bb228a1b7ff86a3ebe4264abf05be Mon Sep 17 00:00:00 2001
From: mschaefers <mschaefers@scoop-gmbh.de>
Date: Thu, 29 Nov 2012 12:33:09 -0500
Subject: [PATCH] feature: when using LdapUserService one can configure Gitblit to fetch all users from ldap that can possibly login. This allows to see newly generated LDAP users instantly in Gitblit. By now an LDAP user had to log in once to appear in GitBlit.
---
src/com/gitblit/utils/GitWebDiffFormatter.java | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/src/com/gitblit/utils/GitWebDiffFormatter.java b/src/com/gitblit/utils/GitWebDiffFormatter.java
index 2ac0a56..e657dc5 100644
--- a/src/com/gitblit/utils/GitWebDiffFormatter.java
+++ b/src/com/gitblit/utils/GitWebDiffFormatter.java
@@ -1,5 +1,21 @@
+/*
+ * 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 static org.eclipse.jgit.lib.Constants.encode;
import static org.eclipse.jgit.lib.Constants.encodeASCII;
import java.io.ByteArrayOutputStream;
@@ -8,7 +24,14 @@
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.
+ *
+ * @author James Moger
+ *
+ */
public class GitWebDiffFormatter extends DiffFormatter {
private final OutputStream os;
@@ -32,7 +55,8 @@
* @throws IOException
*/
@Override
- protected void writeHunkHeader(int aStartLine, int aEndLine, int bStartLine, int bEndLine) throws IOException {
+ protected void writeHunkHeader(int aStartLine, int aEndLine, int bStartLine, int bEndLine)
+ throws IOException {
os.write("<div class=\"diff hunk_header\"><span class=\"diff hunk_info\">".getBytes());
os.write('@');
os.write('@');
@@ -78,21 +102,20 @@
}
@Override
- protected void writeLine(final char prefix, final RawText text, final int cur) throws IOException {
+ protected void writeLine(final char prefix, final RawText text, final int cur)
+ throws IOException {
switch (prefix) {
case '+':
- os.write("<span class=\"diff add\">".getBytes());
+ os.write("<span style=\"color:#008000;\">".getBytes());
break;
case '-':
- os.write("<span class=\"diff remove\">".getBytes());
+ os.write("<span style=\"color:#800000;\">".getBytes());
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,17 +133,18 @@
* @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\">");
for (String line : lines) {
if (line.startsWith("diff")) {
- sb.append("<div class=\"diff header\">").append(line).append("</div>");
+ sb.append("<div class=\"diff header\">").append(StringUtils.convertOctal(line)).append("</div>");
} else if (line.startsWith("---")) {
- sb.append("<span class=\"diff remove\">").append(line).append("</span><br/>");
+ sb.append("<span style=\"color:#800000;\">").append(StringUtils.convertOctal(line)).append("</span><br/>");
} else if (line.startsWith("+++")) {
- sb.append("<span class=\"diff add\">").append(line).append("</span><br/>");
+ sb.append("<span style=\"color:#008000;\">").append(StringUtils.convertOctal(line)).append("</span><br/>");
} else {
sb.append(line).append('\n');
}
--
Gitblit v1.9.1