git: update to 1.8.4

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index b49b2e9f187724adf04b017e9d3545d6a6b3dcfb..ef85a499e9fb7b98e7613fb69c5147f4fd0a67fe 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -7,178 +7,138 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

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

 
 

-int files = 0;
-
-void print_filepair(struct diff_filepair *pair)
-{
-       char *query;
-       char *class;
-       
-       switch (pair->status) {
-       case DIFF_STATUS_ADDED:
-               class = "add";
-               break;
-       case DIFF_STATUS_COPIED:
-               class = "cpy";
-               break;
-       case DIFF_STATUS_DELETED:
-               class = "del";
-               break;
-       case DIFF_STATUS_MODIFIED:
-               class = "upd";
-               break;
-       case DIFF_STATUS_RENAMED:
-               class = "mov";
-               break;
-       case DIFF_STATUS_TYPE_CHANGED:
-               class = "typ";
-               break;
-       case DIFF_STATUS_UNKNOWN:
-               class = "unk";
-               break;
-       case DIFF_STATUS_UNMERGED:
-               class = "stg";
-               break;
-       default:
-               die("bug: unhandled diff status %c", pair->status);
-       }
-
-       html("<tr>");
-       htmlf("<td class='mode'>");
-       if (is_null_sha1(pair->two->sha1)) {
-               html_filemode(pair->one->mode);
-       } else {
-               html_filemode(pair->two->mode);
-       }
-
-       if (pair->one->mode != pair->two->mode && 
-           !is_null_sha1(pair->one->sha1) && 
-           !is_null_sha1(pair->two->sha1)) {
-               html("<span class='modechange'>[");
-               html_filemode(pair->one->mode);
-               html("]</span>");
-       }
-       htmlf("</td><td class='%s'>", class);
-       query = fmt("id=%s", sha1_to_hex(pair->two->sha1));     
-       html_link_open(cgit_pageurl(cgit_query_repo, "view", query), 
-                      NULL, NULL);
-       if (pair->status == DIFF_STATUS_COPIED || 
-           pair->status == DIFF_STATUS_RENAMED) {
-               html_txt(pair->two->path);
-               htmlf("</a> (%s from ", pair->status == DIFF_STATUS_COPIED ? 
-                     "copied" : "renamed");
-               query = fmt("id=%s", sha1_to_hex(pair->one->sha1));     
-               html_link_open(cgit_pageurl(cgit_query_repo, "view", query), 
-                              NULL, NULL);
-               html_txt(pair->one->path);
-               html("</a>)");
-       } else {
-               html_txt(pair->two->path);
-               html("</a>");
-       }
-       html("<td>");
-
-       //TODO: diffstat graph
-       
-       html("</td></tr>\n");
-       files++;        
-}
-
-void diff_format_cb(struct diff_queue_struct *q,
-                   struct diff_options *options, void *data)
-{
-       int i;
-
-       for (i = 0; i < q->nr; i++) {
-               if (q->queue[i]->status == 'U')
-                       continue;
-               print_filepair(q->queue[i]);
-       }
-}
-
-void cgit_diffstat(struct commit *commit)
+void cgit_print_commit(char *hex, const char *prefix)

 {
 {

-       struct diff_options opt;
-       int ret;
-
-       diff_setup(&opt);
-       opt.output_format = DIFF_FORMAT_CALLBACK;
-       opt.detect_rename = 1;
-       opt.recursive = 1;
-       opt.format_callback = diff_format_cb;
-       diff_setup_done(&opt);
-       
-       if (commit->parents)
-               ret = diff_tree_sha1(commit->parents->item->object.sha1,
-                                    commit->object.sha1,
-                                    "", &opt);
-       else
-               ret = diff_root_tree_sha1(commit->object.sha1, "", &opt);
-
-       diffcore_std(&opt);
-       diff_flush(&opt);
-}
-
-void cgit_print_commit(const char *hex)
-{
-       struct commit *commit;
-       struct commitinfo *info;
+       struct commit *commit, *parent;
+       struct commitinfo *info, *parent_info;

        struct commit_list *p;
        struct commit_list *p;

+       struct strbuf notes = STRBUF_INIT;

        unsigned char sha1[20];
        unsigned char sha1[20];

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

 
        if (get_sha1(hex, sha1)) {
 
        if (get_sha1(hex, sha1)) {

-               cgit_print_error(fmt("Bad object id: %s", hex));
+               cgit_print_error("Bad object id: %s", hex);

                return;
        }
        commit = lookup_commit_reference(sha1);
        if (!commit) {
                return;
        }
        commit = lookup_commit_reference(sha1);
        if (!commit) {

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

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

-       html("<table class='commit-info'>\n");
+       format_display_notes(sha1, &notes, PAGE_ENCODING, 0);
+
+       load_ref_decorations(DECORATE_FULL_REFS);
+
+       cgit_print_diff_ctrls();
+       html("<table summary='commit info' class='commit-info'>\n");

        html("<tr><th>author</th><td>");
        html_txt(info->author);
        html("<tr><th>author</th><td>");
        html_txt(info->author);

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

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

-       cgit_print_date(info->author_date);
+       cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);

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

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

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

-       cgit_print_date(info->committer_date);
+       cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
+       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, prefix, 0);
+       html(" (");
+       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);
+       cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, 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");

-       html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
-       query = fmt("id=%s", sha1_to_hex(commit->tree->object.sha1));
-       html_attr(cgit_pageurl(cgit_query_repo, "tree", query));
-       htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1));
-       for (p = commit->parents; p ; p = p->next) {
+       for (p = commit->parents; p; p = p->next) {
+               parent = lookup_commit_reference(p->item->object.sha1);
+               if (!parent) {
+                       html("<tr><td colspan='3'>");
+                       cgit_print_error("Error reading parent commit");
+                       html("</td></tr>");
+                       continue;
+               }

                html("<tr><th>parent</th>"
                html("<tr><th>parent</th>"

-                    "<td colspan='2' class='sha1'>"
-                    "<a href='");
-               query = fmt("id=%s", sha1_to_hex(p->item->object.sha1));
-               html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
-               htmlf("'>%s</a></td></tr>\n", 
-                     sha1_to_hex(p->item->object.sha1));
+                    "<td colspan='2' class='sha1'>");
+               tmp = tmp2 = sha1_to_hex(p->item->object.sha1);
+               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, 0);
+               html(" (");
+               cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
+                              sha1_to_hex(p->item->object.sha1), prefix, 0);
+               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);
+               html("</td></tr>");

        }
        html("</table>\n");
        html("<div class='commit-subject'>");
        }
        html("</table>\n");
        html("<div class='commit-subject'>");

