X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/786609bd36c07b85dbf905fc8c36eba7132122d7..43df01c10feb1c7deace56e93a43a4fb93b55e27:/ui-tag.c

diff --git a/ui-tag.c b/ui-tag.c
index c1d1738..424bbcc 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -33,46 +33,51 @@ 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);
+	html("<tr><th>download</th><td class='oid'>");
+	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(the_repository, &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(the_repository, &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("<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) {
@@ -86,24 +91,28 @@ void cgit_print_tag(char *revname)
 			cgit_close_filter(ctx.repo->email_filter);
 			html("</td></tr>\n");
 		}
-		html("<tr><td>tagged object</td><td class='sha1'>");
+		html("<tr><td>tagged object</td><td class='oid'>");
 		cgit_object_link(tag->tagged);
 		html("</td></tr>\n");
 		if (ctx.repo->snapshots)
 			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("<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='oid'>");
 		cgit_object_link(obj);
 		html("</td></tr>\n");
 		if (ctx.repo->snapshots)
 			print_download_links(revname);
 		html("</table>\n");
+		cgit_print_layout_end();
 	}
 
 cleanup: