tests: t0107: support older and/or non-GNU tar

[cgit.git] / ui-tag.c

diff --git a/ui-tag.c b/ui-tag.c
index 3fa63b3e760d3d5ba63e5a381a30e5fed1f491ea..424bbccd5f316965c8eaf9aaf80af9eebdbca683 100644 (file)
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -33,38 +33,37 @@ static void print_tag_content(char *buf)
 
 static void print_download_links(char *revname)
 {
 
 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;
        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;
 
        if (!revname)
                revname = ctx.qry.head;
 
        strbuf_addf(&fullref, "refs/tags/%s", revname);
        struct object *obj;
 
        if (!revname)
                revname = ctx.qry.head;
 
        strbuf_addf(&fullref, "refs/tags/%s", revname);

-       if (get_sha1(fullref.buf, sha1)) {
+       if (get_oid(fullref.buf, &oid)) {

                cgit_print_error_page(404, "Not found",
                        "Bad tag reference: %s", revname);
                goto cleanup;
        }
                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_page(500, "Internal server error",
        if (!obj) {
                cgit_print_error_page(500, "Internal server error",

-                       "Bad object id: %s", sha1_to_hex(sha1));
+                       "Bad object id: %s", oid_to_hex(&oid));

                goto cleanup;
        }
        if (obj->type == OBJ_TAG) {
                struct tag *tag;
                struct taginfo *info;
 
                goto cleanup;
        }
        if (obj->type == OBJ_TAG) {
                struct tag *tag;
                struct taginfo *info;
 

-               tag = lookup_tag(sha1);
+               tag = lookup_tag(the_repository, &oid);

                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) {
                        cgit_print_error_page(500, "Internal server error",
                                "Bad tag object: %s", revname);
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) {
                        cgit_print_error_page(500, "Internal server error",
                                "Bad tag object: %s", revname);


@@ -72,9 +71,9 @@ void cgit_print_tag(char *revname)
                }
                cgit_print_layout_start();
                html("<table class='commit-info'>\n");
                }
                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_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>");
                        html_txt(show_date(info->tagger_date, info->tagger_tz,
                if (info->tagger_date > 0) {
                        html("<tr><td>tag date</td><td>");
                        html_txt(show_date(info->tagger_date, info->tagger_tz,


@@ -92,7 +91,7 @@ void cgit_print_tag(char *revname)
                        cgit_close_filter(ctx.repo->email_filter);
                        html("</td></tr>\n");
                }
                        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)
                cgit_object_link(tag->tagged);
                html("</td></tr>\n");
                if (ctx.repo->snapshots)


@@ -104,10 +103,10 @@ void cgit_print_tag(char *revname)
        } else {
                cgit_print_layout_start();
                html("<table class='commit-info'>\n");
        } 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_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)
                cgit_object_link(obj);
                html("</td></tr>\n");
                if (ctx.repo->snapshots)