2 files changed, 32 insertions, 13 deletions

diff --git a/cgit.css b/cgit.css
index 97ae4d1..53c93f2 100644
--- a/cgit.css
+++ b/cgit.css
@@ -1,331 +1,330 @@
 body {
         font-family: arial;
         font-size: 11pt;
         background: white;
 }
 
 body, table {
         padding: 0em;
         margin: 0em;
 }
 
 table {
       border-collapse: collapse;
 }
 
 h2 {
         font-size: 120%;
         font-weight: bold;
         margin-top: 0em;
         margin-bottom: 0.25em;
 }
 
 h3 {
         margin-top: 0em;
         font-size: 100%;
         font-weight: normal;
 }
 
 h4 {
         margin-top: 1.5em;
         margin-bottom: 0.1em;
         font-size: 100%;
         font-weight: bold;
 }
 
 a {
         color: blue;
         text-decoration: none;
 }
 
 a:hover {
         text-decoration: underline;
 }
 
 table.list {
         border: none;
         border-collapse: collapse;
 }
 
 table.list tr {
         background: white;
 }
 
 table.list tr:hover {
         background: #eee;
 }
 
 table.list tr.nohover:hover {
         background: white;
 }
 
 table.list th {
         font-weight: normal;
         border-bottom: solid 1px #777;
         padding: 0.1em 0.5em 0.1em 0.5em;
         vertical-align: baseline;
 }
 
 table.list td {
         border: none;
         padding: 0.1em 0.5em 0.1em 0.5em;
 }
 
 img {
         border: none;
 }
 
 table#layout {
         width: 100%;
         border-collapse: collapse;
         margin: 0px;
 }
 
 td#header, td#logo {
         color: #666;
         background-color: #ddd;
         border-bottom: solid 1px #000;
 }
 
 td#header {
         font-size: 150%;
         font-weight: bold;
         padding: 0.2em 0.5em;
         vertical-align: text-bottom;
 }
 
 td#logo {
         text-align: right;
         vertical-align: middle;
         padding-right: 0.5em;
 }
 
 td#crumb, td#search {
         color: #ccc;
         border-top: solid 3px #555;
         background-color: #666;
         border-bottom: solid 1px #333;
         padding: 2px 1em;
 }
 
 td#crumb {
         font-weight: bold;
 }
 
 td#crumb a {
         color: #ccc;
 }
 
 td#crumb a:hover {
         color: #eee;
 }
 
 td#search {
         text-align: right;
         vertical-align: center;
         padding-right: 0.5em;
 }
 
 td#search form {
         margin: 0px;
         padding: 0px;
 }
 
 td#search input {
         font-size: 9pt;
         padding: 0px;
         width: 10em;
         border: solid 1px #333;
         color: #333;
         background-color: #fff;
 }
 
 td#summary {
         vertical-align: top;
         padding-bottom: 1em;
 }
 
 td#archivelist {
         padding-bottom: 1em;
 }
 
 td#archivelist table {
         float: right;
         border-collapse: collapse;
         border: solid 1px #777;
 }
 
 td#archivelist table th {
         background-color: #ccc;
 }
 
 td#content {
         padding: 1em 0.5em;
 }
 
 div#blob {
         border: solid 1px black;
 }
 
 div.error {
         color: red;
         font-weight: bold;
         margin: 1em 2em;
 }
 
 td.ls-blob, td.ls-dir, td.ls-mod {
         font-family: monospace;
 }
 
 div.ls-dir a {
         font-weight: bold;
 }
 
 th.filesize, td.filesize {
         text-align: right;
 }
 
 td.filesize {
         font-family: monospace;
 }
 
 td.links {
         font-size: 80%;
         padding-left: 2em;
 }
 
 td.filemode {
         font-family: monospace;
 }
 
 td.blob {
         white-space: pre;
         font-family: monospace;
         background-color: white;
 }
 
 table.nowrap td {
         white-space: nowrap;
 }
 
 table.commit-info {
         border-collapse: collapse;
         margin-top: 1.5em;
 }
 
 table.commit-info th {
         text-align: left;
         font-weight: normal;
         padding: 0.1em 1em 0.1em 0.1em;
 }
 
 table.commit-info td {
         font-weight: normal;
         padding: 0.1em 1em 0.1em 0.1em;
 }
 
 div.commit-subject {
         font-weight: bold;
         font-size: 125%;
         margin: 1.5em 0em 0.5em 0em;
         padding: 0em;
 }
 
 div.commit-msg {
         white-space: pre;
         font-family: monospace;
 }
 
 table.diffstat {
         border-collapse: collapse;
         margin-top: 1.5em;
         width: 100%;
         border: solid 1px #aaa;
         background-color: #eee;
 }
 
 table.diffstat tr:hover {
         background-color: #ccc;
 }
 
 table.diffstat th {
         font-weight: normal;
         text-align: left;
         text-decoration: underline;
         padding: 0.1em 1em 0.1em 0.1em;
         font-size: 100%;
 }
 
 table.diffstat td {
         padding: 0.2em 0.2em 0.1em 0.1em;
         font-size: 100%;
         border: none;
 }
 
 table.diffstat td span.modechange {
         padding-left: 1em;
         color: red;
 }
 
 table.diffstat td.add a {
         color: green;
 }
 
 table.diffstat td.del a {
         color: red;
 }
 
 table.diffstat td.upd a {
         color: blue;
 }
 
 table.diffstat td.graph {
         width: 75%;
         vertical-align: center;
 }
 
 table.diffstat td.graph img {
         border: none;
         height: 8pt;
 }
 
 div.diffstat-summary {
         color: #888;
         padding-top: 0.5em;
 }
 
