Merge branch 'stable'

[cgit.git] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index 10330d3d66d823296d6d0b21b9b64783345571fa..ac9a3faf6f97f735777ec8ec554a23e4c67ecac9 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -9,6 +9,9 @@
 #include "cgit.h"
 
 
+unsigned char old_rev_sha1[20];
+unsigned char new_rev_sha1[20];
+
 /*
  * print a single line returned from xdiff
  */
@@ -31,52 +34,116 @@ static void print_line(char *line, int len)
        line[len-1] = c;
 }
 
+static void header(unsigned char *sha1, char *path1, int mode1,
+                  unsigned char *sha2, char *path2, int mode2)
+{
+       char *abbrev1, *abbrev2;
+       int subproject;
+
+       subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
+       html("<div class='head'>");
+       html("diff --git a/");
+       html_txt(path1);
+       html(" b/");
+       html_txt(path2);
+
+       if (is_null_sha1(sha1))
+               path1 = "dev/null";
+       if (is_null_sha1(sha2))
+               path2 = "dev/null";
+
+       if (mode1 == 0)
+               htmlf("<br/>new file mode %.6o", mode2);
+
+       if (mode2 == 0)
+               htmlf("<br/>deleted file mode %.6o", mode1);
+
+       if (!subproject) {
+               abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
+               abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
+               htmlf("<br/>index %s..%s", abbrev1, abbrev2);
+               free(abbrev1);
+               free(abbrev2);
+               if (mode1 != 0 && mode2 != 0) {
+                       htmlf(" %.6o", mode1);
+                       if (mode2 != mode1)
+                               htmlf("..%.6o", mode2);
+               }
+               html("<br/>--- a/");
+               if (mode1 != 0)
+                       cgit_tree_link(path1, NULL, NULL, cgit_query_head,
+                                      sha1_to_hex(old_rev_sha1), path1);
+               else
+                       html_txt(path1);
+               html("<br/>+++ b/");
+               if (mode2 != 0)
+                       cgit_tree_link(path2, NULL, NULL, cgit_query_head,
+                                      sha1_to_hex(new_rev_sha1), path2);
+               else
+                       html_txt(path2);
+       }
+       html("</div>");
+}
+
 static void filepair_cb(struct diff_filepair *pair)
 {
-       html("<tr><th>");
-       html_txt(pair->two->path);
-       html("</th></tr>");
-       html("<tr><td>");
+       header(pair->one->sha1, pair->one->path, pair->one->mode,
+              pair->two->sha1, pair->two->path, pair->two->mode);
+       if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
+               if (S_ISGITLINK(pair->one->mode))
+                       print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
+               if (S_ISGITLINK(pair->two->mode))
+                       print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
+               return;
+       }
        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)
+void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
 {
-       unsigned char sha1[20], sha2[20];
        enum object_type type;
        unsigned long size;
+       struct commit *commit, *commit2;
 
-       get_sha1(old_hex, sha1);
-       get_sha1(new_hex, sha2);
-
-       type = sha1_object_info(sha1, &size);
+       if (!new_rev)
+               new_rev = cgit_query_head;
+       get_sha1(new_rev, new_rev_sha1);
+       type = sha1_object_info(new_rev_sha1, &size);
        if (type == OBJ_BAD) {
-               type = sha1_object_info(sha2, &size);
+               cgit_print_error(fmt("Bad object name: %s", new_rev));
+               return;
+       }
+       if (type != OBJ_COMMIT) {
+               cgit_print_error(fmt("Unhandled object type: %s",
+                                    typename(type)));
+               return;
+       }
+
+       commit = lookup_commit_reference(new_rev_sha1);
+       if (!commit || parse_commit(commit))
+               cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
+
+       if (old_rev)
+               get_sha1(old_rev, old_rev_sha1);
+       else if (commit->parents && commit->parents->item)
+               hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
+       else
+               hashclr(old_rev_sha1);
+
+       if (!is_null_sha1(old_rev_sha1)) {
+               type = sha1_object_info(old_rev_sha1, &size);
                if (type == OBJ_BAD) {
-                       cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex));
+                       cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
                        return;
                }
+               commit2 = lookup_commit_reference(old_rev_sha1);
+               if (!commit2 || parse_commit(commit2))
+                       cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
        }
-
        html("<table class='diff'>");
-       switch(type) {
-       case OBJ_BLOB:
-               if (path)
-                       htmlf("<tr><th>%s</th></tr>", path);
-               html("<tr><td>");
-               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>");
+       html("<tr><td>");
+       cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
+       html("</td></tr>");
+       html("</table>");
 }