+       if (ctx.repo->commit_filter)
+               cgit_open_filter(ctx.repo->commit_filter);

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

+       if (ctx.repo->commit_filter)
+               cgit_close_filter(ctx.repo->commit_filter);
+       show_commit_decorations(commit);

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

+       if (ctx.repo->commit_filter)
+               cgit_open_filter(ctx.repo->commit_filter);

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

+       if (ctx.repo->commit_filter)
+               cgit_close_filter(ctx.repo->commit_filter);

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

-       html("<table class='diffstat'>");
-       html("<tr><th colspan='3'>Affected files</tr>\n");
-       cgit_diffstat(commit);
-       htmlf("<tr><td colspan='3' class='summary'>"
-             "%d file%s changed</td></tr>\n", files, files > 1 ? "s" : "");
-       html("</table>");
+       if (notes.len != 0) {
+               html("<div class='notes-header'>Notes</div>");
+               html("<div class='notes'>");
+               if (ctx.repo->commit_filter)
+                       cgit_open_filter(ctx.repo->commit_filter);
+               html_txt(notes.buf);
+               if (ctx.repo->commit_filter)
+                       cgit_close_filter(ctx.repo->commit_filter);
+               html("</div>");
+               html("<div class='notes-footer'></div>");
+       }
+       if (parents < 3) {
+               if (parents)
+                       tmp = sha1_to_hex(commit->parents->item->object.sha1);
+               else
+                       tmp = NULL;
+               cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0, 0);
+       }
+       strbuf_release(&notes);

        cgit_free_commitinfo(info);
 }
        cgit_free_commitinfo(info);
 }