git: update to v2.25.0

[ps-cgit] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index e69757195bea121a61f6c5313bb3a79fdc6db874..9a47b54c560544cf32e0b797614e04c6606eff80 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -19,19 +19,19 @@ void cgit_print_commit(char *hex, const char *prefix)
        struct commitinfo *info, *parent_info;
        struct commit_list *p;
        struct strbuf notes = STRBUF_INIT;
        struct commitinfo *info, *parent_info;
        struct commit_list *p;
        struct strbuf notes = STRBUF_INIT;

-       unsigned char sha1[20];
+       struct object_id oid;

        char *tmp, *tmp2;
        int parents = 0;
 
        if (!hex)
                hex = ctx.qry.head;
 
        char *tmp, *tmp2;
        int parents = 0;
 
        if (!hex)
                hex = ctx.qry.head;
 

-       if (get_sha1(hex, sha1)) {
+       if (get_oid(hex, &oid)) {

                cgit_print_error_page(400, "Bad request",
                                "Bad object id: %s", hex);
                return;
        }
                cgit_print_error_page(400, "Bad request",
                                "Bad object id: %s", hex);
                return;
        }

-       commit = lookup_commit_reference(sha1);
+       commit = lookup_commit_reference(the_repository, &oid);

        if (!commit) {
                cgit_print_error_page(404, "Not found",
                                "Bad commit reference: %s", hex);
        if (!commit) {
                cgit_print_error_page(404, "Not found",
                                "Bad commit reference: %s", hex);


@@ -39,9 +39,9 @@ void cgit_print_commit(char *hex, const char *prefix)
        }
        info = cgit_parse_commit(commit);
 
        }
        info = cgit_parse_commit(commit);
 

-       format_display_notes(sha1, &notes, PAGE_ENCODING, 0);
+       format_display_notes(&oid, &notes, PAGE_ENCODING, 0);

 
 

-       load_ref_decorations(DECORATE_FULL_REFS);
+       load_ref_decorations(NULL, DECORATE_FULL_REFS);

 
        cgit_print_layout_start();
        cgit_print_diff_ctrls();
 
        cgit_print_layout_start();
        cgit_print_diff_ctrls();


@@ -56,7 +56,7 @@ void cgit_print_commit(char *hex, const char *prefix)
        cgit_close_filter(ctx.repo->email_filter);
        html("</td><td class='right'>");
        html_txt(show_date(info->author_date, info->author_tz,
        cgit_close_filter(ctx.repo->email_filter);
        html("</td><td class='right'>");
        html_txt(show_date(info->author_date, info->author_tz,

-                               cgit_date_mode(FMT_LONGDATE)));
+                               cgit_date_mode(DATE_ISO8601)));

        html("</td></tr>\n");
        html("<tr><th>committer</th><td>");
        cgit_open_filter(ctx.repo->email_filter, info->committer_email, "commit");
        html("</td></tr>\n");
        html("<tr><th>committer</th><td>");
        cgit_open_filter(ctx.repo->email_filter, info->committer_email, "commit");


@@ -68,7 +68,7 @@ void cgit_print_commit(char *hex, const char *prefix)
        cgit_close_filter(ctx.repo->email_filter);
        html("</td><td class='right'>");
        html_txt(show_date(info->committer_date, info->committer_tz,
        cgit_close_filter(ctx.repo->email_filter);
        html("</td><td class='right'>");
        html_txt(show_date(info->committer_date, info->committer_tz,

-                               cgit_date_mode(FMT_LONGDATE)));
+                               cgit_date_mode(DATE_ISO8601)));

        html("</td></tr>\n");
        html("<tr><th>commit</th><td colspan='2' class='sha1'>");
        tmp = oid_to_hex(&commit->object.oid);
        html("</td></tr>\n");
        html("<tr><th>commit</th><td colspan='2' class='sha1'>");
        tmp = oid_to_hex(&commit->object.oid);


@@ -78,7 +78,7 @@ void cgit_print_commit(char *hex, const char *prefix)
        html(")</td></tr>\n");
        html("<tr><th>tree</th><td colspan='2' class='sha1'>");
        tmp = xstrdup(hex);
        html(")</td></tr>\n");
        html("<tr><th>tree</th><td colspan='2' class='sha1'>");
        tmp = xstrdup(hex);

-       cgit_tree_link(oid_to_hex(&commit->tree->object.oid), NULL, NULL,
+       cgit_tree_link(oid_to_hex(&commit->maybe_tree->object.oid), NULL, NULL,

                       ctx.qry.head, tmp, NULL);
        if (prefix) {
                html(" /");
                       ctx.qry.head, tmp, NULL);
        if (prefix) {
                html(" /");


@@ -87,7 +87,7 @@ void cgit_print_commit(char *hex, const char *prefix)
        free(tmp);
        html("</td></tr>\n");
        for (p = commit->parents; p; p = p->next) {
        free(tmp);
        html("</td></tr>\n");
        for (p = commit->parents; p; p = p->next) {

-               parent = lookup_commit_reference(p->item->object.oid.hash);
+               parent = lookup_commit_reference(the_repository, &p->item->object.oid);

                if (!parent) {
                        html("<tr><td colspan='3'>");
                        cgit_print_error("Error reading parent commit");
                if (!parent) {
                        html("<tr><td colspan='3'>");
                        cgit_print_error("Error reading parent commit");


@@ -110,8 +110,7 @@ void cgit_print_commit(char *hex, const char *prefix)
        }
        if (ctx.repo->snapshots) {
                html("<tr><th>download</th><td colspan='2' class='sha1'>");
        }
        if (ctx.repo->snapshots) {
                html("<tr><th>download</th><td colspan='2' class='sha1'>");

-               cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
-                                         hex, ctx.repo->snapshots);
+               cgit_print_snapshot_links(ctx.repo, hex, "<br/>");

                html("</td></tr>");
        }
        html("</table>\n");
                html("</td></tr>");
        }
        html("</table>\n");