tests: do not copy snapshots to /tmp/

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 1d12bbbcaf4a0ab5b7d7fd9c033aa529c099498e..948118c468d14b4f1f1311685d763cc7be5f3469 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,193 +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"

 
 

-static int files, slots;
-static int total_adds, total_rems, max_changes;
-static int lines_added, lines_removed;
-
-static struct fileinfo {
-       char status;
-       unsigned char old_sha1[20];
-       unsigned char new_sha1[20];
-       unsigned short old_mode;
-       unsigned short new_mode;
-       char *old_path;
-       char *new_path;
-       unsigned int added;
-       unsigned int removed;
-} *items;
-
-
-void print_fileinfo(struct fileinfo *info)
-{
-       char *query, *query2;
-       char *class;
-
-       switch (info->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", info->status);
-       }
-
-       html("<tr>");
-       htmlf("<td class='mode'>");
-       if (is_null_sha1(info->new_sha1)) {
-               html_filemode(info->old_mode);
-       } else {
-               html_filemode(info->new_mode);
-       }
-
-       if (info->old_mode != info->new_mode &&
-           !is_null_sha1(info->old_sha1) &&
-           !is_null_sha1(info->new_sha1)) {
-               html("<span class='modechange'>[");
-               html_filemode(info->old_mode);
-               html("]</span>");
-       }
-       htmlf("</td><td class='%s'>", class);
-       query = fmt("id=%s&amp;id2=%s&amp;path=%s", sha1_to_hex(info->old_sha1),
-                   sha1_to_hex(info->new_sha1), info->new_path);
-       html_link_open(cgit_pageurl(cgit_query_repo, "diff", query),
-                      NULL, NULL);
-       if (info->status == DIFF_STATUS_COPIED ||
-           info->status == DIFF_STATUS_RENAMED) {
-               html_txt(info->new_path);
-               htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ?
-                     "copied" : "renamed");
-               query2 = fmt("id=%s", sha1_to_hex(info->old_sha1));
-               html_link_open(cgit_pageurl(cgit_query_repo, "view", query2),
-                              NULL, NULL);
-               html_txt(info->old_path);
-               html("</a>)");
-       } else {
-               html_txt(info->new_path);
-               html("</a>");
-       }
-       html("</td><td class='right'>");
-       htmlf("%d", info->added + info->removed);
-       html("</td><td class='graph'>");
-       htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
-       htmlf("<td class='add' style='width: %.1f%%;'/>",
-             info->added * 100.0 / max_changes);
-       htmlf("<td class='rem' style='width: %.1f%%;'/>",
-             info->removed * 100.0 / max_changes);
-       htmlf("<td class='none' style='width: %.1f%%;'/>",
-             (max_changes - info->removed - info->added) * 100.0 / max_changes);
-       html("</tr></table></td></tr>\n");
-}
-
-void cgit_count_diff_lines(char *line, int len)
-{
-       if (line && (len > 0)) {
-               if (line[0] == '+')
-                       lines_added++;
-               else if (line[0] == '-')
-                       lines_removed++;
-       }
-}
-
-void inspect_filepair(struct diff_filepair *pair)
-{
-       files++;
-       lines_added = 0;
-       lines_removed = 0;
-       cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines);
-       if (files >= slots) {
-               if (slots == 0)
-                       slots = 4;
-               else
-                       slots = slots * 2;
-               items = xrealloc(items, slots * sizeof(struct fileinfo));
-       }
-       items[files-1].status = pair->status;
-       hashcpy(items[files-1].old_sha1, pair->one->sha1);
-       hashcpy(items[files-1].new_sha1, pair->two->sha1);
-       items[files-1].old_mode = pair->one->mode;
-       items[files-1].new_mode = pair->two->mode;
-       items[files-1].old_path = xstrdup(pair->one->path);
-       items[files-1].new_path = xstrdup(pair->two->path);
-       items[files-1].added = lines_added;
-       items[files-1].removed = lines_removed;
-       if (lines_added + lines_removed > max_changes)
-               max_changes = lines_added + lines_removed;
-       total_adds += lines_added;
-       total_rems += lines_removed;
-}
-
-
-void cgit_print_commit(const 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 *query;
-       char *filename;
-       int i;
+       struct strbuf notes = STRBUF_INIT;
+       struct object_id oid;
+       char *tmp, *tmp2;
+       int parents = 0;

 
 

-       if (get_sha1(hex, sha1)) {
-               cgit_print_error(fmt("Bad object id: %s", hex));
+       if (!hex)
+               hex = ctx.qry.head;
+
+       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);
 

-       html("<table class='commit-info'>\n");
+       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("<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);
+       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);
+       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='oid'>");
+       tmp = oid_to_hex(&commit->object.oid);
+       cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix);
+       html(" (");
+       cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
+       html(")</td></tr>\n");
+       html("<tr><th>tree</th><td colspan='2' class='oid'>");
+       tmp = xstrdup(hex);
+       cgit_tree_link(oid_to_hex(get_commit_tree_oid(commit)), 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("h=%s&amp;id=%s", sha1_to_hex(commit->object.sha1),
-                   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) {
-               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");


@@ -195,46 +95,53 @@ void cgit_print_commit(const char *hex)
                        continue;
                }
                html("<tr><th>parent</th>"
                        continue;
                }
                html("<tr><th>parent</th>"

-                    "<td colspan='2' class='sha1'>"
-                    "<a href='");
-               query = fmt("h=%s", sha1_to_hex(p->item->object.sha1));
-               html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
-               htmlf("'>%s</a> (<a href='",
-                     sha1_to_hex(p->item->object.sha1));
-               query = fmt("id=%s&amp;id2=%s", sha1_to_hex(parent->tree->object.sha1),
-                           sha1_to_hex(commit->tree->object.sha1));
-               html_attr(cgit_pageurl(cgit_query_repo, "diff", query));
-               html("'>diff</a>)</td></tr>");
+                    "<td colspan='2' class='oid'>");
+               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,
+                              oid_to_hex(&p->item->object.oid), prefix);
+               html(")</td></tr>");
+               parents++;

        }
        }

