ui-shared: pass separator in to cgit_print_snapshot_links()

[cgit.git] / ui-tag.c

diff --git a/ui-tag.c b/ui-tag.c
index ec9c757db22d8196bebefb1ae020ac33ca30b627..2c96c37efc6cc7be4643b9ecbc5d6031755cf310 100644 (file)
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -34,54 +34,61 @@ static void print_tag_content(char *buf)
 static void print_download_links(char *revname)
 {
        html("<tr><th>download</th><td class='sha1'>");
-       cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
-                                 revname, ctx.repo->snapshots);
+       cgit_print_snapshot_links(ctx.repo, revname, "<br/>");
        html("</td></tr>");
 }
 
 void cgit_print_tag(char *revname)
 {
        struct strbuf fullref = STRBUF_INIT;
-       unsigned char sha1[20];
+       struct object_id oid;
        struct object *obj;
-       struct tag *tag;
-       struct taginfo *info;
 
        if (!revname)
                revname = ctx.qry.head;
 
        strbuf_addf(&fullref, "refs/tags/%s", revname);
-       if (get_sha1(fullref.buf, sha1)) {
-               cgit_print_error("Bad tag reference: %s", revname);
+       if (get_oid(fullref.buf, &oid)) {
+               cgit_print_error_page(404, "Not found",
+                       "Bad tag reference: %s", revname);
                goto cleanup;
        }
-       obj = parse_object(sha1);
+       obj = parse_object(&oid);
        if (!obj) {
-               cgit_print_error("Bad object id: %s", sha1_to_hex(sha1));
+               cgit_print_error_page(500, "Internal server error",
+                       "Bad object id: %s", oid_to_hex(&oid));
                goto cleanup;
        }
        if (obj->type == OBJ_TAG) {
-               tag = lookup_tag(sha1);
+               struct tag *tag;
+               struct taginfo *info;
+
+               tag = lookup_tag(&oid);
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) {
-                       cgit_print_error("Bad tag object: %s", revname);
+                       cgit_print_error_page(500, "Internal server error",
+                               "Bad tag object: %s", revname);
                        goto cleanup;
                }
+               cgit_print_layout_start();
                html("<table class='commit-info'>\n");
                htmlf("<tr><td>tag name</td><td>");
                html_txt(revname);
-               htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1));
+               htmlf(" (%s)</td></tr>\n", oid_to_hex(&oid));
                if (info->tagger_date > 0) {
                        html("<tr><td>tag date</td><td>");
-                       cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time);
+                       html_txt(show_date(info->tagger_date, info->tagger_tz,
+                                               cgit_date_mode(DATE_ISO8601)));
                        html("</td></tr>\n");
                }
                if (info->tagger) {
                        html("<tr><td>tagged by</td><td>");
+                       cgit_open_filter(ctx.repo->email_filter, info->tagger_email, "tag");
                        html_txt(info->tagger);
                        if (info->tagger_email && !ctx.cfg.noplainemail) {
                                html(" ");
                                html_txt(info->tagger_email);
                        }
+                       cgit_close_filter(ctx.repo->email_filter);
                        html("</td></tr>\n");
                }
                html("<tr><td>tagged object</td><td class='sha1'>");
@@ -91,17 +98,21 @@ void cgit_print_tag(char *revname)
                        print_download_links(revname);
                html("</table>\n");
                print_tag_content(info->msg);
+               cgit_print_layout_end();
+               cgit_free_taginfo(info);
        } else {
+               cgit_print_layout_start();
                html("<table class='commit-info'>\n");
                htmlf("<tr><td>tag name</td><td>");
                html_txt(revname);
                html("</td></tr>\n");
-               html("<tr><td>Tagged object</td><td class='sha1'>");
+               html("<tr><td>tagged object</td><td class='sha1'>");
                cgit_object_link(obj);
                html("</td></tr>\n");
                if (ctx.repo->snapshots)
                        print_download_links(revname);
                html("</table>\n");
+               cgit_print_layout_end();
        }
 
 cleanup: