added a chk_non_negative check

[cgit.git] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index ff1fad33c9c73f074e93d1984bff354ec1b6381e..bf5e6dca6451b0f6a87d97695bad681850b7858f 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -11,6 +11,7 @@
 static int files, slots;
 static int total_adds, total_rems, max_changes;
 static int lines_added, lines_removed;
 static int files, slots;
 static int total_adds, total_rems, max_changes;
 static int lines_added, lines_removed;

+static char *curr_rev;

 
 static struct fileinfo {
        char status;
 
 static struct fileinfo {
        char status;


@@ -27,7 +28,6 @@ static struct fileinfo {
 
 void print_fileinfo(struct fileinfo *info)
 {
 
 void print_fileinfo(struct fileinfo *info)
 {

-       char *query, *query2;

        char *class;
 
        switch (info->status) {
        char *class;
 
        switch (info->status) {


@@ -75,24 +75,12 @@ void print_fileinfo(struct fileinfo *info)
                html("]</span>");
        }
        htmlf("</td><td class='%s'>", class);
                html("]</span>");
        }
        htmlf("</td><td class='%s'>", class);

-       query = fmt("id=%s&id2=%s&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>");
-       }
+       cgit_tree_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev,
+                      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'>");
        html("</td><td class='right'>");
        htmlf("%d", info->added + info->removed);
        html("</td><td class='graph'>");


@@ -103,7 +91,7 @@ void print_fileinfo(struct fileinfo *info)
              info->removed * 100.0 / max_changes);
        htmlf("<td class='none' style='width: %.1f%%;'/>",
              (max_changes - info->removed - info->added) * 100.0 / max_changes);
              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></a></td></tr>\n");
+       html("</tr></table></td></tr>\n");

 }
 
 void cgit_count_diff_lines(char *line, int len)
 }
 
 void cgit_count_diff_lines(char *line, int len)


@@ -145,16 +133,19 @@ void inspect_filepair(struct diff_filepair *pair)
 }
 
 
 }
 
 

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

 {
        struct commit *commit, *parent;
        struct commitinfo *info;
        struct commit_list *p;
        unsigned char sha1[20];
 {
        struct commit *commit, *parent;
        struct commitinfo *info;
        struct commit_list *p;
        unsigned char sha1[20];

-       char *query;
-       char *filename;
+       char *tmp;

        int i;
 
        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));
                return;
        if (get_sha1(hex, sha1)) {
                cgit_print_error(fmt("Bad object id: %s", hex));
                return;


@@ -172,20 +163,20 @@ 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("h=%s&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);
                if (!parent) {
        for (p = commit->parents; p ; p = p->next) {
                parent = lookup_commit_reference(p->item->object.sha1);
                if (!parent) {


@@ -195,23 +186,18 @@ 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&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='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,hex);
+               html("</td></tr>");

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


@@ -231,10 +217,9 @@ void cgit_print_commit(const char *hex)
                html("<div class='diffstat-summary'>");
                htmlf("%d files changed, %d insertions, %d deletions (",
                      files, total_adds, total_rems);
                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>)");
-               html("</div>");
+               cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex,
+                              NULL, NULL);
+               html(")</div>");

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