ui-commit.c: link to diff instead of tree from diffstat

[cgit.git] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 5ddeee328072ebd2c01c149bad3e7a926f4d7cac..de8a1808cf8a3f6e498b3ad8e06148768bdb4bb7 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -8,56 +8,182 @@
 
 #include "cgit.h"
 
 
 #include "cgit.h"
 

+static int header;
+

 static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
                                int flags, void *cb_data)
 {
        struct commit *commit;
        struct commitinfo *info;
 static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
                                int flags, void *cb_data)
 {
        struct commit *commit;
        struct commitinfo *info;

-       char buf[256], *url;
+       char buf[256];
+       char *ref;

 
 

+       ref = xstrdup(refname);
+       strncpy(buf, refname, sizeof(buf));

        commit = lookup_commit(sha1);
        commit = lookup_commit(sha1);

+       // object is not really parsed at this point, because of some fallout
+       // from previous calls to git functions in cgit_print_log()
+       commit->object.parsed = 0;

        if (commit && !parse_commit(commit)){
                info = cgit_parse_commit(commit);
                html("<tr><td>");
        if (commit && !parse_commit(commit)){
                info = cgit_parse_commit(commit);
                html("<tr><td>");

-               url = cgit_pageurl(cgit_query_repo, "log", 
-                                  fmt("h=%s", refname));
+               cgit_log_link(ref, NULL, NULL, ref, NULL, NULL, 0);
+               html("</td><td>");
+               cgit_print_age(commit->date, -1, NULL);
+               html("</td><td>");
+               html_txt(info->author);
+               html("</td><td>");
+               cgit_commit_link(info->subject, NULL, NULL, ref, NULL);
+               html("</td></tr>\n");
+               cgit_free_commitinfo(info);
+       } else {
+               html("<tr><td>");
+               html_txt(buf);
+               html("</td><td colspan='3'>");
+               htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
+               html("</td></tr>\n");
+       }
+       free(ref);
+       return 0;
+}
+
+static void print_tag_header()
+{
+       html("<tr class='nohover'><th class='left'>Tag</th>"
+            "<th class='left'>Age</th>"
+            "<th class='left'>Author</th>"
+            "<th class='left'>Reference</th></tr>\n");
+       header = 1;
+}
+
+static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
+                               int flags, void *cb_data)
+{
+       struct tag *tag;
+       struct taginfo *info;
+       struct object *obj;
+       char buf[256], *url;
+
+       strncpy(buf, refname, sizeof(buf));
+       obj = parse_object(sha1);
+       if (!obj)
+               return 1;
+       if (obj->type == OBJ_TAG) {
+               tag = lookup_tag(sha1);
+               if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
+                       return 2;
+               if (!header)
+                       print_tag_header();
+               html("<tr><td>");
+               url = cgit_pageurl(cgit_query_repo, "tag",
+                                  fmt("id=%s", refname));

                html_link_open(url, NULL, NULL);
                html_link_open(url, NULL, NULL);

-               strncpy(buf, refname, sizeof(buf));

                html_txt(buf);
                html_link_close();
                html("</td><td>");
                html_txt(buf);
                html_link_close();
                html("</td><td>");

-               cgit_print_date(commit->date);
+               if (info->tagger_date > 0)
+                       cgit_print_age(info->tagger_date, -1, NULL);

                html("</td><td>");
                html("</td><td>");

-               url = cgit_pageurl(cgit_query_repo, "commit", fmt("id=%s", sha1_to_hex(sha1)));
-               html_link_open(url, NULL, NULL);
-               html_txt(info->subject);
-               html_link_close();
+               if (info->tagger)
+                       html(info->tagger);

                html("</td><td>");
                html("</td><td>");

-               html_txt(info->author);
+               cgit_object_link(tag->tagged);

                html("</td></tr>\n");
                html("</td></tr>\n");

-               cgit_free_commitinfo(info);

        } else {
        } else {

+               if (!header)
+                       print_tag_header();

                html("<tr><td>");
                html_txt(buf);
                html("<tr><td>");
                html_txt(buf);

-               html("</td><td>");
-               htmlf("*** bad ref %s", sha1_to_hex(sha1));
+               html("</td><td colspan='2'/><td>");
+               cgit_object_link(obj);

                html("</td></tr>\n");
        }
        return 0;
 }
 
                html("</td></tr>\n");
        }
        return 0;
 }
 

+static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
+                                int flags, void *cb_data)
+{
+       struct tag *tag;
+       struct taginfo *info;
+       struct object *obj;
+       char buf[256], *url;
+       unsigned char fileid[20];
+
+       if (prefixcmp(refname, "refs/archives"))
+               return 0;
+       strncpy(buf, refname+14, sizeof(buf));
+       obj = parse_object(sha1);
+       if (!obj)
+               return 1;
+       if (obj->type == OBJ_TAG) {
+               tag = lookup_tag(sha1);
+               if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
+                       return 0;
+               hashcpy(fileid, tag->tagged->sha1);
+       } else if (obj->type != OBJ_BLOB) {
+               return 0;
+       } else {
+               hashcpy(fileid, sha1);
+       }
+       if (!header) {
+               html("<table id='downloads'>");
+               html("<tr><th>Downloads</th></tr>");
+               header = 1;
+       }
+       html("<tr><td>");
+       url = cgit_pageurl(cgit_query_repo, "blob",
+                          fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
+                              buf));
+       html_link_open(url, NULL, NULL);
+       html_txt(buf);
+       html_link_close();
+       html("</td></tr>");
+       return 0;
+}
+

 static void cgit_print_branches()
 {
 static void cgit_print_branches()
 {

-       html("<table class='list'>");
-       html("<tr><th class='left'>Branch</th><th class='left'>Updated</th><th class='left'>Commit subject</th><th class='left'>Author</th></tr>\n");
+       html("<tr class='nohover'><th class='left'>Branch</th>"
+            "<th class='left'>Idle</th>"
+            "<th class='left'>Author</th>"
+            "<th class='left'>Head commit</th></tr>\n");

        for_each_branch_ref(cgit_print_branch_cb, NULL);
        for_each_branch_ref(cgit_print_branch_cb, NULL);

-       html("</table>");
+}
+
+static void cgit_print_tags()
+{
+       header = 0;
+       for_each_tag_ref(cgit_print_tag_cb, NULL);
+}
+
+static void cgit_print_archives()
+{
+       header = 0;
+       for_each_ref(cgit_print_archive_cb, NULL);
+       if (header)
+               html("</table>");

 }
 
 void cgit_print_summary()
 {
 }
 
 void cgit_print_summary()
 {

+       html("<div id='summary'>");
+       cgit_print_archives();

        html("<h2>");
        html("<h2>");

-       html_txt("Repo summary page");
+       html_txt(cgit_repo->name);
+       html(" - ");
+       html_txt(cgit_repo->desc);

        html("</h2>");
        html("</h2>");

+       if (cgit_repo->readme)
+               html_include(cgit_repo->readme);
+       html("</div>");
+       if (cgit_summary_log > 0)
+               cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, 0);
+       html("<table class='list nowrap'>");
+       if (cgit_summary_log > 0)
+               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");

        cgit_print_branches();
        cgit_print_branches();

+       html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+       cgit_print_tags();
+       html("</table>");

 }
 }