7 files changed, 111 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index cea09f1..50d0011 100644
--- a/Makefile
+++ b/Makefile
@@ -25,3 +25,3 @@ OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
         ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
-        ui-snapshot.o ui-blob.o
+        ui-snapshot.o ui-blob.o ui-tag.o
 
diff --git a/cgit.c b/cgit.c
index 1281bfa..4b91829 100644
--- a/cgit.c
+++ b/cgit.c
@@ -103,2 +103,5 @@ static void cgit_print_repo_page(struct cacheitem *item)
                 break;
+        case CMD_TAG:
+                cgit_print_tag(cgit_query_sha1);
+                break;
         case CMD_DIFF:
diff --git a/cgit.h b/cgit.h
index 2ff5340..610a16d 100644
--- a/cgit.h
+++ b/cgit.h
@@ -29,3 +29,3 @@
 #define CMD_SNAPSHOT 6
-
+#define CMD_TAG      7
 
@@ -214,2 +214,4 @@ extern void cgit_diff_link(char *name, char *title, char *class, char *head,
 
+extern void cgit_object_link(struct object *obj);
+
 extern void cgit_print_error(char *msg);
@@ -230,2 +232,3 @@ extern void cgit_print_tree(const char *rev, char *path);
 extern void cgit_print_commit(char *hex);
+extern void cgit_print_tag(char *revname);
 extern void cgit_print_diff(const char *new_hex, const char *old_hex);
diff --git a/shared.c b/shared.c
index 1a5b866..06693b0 100644
--- a/shared.c
+++ b/shared.c
@@ -65,3 +65,3 @@ int cgit_get_cmd_index(const char *cmd)
         static char *cmds[] = {"log", "commit", "diff", "tree", "blob",
-                               "snapshot", NULL};
+                               "snapshot", "tag", NULL};
         int i;
diff --git a/ui-shared.c b/ui-shared.c
index d4376ce..fd71c12 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -220,2 +220,26 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
 
+void cgit_object_link(struct object *obj)
+{
+        char *page, *arg, *url;
+
+        if (obj->type == OBJ_COMMIT) {
+                cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
+                                 cgit_query_head, sha1_to_hex(obj->sha1));
+                return;
+        } else if (obj->type == OBJ_TREE) {
+                page = "tree";
+                arg = "id";
+        } else {
+                page = "blob";
+                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();
+}
+
 void cgit_print_date(time_t secs, char *format)
diff --git a/ui-summary.c b/ui-summary.c
index b4bc6d8..de8a180 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -49,27 +49,2 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
 
-
-static void cgit_print_object_ref(struct object *obj)
-{
-        char *page, *arg, *url;
-
-        if (obj->type == OBJ_COMMIT) {
-                cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
-                                 cgit_query_head, sha1_to_hex(obj->sha1));
-                return;
-        } 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()
@@ -102,4 +77,4 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
                 html("<tr><td>");
-                url = cgit_pageurl(cgit_query_repo, "view",
-                                   fmt("id=%s", sha1_to_hex(sha1)));
+                url = cgit_pageurl(cgit_query_repo, "tag",
+                                   fmt("id=%s", refname));
                 html_link_open(url, NULL, NULL);
@@ -114,3 +89,3 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
                 html("</td><td>");
-                cgit_print_object_ref(tag->tagged);
+                cgit_object_link(tag->tagged);
                 html("</td></tr>\n");
@@ -122,3 +97,3 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
                 html("</td><td colspan='2'/><td>");
-                cgit_print_object_ref(obj);
+                cgit_object_link(obj);
                 html("</td></tr>\n");
diff --git a/ui-tag.c b/ui-tag.c
new file mode 100644
index 0000000..a6989ff
--- a/dev/null
+++ b/ui-tag.c
@@ -0,0 +1,74 @@
+/* ui-tag.c: display a tag
+ *
+ * Copyright (C) 2007 Lars Hjemli
+ *
+ * Licensed under GNU General Public License v2
+ *   (see COPYING for full license text)
+ */
+
+#include "cgit.h"
+
+
+static void print_tag_content(char *buf)
+{
+        char *p;
+
+        if (!buf)
+                return;
+
+        html("<div class='commit-subject'>");
+        p = strchr(buf, '\n');
+        if (p)
+                *p = '\0';
+        html_txt(buf);
+        html("</div>");
+        if (p) {
+                html("<div class='commit-msg'>");
+                html_txt(++p);
+                html("</div>");
+        }
+}
+
+void cgit_print_tag(char *revname)
+{
+        unsigned char sha1[20];
+        struct object *obj;
+        struct tag *tag;
+        struct taginfo *info;
+
+        if (get_sha1(revname, sha1)) {
+                cgit_print_error(fmt("Bad tag reference: %s", revname));
+                return;
+        }
+        obj = parse_object(sha1);
+        if (!obj) {
+                cgit_print_error(fmt("Bad object id: %s", sha1_to_hex(sha1)));
+                return;
+        }
+        if (obj->type == OBJ_TAG) {
+                tag = lookup_tag(sha1);
+                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) {
+                        cgit_print_error(fmt("Bad tag object: %s", revname));
+                        return;
+                }
+                html("<table class='commit-info'>\n");
+                htmlf("<tr><td>Tag name</td><td>%s (%s)</td></tr>\n",
+                      revname, sha1_to_hex(sha1));
+                if (info->tagger_date > 0) {
+                        html("<tr><td>Tag date</td><td>");
+                        cgit_print_date(info->tagger_date, FMT_LONGDATE);
+                        html("</td><tr>\n");
+                }
+                if (info->tagger) {
+                        html("<tr><td>Tagged by</td><td>");
+                        html_txt(info->tagger);
+                        html("</td></tr>\n");
+                }
+                html("<tr><td>Tagged object</td><td>");
+                cgit_object_link(tag->tagged);
+                html("</td></tr>\n");
+                html("</table>\n");
+                print_tag_content(info->msg);
+        }
+        return;
+}