]> git.cameronkatri.com Git - cgit.git/blobdiff - ui-summary.c
Handle single-line and empty commit subjects
[cgit.git] / ui-summary.c
index 5518d011d8156572255290126741dca74aab0fbf..15e8aec9b6460ac98e6ea6386dfd718583863d0a 100644 (file)
@@ -8,6 +8,8 @@
 
 #include "cgit.h"
 
+static int header;
+
 static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
                                int flags, void *cb_data)
 {
@@ -20,18 +22,18 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
        if (commit && !parse_commit(commit)){
                info = cgit_parse_commit(commit);
                html("<tr><td>");
-               url = cgit_pageurl(cgit_query_repo, "log", 
+               url = cgit_pageurl(cgit_query_repo, "log",
                                   fmt("h=%s", refname));
                html_link_open(url, NULL, NULL);
                html_txt(buf);
                html_link_close();
                html("</td><td>");
-               cgit_print_date(commit->date);
+               cgit_print_age(commit->date, -1, NULL);
                html("</td><td>");
                html_txt(info->author);
                html("</td><td>");
-               url = cgit_pageurl(cgit_query_repo, "commit", 
-                                  fmt("id=%s", sha1_to_hex(sha1)));
+               url = cgit_pageurl(cgit_query_repo, "commit",
+                                  fmt("h=%s", sha1_to_hex(sha1)));
                html_link_open(url, NULL, NULL);
                html_ntxt(cgit_max_msg_len, info->subject);
                html_link_close();
@@ -47,57 +49,129 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
        return 0;
 }
 
+
+static void cgit_print_object_ref(struct object *obj)
+{
+       char *page, *arg, *url;
+
+       if (obj->type == OBJ_COMMIT) {
+               page = "commit";
+               arg = "h";
+       } else if (obj->type == OBJ_TREE) {
+               page = "tree";
+               arg = "id";
+       } else {
+               page = "view";
+               arg = "id";
+       }
+
+       url = cgit_pageurl(cgit_query_repo, page,
+                          fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
+       html_link_open(url, NULL, NULL);
+       htmlf("%s %s", typename(obj->type),
+             sha1_to_hex(obj->sha1));
+       html_link_close();
+}
+
+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;
-       char buf[256], *page, *url;
+       struct object *obj;
+       char buf[256], *url;
 
        strncpy(buf, refname, sizeof(buf));
-       tag = lookup_tag(sha1);
-       if (tag && !parse_tag(tag) && (info = cgit_parse_tag(tag))){
+       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, "view", 
+               url = cgit_pageurl(cgit_query_repo, "view",
                                   fmt("id=%s", sha1_to_hex(sha1)));
                html_link_open(url, NULL, NULL);
                html_txt(buf);
                html_link_close();
                html("</td><td>");
                if (info->tagger_date > 0)
-                       cgit_print_date(info->tagger_date);
+                       cgit_print_age(info->tagger_date, -1, NULL);
                html("</td><td>");
                if (info->tagger)
                        html(info->tagger);
                html("</td><td>");
-               if (tag->tagged->type == OBJ_COMMIT)
-                       page = "commit";
-               else if (tag->tagged->type == OBJ_TREE)
-                       page = "tree";
-               else
-                       page = "view";
-               
-               url = cgit_pageurl(cgit_query_repo, page, 
-                                  fmt("id=%s", sha1_to_hex(tag->tagged->sha1)));
-               html_link_open(url, NULL, NULL);
-               htmlf("%s %s", type_names[tag->tagged->type], 
-                     sha1_to_hex(tag->tagged->sha1));
-               html_link_close();
+               cgit_print_object_ref(tag->tagged);
                html("</td></tr>\n");
        } else {
+               if (!header)
+                       print_tag_header();
                html("<tr><td>");
                html_txt(buf);
-               html("</td><td colspan='3'>");
-               htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
+               html("</td><td colspan='2'/><td>");
+               cgit_print_object_ref(obj);
                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()
 {
        html("<tr class='nohover'><th class='left'>Branch</th>"
-            "<th class='left'>Updated</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);
@@ -105,18 +179,31 @@ static void cgit_print_branches()
 
 static void cgit_print_tags()
 {
-       html("<tr class='nohover'><th class='left'>Tag</th>"
-            "<th class='left'>Created</th>"
-            "<th class='left'>Author</th>"
-            "<th class='left'>Reference</th></tr>\n");
+       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()
 {
+       html("<div id='summary'>");
+       cgit_print_archives();
        html("<h2>");
-       html_txt("Repo summary page");
+       html_txt(cgit_repo->name);
+       html(" - ");
+       html_txt(cgit_repo->desc);
        html("</h2>");
+       if (cgit_repo->readme)
+               html_include(cgit_repo->readme);
+       html("</div>");
+
        html("<table class='list nowrap'>");
        cgit_print_branches();
        html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");