git: update to v2.24.0

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 41ce70e2a9964839b5bf8f03ba6698b7d1ac69d1..9a47b54c560544cf32e0b797614e04c6606eff80 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,70 +1,93 @@
 /* ui-commit.c: generate commit view
  *
 /* ui-commit.c: generate commit view
  *

- * Copyright (C) 2006 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"
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"

+#include "ui-commit.h"

 #include "html.h"
 #include "ui-shared.h"
 #include "ui-diff.h"
 #include "ui-log.h"
 
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-diff.h"
 #include "ui-log.h"
 

-void cgit_print_commit(char *hex)
+void cgit_print_commit(char *hex, const char *prefix)

 {
        struct commit *commit, *parent;
 {
        struct commit *commit, *parent;

-       struct commitinfo *info;
+       struct commitinfo *info, *parent_info;

        struct commit_list *p;
        struct commit_list *p;

-       unsigned char sha1[20];
-       char *tmp;
+       struct strbuf notes = STRBUF_INIT;
+       struct object_id oid;
+       char *tmp, *tmp2;

        int parents = 0;
 
        if (!hex)
                hex = ctx.qry.head;
 
        int parents = 0;
 
        if (!hex)
                hex = ctx.qry.head;
 

-       if (get_sha1(hex, sha1)) {
-               cgit_print_error(fmt("Bad object id: %s", hex));
+       if (get_oid(hex, &oid)) {
+               cgit_print_error_page(400, "Bad request",
+                               "Bad object id: %s", hex);

                return;
        }
                return;
        }

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

        if (!commit) {
        if (!commit) {

-               cgit_print_error(fmt("Bad commit reference: %s", hex));
+               cgit_print_error_page(404, "Not found",
+                               "Bad commit reference: %s", hex);

                return;
        }
        info = cgit_parse_commit(commit);
 
                return;
        }
        info = cgit_parse_commit(commit);
 

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

 
 

+       load_ref_decorations(NULL, DECORATE_FULL_REFS);
+
+       cgit_print_layout_start();
+       cgit_print_diff_ctrls();

        html("<table summary='commit info' class='commit-info'>\n");
        html("<tr><th>author</th><td>");
        html("<table summary='commit info' class='commit-info'>\n");
        html("<tr><th>author</th><td>");

+       cgit_open_filter(ctx.repo->email_filter, info->author_email, "commit");

        html_txt(info->author);
        html_txt(info->author);

-       html(" ");
-       html_txt(info->author_email);
+       if (!ctx.cfg.noplainemail) {
+               html(" ");
+               html_txt(info->author_email);
+       }
+       cgit_close_filter(ctx.repo->email_filter);

        html("</td><td class='right'>");
        html("</td><td class='right'>");

-       cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
+       html_txt(show_date(info->author_date, info->author_tz,
+                               cgit_date_mode(DATE_ISO8601)));

        html("</td></tr>\n");
        html("<tr><th>committer</th><td>");
        html("</td></tr>\n");
        html("<tr><th>committer</th><td>");

+       cgit_open_filter(ctx.repo->email_filter, info->committer_email, "commit");

        html_txt(info->committer);
        html_txt(info->committer);

-       html(" ");
-       html_txt(info->committer_email);
+       if (!ctx.cfg.noplainemail) {
+               html(" ");
+               html_txt(info->committer_email);
+       }
+       cgit_close_filter(ctx.repo->email_filter);

        html("</td><td class='right'>");
        html("</td><td class='right'>");

-       cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
+       html_txt(show_date(info->committer_date, info->committer_tz,
+                               cgit_date_mode(DATE_ISO8601)));

        html("</td></tr>\n");
        html("<tr><th>commit</th><td colspan='2' class='sha1'>");
        html("</td></tr>\n");
        html("<tr><th>commit</th><td colspan='2' class='sha1'>");

-       tmp = sha1_to_hex(commit->object.sha1);
-       cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp);
+       tmp = oid_to_hex(&commit->object.oid);
+       cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix);

        html(" (");
        html(" (");

-       cgit_patch_link("patch", NULL, NULL, NULL, tmp);
+       cgit_patch_link("patch", NULL, NULL, NULL, tmp, 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(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
+       cgit_tree_link(oid_to_hex(&commit->maybe_tree->object.oid), NULL, NULL,

                       ctx.qry.head, tmp, NULL);
                       ctx.qry.head, tmp, NULL);

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

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

-       for (p = commit->parents; p ; p = p->next) {
-               parent = lookup_commit_reference(p->item->object.sha1);
+       for (p = commit->parents; p; p = p->next) {
+               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");


@@ -73,34 +96,52 @@ void cgit_print_commit(char *hex)
                }
                html("<tr><th>parent</th>"
                     "<td colspan='2' class='sha1'>");
                }
                html("<tr><th>parent</th>"
                     "<td colspan='2' class='sha1'>");

-               cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
-                                ctx.qry.head, sha1_to_hex(p->item->object.sha1));
+               tmp = tmp2 = oid_to_hex(&p->item->object.oid);
+               if (ctx.repo->enable_subject_links) {
+                       parent_info = cgit_parse_commit(parent);
+                       tmp2 = parent_info->subject;
+               }
+               cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix);

                html(" (");
                cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
                html(" (");
                cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,

-                              sha1_to_hex(p->item->object.sha1), NULL);
+                              oid_to_hex(&p->item->object.oid), prefix);

                html(")</td></tr>");
                parents++;
        }
        if (ctx.repo->snapshots) {
                html("<tr><th>download</th><td colspan='2' class='sha1'>");
                html(")</td></tr>");
                parents++;
        }
        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("<div class='commit-subject'>");
                html("</td></tr>");
        }
        html("</table>\n");
        html("<div class='commit-subject'>");

+       cgit_open_filter(ctx.repo->commit_filter);

        html_txt(info->subject);
        html_txt(info->subject);

+       cgit_close_filter(ctx.repo->commit_filter);

        show_commit_decorations(commit);
        html("</div>");
        html("<div class='commit-msg'>");
        show_commit_decorations(commit);
        html("</div>");
        html("<div class='commit-msg'>");

+       cgit_open_filter(ctx.repo->commit_filter);

        html_txt(info->msg);
        html_txt(info->msg);

+       cgit_close_filter(ctx.repo->commit_filter);

        html("</div>");
        html("</div>");

+       if (notes.len != 0) {
+               html("<div class='notes-header'>Notes</div>");
+               html("<div class='notes'>");
+               cgit_open_filter(ctx.repo->commit_filter);
+               html_txt(notes.buf);
+               cgit_close_filter(ctx.repo->commit_filter);
+               html("</div>");
+               html("<div class='notes-footer'></div>");
+       }

        if (parents < 3) {
                if (parents)
        if (parents < 3) {
                if (parents)

-                       tmp = sha1_to_hex(commit->parents->item->object.sha1);
+                       tmp = oid_to_hex(&commit->parents->item->object.oid);

                else
                        tmp = NULL;
                else
                        tmp = NULL;

-               cgit_print_diff(ctx.qry.sha1, tmp, NULL);
+               cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0, 0);

        }
        }

+       strbuf_release(&notes);

        cgit_free_commitinfo(info);
        cgit_free_commitinfo(info);

+       cgit_print_layout_end();

 }
 }