<%
if (type == DiffType.SIDEBYSIDE || type == DiffType.UNIFIED) {
%>
<%
if (type == DiffType.SIDEBYSIDE) {
%>
| <%= data.filename %> (<%= data.rev[0] %>) |
<%= data.filename %> (<%= data.rev[1] %>) |
<%
}
%>
<%
}
for (int i=0; i < data.revision.size(); i++) {
Delta d = data.revision.getDelta(i);
if (type == DiffType.TEXT) {
%><%= Util.htmlize(d.toString()) %><%
} else {
Chunk c1 = d.getOriginal();
Chunk c2 = d.getRevised();
int cn1 = c1.first();
int cl1 = c1.last();
int cn2 = c2.first();
int cl2 = c2.last();
int i1 = cn1, i2 = cn2;
StringBuilder bl1 = new StringBuilder(80);
StringBuilder bl2 = new StringBuilder(80);
for (; i1 <= cl1 && i2 <= cl2; i1++, i2++) {
String[] ss = Util.diffline(
new StringBuilder(file1[i1]),
new StringBuilder(file2[i2]));
file1[i1] = ss[0];
file2[i2] = ss[1];
}
// deleted
for (; i1 <= cl1; i1++) {
bl1.setLength(0);
bl1.append("");
Util.htmlize(file1[i1], bl1);
file1[i1] = bl1.append("").toString();
}
// added
for (; i2 <= cl2; i2++) {
bl2.setLength(0);
bl2.append("");
Util.htmlize(file2[i2], bl2);
file2[i2] = bl2.append("").toString();
}
if (type == DiffType.UNIFIED) {
// UDIFF
if (cn1 > ln1 || cn2 > ln2) {
%>
<%
if (full || (cn2 - ln2 < 20)) {
for (int j = ln2; j < cn2; j++) {
%><%= ++ln2 %><%=
Util.htmlize(file2[j]) %>
<%
}
} else {
for (int j = ln2; j < ln2 + 8; j++) {
%><%= j+1 %><%=
Util.htmlize(file2[j]) %>
<%
}
%>
--- <%= cn2 - ln2 - 16
%> unchanged lines hidden (view full) ---
<%
ln2 = cn2 - 8;
for (int j = ln2; j < cn2; j++) {
%><%= ++ln2 %><%= Util.htmlize(file2[j]) %>
<%
}
}
%> |
<%
ln1 = cn1;
}
if (cn1 <= cl1) {
%>
<%
for (int j = cn1; j <= cl1 ; j++) {
%><%= ++ln1 %><%= file1[j]
%>
<%
}
%> |
<%
}
if (cn2 <= cl2) {
%>
<%
for (int j = cn2; j < cl2; j++) {
%><%= ++ln2 %><%= file2[j]
%>
<%
}
%><%= ++ln2 %><%= file2[cl2] %><%
if(full) {
%><%
}
%> |
<%
}
} else if (type == DiffType.SIDEBYSIDE) {
// SDIFF
if (cn1 > ln1 || cn2 > ln2) {
%>
<%
if (full || cn2 - ln2 < 20) {
for (int j = ln1; j < cn1; j++) {
%><%= ++ln1 %><%=
Util.htmlize(file1[j]) %>
<%
}
%> | <%
for (int j = ln2; j < cn2 ; j++) {
%><%= ++ln2 %><%=
Util.htmlize(file2[j]) %>
<%
}
} else {
for (int j = ln1; j < ln1 + 8; j++) {
%><%= j+1 %><%=
Util.htmlize(file1[j]) %>
<%
}
%>
--- <%= cn1 - ln1 - 16
%> unchanged lines hidden (view full) ---
<%
ln1 = cn1 - 8;
for (int j = ln1; j < cn1; j++) {
%><%= ++ln1 %><%=
Util.htmlize(file1[j]) %>
<%
}
%> | <%
for (int j = ln2; j < ln2 + 8; j++) {
%><%= j+1 %><%=
Util.htmlize(file2[j]) %>
<%
}
%>
--- <%= cn2 - ln2 - 16
%> unchanged lines hidden (view full) ---
<%
ln2 = cn2 - 8;
for (int j = ln2; j < cn2; j++) {
%><%= ++ln2 %><%=
Util.htmlize(file2[j]) %>
<%
}
}
%> |
<%
}
%>
<%
for (int j = cn1; j <= cl1; j++) {
%><%= ++ln1 %><%= file1[j] %>
<%
}
%> | <%
for (int j = cn2; j <= cl2; j++) {
%><%= ++ln2 %><%=
file2[j] %>
<%
}
%> |
<%
// OLD
} else if (type == DiffType.OLD) {
// OLD
if (cn1 > ln1) {
if (full || cn1 - ln1 < 20) {
for (int j = ln1; j < cn1; j++) {
%><%= ++ln1 %><%=
Util.htmlize(file1[j]) %>
<%
}
} else {
for (int j = ln1; j < ln1 + 8; j++) {
%><%= j+1 %><%=
Util.htmlize(file1[j]) %>
<%
}
%>
--- <%= cn1 - ln1 - 16
%> unchanged lines hidden (view full) ---
<%
ln1 = cn1 - 8;
for (int j = ln1; j < cn1; j++) {
%><%= ++ln1 %><%=
Util.htmlize(file1[j]) %>
<%
}
}
}
for (int j = cn1; j <= cl1 ; j++) {
%><%= ++ln1 %><%= file1[j] %>
<%
}
if (full) {
%><%
}
// NEW
} else if (type == DiffType.NEW) {
if (cn2 > ln2) {
if (full || cn2 - ln2 < 20) {
for (int j = ln2; j < cn2 ; j++) {
%><%= ++ln2 %><%=
Util.htmlize(file2[j]) %>
<%
}
} else {
for (int j = ln2; j < ln2 + 8; j++) {
%><%= j+1 %><%=
Util.htmlize(file2[j]) %>
<%
}
%>
--- <%= cn2 - ln2 - 16
%> unchanged lines hidden (view full) ---
<%
ln2 = cn2 - 8;
for (int j = ln2; j < cn2; j++) {
%><%= ++ln2 %><%=
Util.htmlize(file2[j]) %>
<%
}
}
}
for (int j = cn2; j <= cl2 ; j++) {
%><%= ++ln2 %><%= file2[j] %>
<%
}
if (full) {
%><%
}
}
} // else
} // for
// deltas done, dump the remaining
if (file1.length >= ln1) {
if (type == DiffType.SIDEBYSIDE) {
if (full || file1.length - ln1 < 20) {
%>
<%
for (int j = ln1; j < file1.length ; j++) {
%><%= j+1 %><%= Util.htmlize(file1[j]) %>
<%
}
%> | <%
for (int j = ln2; j < file2.length ; j++) {
%><%= j+1 %><%= Util.htmlize(file2[j]) %>
<%
}
%> |
<%
} else {
%>
<%
for (int j = ln1; j < ln1 + 8 ; j++) {
%><%= j+1 %><%= Util.htmlize(file1[j]) %>
<%
}
%>
--- <%= file1.length - ln1 - 8
%> unchanged lines hidden --- | <%
for (int j = ln2; j < ln2 + 8 ; j++) {
%><%= j+1 %><%= Util.htmlize(file2[j]) %>
<%
}
%>
--- <%= file1.length - ln1 - 8
%> unchanged lines hidden --- |
<%
}
} else if (type == DiffType.UNIFIED) {
if (full || file2.length - ln2 < 20) {
%>
<%
for (int j = ln2; j < file2.length ; j++) {
%><%= j+1 %><%= Util.htmlize(file2[j]) %>
<%
}
%> |
<%
} else {
%>
<%
for (int j = ln2; j < ln2 + 8 ; j++) {
%><%= j+1 %><%= Util.htmlize(file2[j]) %>
<%
}
%>
--- <%= file2.length - ln2 - 8
%> unchanged lines hidden --- |
<%
}
} else if (type == DiffType.OLD) {
if (full || file1.length - ln1 < 20) {
for (int j = ln1; j < file1.length ; j++) {
%>
<%= j+1 %><%= Util.htmlize(file1[j]) %>
<%
}
} else {
for (int j = ln1; j < ln1 + 8 ; j++) {
%>
<%= j+1 %><%= Util.htmlize(file1[j]) %>
<%
}
%>
---
<%= file1.length - ln1 - 8
%> unchanged lines hidden ---
<%
}
} else if (type == DiffType.NEW) {
if (full || file2.length - ln2 < 20) {
for (int j = ln2; j < file2.length ; j++) {
%>
<%= j+1 %><%=Util.htmlize(file2[j])%>
<%
}
} else {
for (int j = ln2; j < ln2 + 8 ; j++) {
%>
<%= j+1 %><%= Util.htmlize(file2[j]) %>
<%
}
%>
---
<%= file2.length - ln2 - 8
%> unchanged lines hidden ---
<%
}
}
}
//----DIFFS Done--------
%>