-table.diff th {
-        padding: 1em 0em 0.1em 0.1em;
-        text-align: left;
-}
-
 table.diff td {
-        border: solid 1px black;
         font-family: monospace;
         white-space: pre;
 }
 
+table.diff td div.head {
+        font-weight: bold;
+        padding-top: 1em;
+}
+
 table.diff td div.hunk {
-        background: #ccc;
+        color: #009;
 }
 
 table.diff td div.add {
         color: green;
 }
 
 table.diff td div.del {
         color: red;
 }
 
 .sha1 {
         font-family: courier;
         font-size: 90%;
 }
 
 .left {
         text-align: left;
 }
 
 .right {
         text-align: right;
 }
diff --git a/ui-diff.c b/ui-diff.c
index 10330d3..7ec5701 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -1,82 +1,102 @@
 /* ui-diff.c: show diff between two blobs
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 
 /*
  * print a single line returned from xdiff
  */
 static void print_line(char *line, int len)
 {
         char *class = "ctx";
         char c = line[len-1];
 
         if (line[0] == '+')
                 class = "add";
         else if (line[0] == '-')
                 class = "del";
         else if (line[0] == '@')
                 class = "hunk";
 
         htmlf("<div class='%s'>", class);
         line[len-1] = '\0';
         html_txt(line);
         html("</div>");
         line[len-1] = c;
 }
 
-static void filepair_cb(struct diff_filepair *pair)
+static void header(unsigned char *sha1, char *path1,
+                   unsigned char *sha2, char *path2)
 {
-        html("<tr><th>");
-        html_txt(pair->two->path);
-        html("</th></tr>");
+        char *abbrev1, *abbrev2;
+
         html("<tr><td>");
+        html("<div class='head'>");
+        html("diff --git a/");
+        html_txt(path1);
+        html(" b/");
+        html_txt(path2);
+        abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
+        abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
+        htmlf("\nindex %s..%s", abbrev1, abbrev2);
+        free(abbrev1);
+        free(abbrev2);
+        html("\n--- a/");
+        html_txt(path1);
+        html("\n+++ b/");
+        html_txt(path2);
+        html("</div>");
+}
+
+static void filepair_cb(struct diff_filepair *pair)
+{
+        header(pair->one->sha1, pair->one->path,
+               pair->two->sha1, pair->two->path);
         if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
                 cgit_print_error("Error running diff");
         html("</tr></td>");
 }
 
 void cgit_print_diff(const char *old_hex, const char *new_hex, char *path)
 {
         unsigned char sha1[20], sha2[20];
         enum object_type type;
         unsigned long size;
 
         get_sha1(old_hex, sha1);
         get_sha1(new_hex, sha2);
 
         type = sha1_object_info(sha1, &size);
         if (type == OBJ_BAD) {
                 type = sha1_object_info(sha2, &size);
                 if (type == OBJ_BAD) {
                         cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex));
                         return;
                 }
         }
 
         html("<table class='diff'>");
         switch(type) {
         case OBJ_BLOB:
-                if (path)
-                        htmlf("<tr><th>%s</th></tr>", path);
                 html("<tr><td>");
+                header(sha1, path, sha2, path);
                 if (cgit_diff_files(sha1, sha2, print_line))
                         cgit_print_error("Error running diff");
                 html("</tr></td>");
                 break;
         case OBJ_TREE:
                 cgit_diff_tree(sha1, sha2, filepair_cb);
                 break;
         default:
                 cgit_print_error(fmt("Unhandled object type: %s",
                                      typename(type)));
                 break;
         }
         html("</td></tr></table>");
 }