X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/8a631b1173b1abecc5a737b0e21751ddbabf9df2..fde897b8171ed2e925b44ec6f69590ec07241017:/ui-tag.c

diff --git a/ui-tag.c b/ui-tag.c
index 8c263ab..846d5b1 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -1,12 +1,13 @@
 /* ui-tag.c: display a tag
  *
- * Copyright (C) 2007 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
+#include "ui-tag.h"
 #include "html.h"
 #include "ui-shared.h"
 
@@ -30,63 +31,90 @@ 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.repo, revname, "<br/>");
+	html("</td></tr>");
+}
+
 void cgit_print_tag(char *revname)
 {
-	unsigned char sha1[20];
+	struct strbuf fullref = STRBUF_INIT;
+	struct object_id oid;
 	struct object *obj;
-	struct tag *tag;
-	struct taginfo *info;
 
 	if (!revname)
 		revname = ctx.qry.head;
 
-	if (get_sha1(fmt("refs/tags/%s", revname), sha1)) {
-		cgit_print_error(fmt("Bad tag reference: %s", revname));
-		return;
+	strbuf_addf(&fullref, "refs/tags/%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(fmt("Bad object id: %s", sha1_to_hex(sha1)));
-		return;
+		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(fmt("Bad tag object: %s", revname));
-			return;
+			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("<tr><td>tag date</td><td>");
+			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>");
+			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) {
+			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>");
+		html("<tr><td>tagged object</td><td class='sha1'>");
 		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>");
+		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");
-        }
-	return;
+		cgit_print_layout_end();
+	}
+
+cleanup:
+	strbuf_release(&fullref);
 }