-       if (cgit_repo->snapshots) {
-               htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
-               filename = fmt("%s-%s.zip", cgit_query_repo, hex);
-               html_attr(cgit_pageurl(cgit_query_repo, "snapshot",
-                                      fmt("id=%s&amp;name=%s", hex, filename)));
-               htmlf("'>%s</a></td></tr>", filename);
+       if (ctx.repo->snapshots) {
+               html("<tr><th>download</th><td colspan='2' class='oid'>");
+               cgit_print_snapshot_links(ctx.repo, hex, "<br/>");
+               html("</td></tr>");

        }
        html("</table>\n");
        html("<div class='commit-subject'>");
        }
        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'>");
        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 (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
-               html("<div class='diffstat-header'>Diffstat</div>");
-               html("<table class='diffstat'>");
-               max_changes = 0;
-               cgit_diff_commit(commit, inspect_filepair);
-               for(i = 0; i<files; i++)
-                       print_fileinfo(&items[i]);
-               html("</table>");
-               html("<div class='diffstat-summary'>");
-               htmlf("%d files changed, %d insertions, %d deletions (",
-                     files, total_adds, total_rems);
-               query = fmt("h=%s", hex);
-               html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL);
-               html("show diff</a>)");
+       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>");

+               html("<div class='notes-footer'></div>");
+       }
+       if (parents < 3) {
+               if (parents)
+                       tmp = oid_to_hex(&commit->parents->item->object.oid);
+               else
+                       tmp = NULL;
+               cgit_print_diff(ctx.qry.oid, tmp, prefix, 0, 0);

        }
        }

+       strbuf_release(&notes);

        cgit_free_commitinfo(info);
        cgit_free_commitinfo(info);

+       cgit_print_layout_end();

 }
 }