Add ui-shared.h

[cgit.git] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index a76a234cfe61b1fd63a7a3ccc1eb01ad6018b435..2a2200900044d9fb66a80048c9f3f07aa3d45d62 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -7,7 +7,11 @@
  */
 
 #include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
 
+unsigned char old_rev_sha1[20];
+unsigned char new_rev_sha1[20];
 
 /*
  * print a single line returned from xdiff
@@ -37,7 +41,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 +71,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, ctx.qry.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, ctx.qry.head,
+                                      sha1_to_hex(new_rev_sha1), path2);
+               else
+                       html_txt(path2);
        }
        html("</div>");
 }
@@ -78,10 +90,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,17 +101,16 @@ static void filepair_cb(struct diff_filepair *pair)
                cgit_print_error("Error running diff");
 }
 
-void cgit_print_diff(const char *new_rev, const char *old_rev)
+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;
 
        if (!new_rev)
-               new_rev = cgit_query_head;
-       get_sha1(new_rev, sha1);
-       type = sha1_object_info(sha1, &size);
+               new_rev = ctx.qry.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;
@@ -110,31 +121,30 @@ void cgit_print_diff(const char *new_rev, const char *old_rev)
                return;
        }
 
-       commit = lookup_commit_reference(sha1);
+       commit = lookup_commit_reference(new_rev_sha1);
        if (!commit || parse_commit(commit))
-               cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1)));
+               cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
 
        if (old_rev)
-               get_sha1(old_rev, sha2);
+               get_sha1(old_rev, old_rev_sha1);
        else if (commit->parents && commit->parents->item)
-               hashcpy(sha2, commit->parents->item->object.sha1);
+               hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
        else
-               hashclr(sha2);
+               hashclr(old_rev_sha1);
 
-       if (!is_null_sha1(sha2)) {
-               type = sha1_object_info(sha2, &size);
+       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 name: %s", sha1_to_hex(sha2)));
+                       cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
                        return;
                }
-               commit2 = lookup_commit_reference(sha2);
+               commit2 = lookup_commit_reference(old_rev_sha1);
                if (!commit2 || parse_commit(commit2))
-                       cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2)));
+                       cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
        }
-
-       html("<table class='diff'>");
+       html("<table summary='diff' class='diff'>");
        html("<tr><td>");
-       cgit_diff_tree(sha2, sha1, filepair_cb);
+       cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
        html("</td></tr>");
        html("</table>");
 }