| | |
|---|
| | | /*
|
|---|
| | | * 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;
|
|---|
| | |
|---|
| | | // 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
|
|---|
| | |
|---|
| | | sb.append("<div class=\"diff\">");
|
|---|
| | | sb.append("<table><tbody>");
|
|---|
| | | inFile = true;
|
|---|
| | | } else if (line.startsWith("---") || line.startsWith("+++")) {
|
|---|
| | | // skip --- +++ lines
|
|---|
| | | } else {
|
|---|
| | | sb.append(line).append('\n');
|
|---|
| | | sb.append(line);
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | | sb.append("</table></div>");
|
|---|
