Merge branch 'iconv-rebased' of http://x2a.org/pub/git/cgit

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index f1a22d38714dafbf6647de73a078aa36cca368c0..4ac8955379b12f17fbb2c47cd5bea5299353dce2 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -8,14 +8,29 @@
 
 #include "cgit.h"
 
 
 #include "cgit.h"
 

-int files = 0;
+static int files, slots;
+static int total_adds, total_rems, max_changes;
+static int lines_added, lines_removed;
+static char *curr_rev;

 
 

-void print_filepair(struct diff_filepair *pair)
+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;

        char *class;
 
        char *class;
 

-       switch (pair->status) {
+       switch (info->status) {

        case DIFF_STATUS_ADDED:
                class = "add";
                break;
        case DIFF_STATUS_ADDED:
                class = "add";
                break;


@@ -41,59 +56,95 @@ void print_filepair(struct diff_filepair *pair)
                class = "stg";
                break;
        default:
                class = "stg";
                break;
        default:

-               die("bug: unhandled diff status %c", pair->status);
+               die("bug: unhandled diff status %c", info->status);

        }
 
        html("<tr>");
        htmlf("<td class='mode'>");
        }
 
        html("<tr>");
        htmlf("<td class='mode'>");

-       if (is_null_sha1(pair->two->sha1)) {
-               html_filemode(pair->one->mode);
+       if (is_null_sha1(info->new_sha1)) {
+               html_filemode(info->old_mode);

        } else {
        } else {

-               html_filemode(pair->two->mode);
+               html_filemode(info->new_mode);

        }
 
        }
 

-       if (pair->one->mode != pair->two->mode &&
-           !is_null_sha1(pair->one->sha1) &&
-           !is_null_sha1(pair->two->sha1)) {
+       if (info->old_mode != info->new_mode &&
+           !is_null_sha1(info->old_sha1) &&
+           !is_null_sha1(info->new_sha1)) {

                html("<span class='modechange'>[");
                html("<span class='modechange'>[");

-               html_filemode(pair->one->mode);
+               html_filemode(info->old_mode);

                html("]</span>");
        }
        htmlf("</td><td class='%s'>", class);
                html("]</span>");
        }
        htmlf("</td><td class='%s'>", class);

-       query = fmt("id=%s&id2=%s", sha1_to_hex(pair->one->sha1),
-                   sha1_to_hex(pair->two->sha1));
-       html_link_open(cgit_pageurl(cgit_query_repo, "diff", 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>");
+       cgit_diff_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev,
+                      NULL, info->new_path);
+       if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
+               htmlf(" (%s from %s)",
+                     info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
+                     info->old_path);
+       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");
+}

 
 

-       //TODO: diffstat graph
+void cgit_count_diff_lines(char *line, int len)
+{
+       if (line && (len > 0)) {
+               if (line[0] == '+')
+                       lines_added++;
+               else if (line[0] == '-')
+                       lines_removed++;
+       }
+}

 
 

-       html("</td></tr>\n");
+void inspect_filepair(struct diff_filepair *pair)
+{

        files++;
        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)

 {
 {

-       struct commit *commit;
+       struct commit *commit, *parent;

        struct commitinfo *info;
        struct commit_list *p;
        unsigned char sha1[20];
        struct commitinfo *info;
        struct commit_list *p;
        unsigned char sha1[20];

-       char *query;
-       char *filename;
+       char *tmp;
+       int i;
+
+       if (!hex)
+               hex = cgit_query_head;
+       curr_rev = hex;

 
        if (get_sha1(hex, sha1)) {
                cgit_print_error(fmt("Bad object id: %s", hex));
 
        if (get_sha1(hex, sha1)) {
                cgit_print_error(fmt("Bad object id: %s", hex));


@@ -112,34 +163,42 @@ void cgit_print_commit(const char *hex)
        html(" ");
        html_txt(info->author_email);
        html("</td><td class='right'>");
        html(" ");
        html_txt(info->author_email);
        html("</td><td class='right'>");

-       cgit_print_date(info->author_date);
+       cgit_print_date(info->author_date, FMT_LONGDATE);

        html("</td></tr>\n");
        html("<tr><th>committer</th><td>");
        html_txt(info->committer);
        html(" ");
        html_txt(info->committer_email);
        html("</td><td class='right'>");
        html("</td></tr>\n");
        html("<tr><th>committer</th><td>");
        html_txt(info->committer);
        html(" ");
        html_txt(info->committer_email);
        html("</td><td class='right'>");

-       cgit_print_date(info->committer_date);
+       cgit_print_date(info->committer_date, FMT_LONGDATE);
+       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_query_head, tmp, NULL);

        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'>");
+               cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
+                                cgit_query_head, sha1_to_hex(p->item->object.sha1));
+               html(" (");
+               cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex,
+                              sha1_to_hex(p->item->object.sha1), NULL);
+               html(")</td></tr>");

        }
        if (cgit_repo->snapshots) {
        }
        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&name=%s", hex, filename)));
-               htmlf("'>%s</a></td></tr>", filename);
+               html("<tr><th>download</th><td colspan='2' class='sha1'>");
+               cgit_print_snapshot_links(cgit_query_repo, cgit_query_head,
+                                         hex, cgit_repo->snapshots);
+               html("</td></tr>");

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


@@ -148,11 +207,20 @@ void cgit_print_commit(const char *hex)
        html("<div class='commit-msg'>");
        html_txt(info->msg);
        html("</div>");
        html("<div class='commit-msg'>");
        html_txt(info->msg);
        html("</div>");

-       html("<table class='diffstat'>");
-       html("<tr><th colspan='3'>Affected files</tr>\n");
-       cgit_diff_commit(commit, print_filepair);
-       htmlf("<tr><td colspan='3' class='summary'>"
-             "%d file%s changed</td></tr>\n", files, files > 1 ? "s" : "");
-       html("</table>");
+       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);
+               cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex,
+                              NULL, NULL);
+               html(")</div>");
+       }

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