parsing.c: be prepared for unexpected content in commit/tag objects

[cgit.git] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 9d0ec025ddc50e54bb4017978166da73f8d2881e..746f40bbaf8a5bd2d3f2c07abd0290b971ae452b 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -7,62 +7,81 @@
  */
 
 #include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
 
-int files, lines;
+int files, add_lines, rem_lines;
 
 void count_lines(char *line, int size)
 {
-       if (size>0 && (line[0] == '+' || line[0] == '-'))
-               lines++;
+       if (size <= 0)
+               return;
+
+       if (line[0] == '+')
+               add_lines++;
+
+       else if (line[0] == '-')
+               rem_lines++;
 }
 
 void inspect_files(struct diff_filepair *pair)
 {
        files++;
-       cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
+       if (ctx.repo->enable_log_linecount)
+               cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
 }
 
 void print_commit(struct commit *commit)
 {
-       char buf[32];
        struct commitinfo *info;
-       struct tm *time;
+       char *tmp;
 
        info = cgit_parse_commit(commit);
-       time = gmtime(&commit->date);
        html("<tr><td>");
-       strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M", time);
-       html_txt(buf);
-       html("</td><td>");
-       char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1));
-       char *url = cgit_pageurl(cgit_query_repo, "commit", qry);
-       html_link_open(url, NULL, NULL);
-       html_ntxt(cgit_max_msg_len, info->subject);
+       tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
+       tmp = cgit_pageurl(ctx.repo->url, "commit", tmp);
+       html_link_open(tmp, NULL, NULL);
+       cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
        html_link_close();
-       files = 0;
-       lines = 0;
-       cgit_diff_commit(commit, inspect_files);
-       html("</td><td class='right'>");
-       htmlf("%d", files);
-       html("</td><td class='right'>");
-       htmlf("%d", lines);
+       html("</td><td>");
+       cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
+                        sha1_to_hex(commit->object.sha1));
        html("</td><td>");
        html_txt(info->author);
+       if (ctx.repo->enable_log_filecount) {
+               files = 0;
+               add_lines = 0;
+               rem_lines = 0;
+               cgit_diff_commit(commit, inspect_files);
+               html("</td><td>");
+               htmlf("%d", files);
+               if (ctx.repo->enable_log_linecount) {
+                       html("</td><td>");
+                       htmlf("-%d/+%d", rem_lines, add_lines);
+               }
+       }
        html("</td></tr>\n");
        cgit_free_commitinfo(info);
 }
 
 
-void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
+void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
+                   char *path, int pager)
 {
        struct rev_info rev;
        struct commit *commit;
        const char *argv[] = {NULL, tip, NULL, NULL, NULL};
        int argc = 2;
-       int i;
+       int i, columns = 3;
+
+       if (!tip)
+               argv[1] = ctx.qry.head;
+
+       if (grep && pattern && (!strcmp(grep, "grep") ||
+                               !strcmp(grep, "author") ||
+                               !strcmp(grep, "committer")))
+               argv[argc++] = fmt("--%s=%s", grep, pattern);
 
-       if (grep)
-               argv[argc++] = fmt("--grep=%s", grep);
        if (path) {
                argv[argc++] = "--";
                argv[argc++] = path;
@@ -79,12 +98,21 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
        }
        prepare_revision_walk(&rev);
 
-       html("<table class='list nowrap'>");
-       html("<tr class='nohover'><th class='left'>Date</th>"
-            "<th class='left'>Message</th>"
-            "<th class='left'>Files</th>"
-            "<th class='left'>Lines</th>"
-            "<th class='left'>Author</th></tr>\n");
+       if (pager)
+               html("<table class='list nowrap'>");
+
+       html("<tr class='nohover'><th class='left'>Age</th>"
+            "<th class='left'>Commit message</th>"
+            "<th class='left'>Author</th>");
+       if (ctx.repo->enable_log_filecount) {
+               html("<th class='left'>Files</th>");
+               columns++;
+               if (ctx.repo->enable_log_linecount) {
+                       html("<th class='left'>Lines</th>");
+                       columns++;
+               }
+       }
+       html("</tr>\n");
 
        if (ofs<0)
                ofs = 0;
@@ -103,21 +131,27 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
                free_commit_list(commit->parents);
                commit->parents = NULL;
        }
-       html("</table>\n");
-
-       html("<div class='pager'>");
-       if (ofs > 0) {
-               html("&nbsp;<a href='");
-               html(cgit_pageurl(cgit_query_repo, cgit_query_page,
-                                 fmt("h=%s&ofs=%d", tip, ofs-cnt)));
-               html("'>[prev]</a>&nbsp;");
-               }
-
-       if ((commit = get_revision(&rev)) != NULL) {
-               html("&nbsp;<a href='");
-               html(cgit_pageurl(cgit_query_repo, "log",
-                                 fmt("h=%s&ofs=%d", tip, ofs+cnt)));
-               html("'>[next]</a>&nbsp;");
+       if (pager) {
+               htmlf("</table><div class='pager'>",
+                    columns);
+               if (ofs > 0) {
+                       cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
+                                     ctx.qry.sha1, ctx.qry.path,
+                                     ofs - cnt, ctx.qry.grep,
+                                     ctx.qry.search);
+                       html("&nbsp;");
+               }
+               if ((commit = get_revision(&rev)) != NULL) {
+                       cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
+                                     ctx.qry.sha1, ctx.qry.path,
+                                     ofs + cnt, ctx.qry.grep,
+                                     ctx.qry.search);
+               }
+               html("</div>");
+       } else if ((commit = get_revision(&rev)) != NULL) {
+               html("<tr class='nohover'><td colspan='3'>");
+               cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0,
+                             NULL, NULL);
+               html("</td></tr>\n");
        }
-       html("</div>");
 }