Add html_option() function

[cgit.git] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index 3c4d52a11782aa8fae0a7511831fc735f40a85a0..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
  */
@@ -37,7 +40,7 @@ static void header(unsigned char *sha1, char *path1, int mode1,
        char *abbrev1, *abbrev2;
        int subproject;
 
-       subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2));
+       subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
        html("<div class='head'>");
        html("diff --git a/");
        html_txt(path1);
@@ -67,9 +70,17 @@ static void header(unsigned char *sha1, char *path1, int mode1,
                                htmlf("..%.6o", mode2);
                }
                html("<br/>--- a/");
-               html_txt(path1);
+               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/");
-               html_txt(path2);
+               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>");
 }
@@ -78,10 +89,10 @@ static void filepair_cb(struct diff_filepair *pair)
 {
        header(pair->one->sha1, pair->one->path, pair->one->mode,
               pair->two->sha1, pair->two->path, pair->two->mode);
-       if (S_ISDIRLNK(pair->one->mode) || S_ISDIRLNK(pair->two->mode)) {
-               if (S_ISDIRLNK(pair->one->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_ISDIRLNK(pair->two->mode))
+               if (S_ISGITLINK(pair->two->mode))
                        print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
                return;
        }
@@ -89,52 +100,50 @@ static void filepair_cb(struct diff_filepair *pair)
                cgit_print_error("Error running diff");
 }
 
-void cgit_print_diff(const char *head, 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;
-
-       html("<table class='diff'>");
-       html("<tr><td>");
+       struct commit *commit, *commit2;
 
-       if (head && !old_hex && !new_hex) {
-               get_sha1(head, sha1);
-               commit = lookup_commit_reference(sha1);
-               if (commit && !parse_commit(commit))
-                       cgit_diff_commit(commit, filepair_cb);
-               else
-                       cgit_print_error(fmt("Bad commit: %s", head));
+       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) {
+               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;
        }
 
-       get_sha1(old_hex, sha1);
-       get_sha1(new_hex, sha2);
+       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)));
 
-       type = sha1_object_info(sha1, &size);
-       if (type == OBJ_BAD) {
-               type = sha1_object_info(sha2, &size);
+       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)));
        }
-
-       switch(type) {
-       case OBJ_BLOB:
-               header(sha1, path, 0644, sha2, path, 0644);
-               if (cgit_diff_files(sha1, sha2, print_line))
-                       cgit_print_error("Error running diff");
-               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("<table class='diff'>");
+       html("<tr><td>");
+       cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
        html("</td></tr>");
        html("</table>");
 }