From a1ea877042b93949ef244b96e8affd65cc3f89c1 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 01 Jun 2011 20:19:51 -0400
Subject: [PATCH] Readme markdown on summary page per-repository.
---
src/com/gitblit/utils/DiffUtils.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/utils/DiffUtils.java b/src/com/gitblit/utils/DiffUtils.java
index d7a4a63..969cb91 100644
--- a/src/com/gitblit/utils/DiffUtils.java
+++ b/src/com/gitblit/utils/DiffUtils.java
@@ -1,3 +1,18 @@
+/*
+ * 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;
@@ -20,23 +35,23 @@
public class DiffUtils {
private static final Logger LOGGER = LoggerFactory.getLogger(DiffUtils.class);
-
+
public static String getCommitDiff(Repository r, RevCommit commit, DiffOutputType outputType) {
- return getCommitDiff(r, null, commit, null, outputType);
+ return getDiff(r, null, commit, null, outputType);
}
- public static String getCommitDiff(Repository r, RevCommit commit, String path,
+ public static String getDiff(Repository r, RevCommit commit, String path,
DiffOutputType outputType) {
- return getCommitDiff(r, null, commit, path, outputType);
+ return getDiff(r, null, commit, path, outputType);
}
- public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit,
+ public static String getDiff(Repository r, RevCommit baseCommit, RevCommit commit,
DiffOutputType outputType) {
- return getCommitDiff(r, baseCommit, commit, null, outputType);
+ return getDiff(r, baseCommit, commit, null, outputType);
}
- public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit,
- String path, DiffOutputType outputType) {
+ public static String getDiff(Repository r, RevCommit baseCommit, RevCommit commit, String path,
+ DiffOutputType outputType) {
try {
RevTree baseTree;
if (baseCommit == null) {
--
Gitblit v1.9.1