Remove global and obsolete cgit_cmd

[cgit.git] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index e7f7d6f43daf86212951455f307a0d0ddfa89533..60c92690e12ceceeaf8c85f323a0f133653c65ca 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -7,19 +7,27 @@
  */
 
 #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++;
-       if (cgit_repo->enable_log_linecount)
+       if (ctx.repo->enable_log_linecount)
                cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
 }
 
@@ -31,17 +39,18 @@ void print_commit(struct commit *commit)
        html("<tr><td>");
        cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
        html("</td><td>");
-       cgit_commit_link(info->subject, NULL, NULL, cgit_query_head,
+       cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
                         sha1_to_hex(commit->object.sha1));
-       if (cgit_repo->enable_log_filecount) {
+       if (ctx.repo->enable_log_filecount) {
                files = 0;
-               lines = 0;
+               add_lines = 0;
+               rem_lines = 0;
                cgit_diff_commit(commit, inspect_files);
                html("</td><td class='right'>");
                htmlf("%d", files);
-               if (cgit_repo->enable_log_linecount) {
+               if (ctx.repo->enable_log_linecount) {
                        html("</td><td class='right'>");
-                       htmlf("%d", lines);
+                       htmlf("-%d/+%d", rem_lines, add_lines);
                }
        }
        html("</td><td>");
@@ -60,7 +69,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        int i;
 
        if (!tip)
-               argv[1] = cgit_query_head;
+               argv[1] = ctx.qry.head;
 
        if (grep && pattern && (!strcmp(grep, "grep") ||
                                !strcmp(grep, "author") ||
@@ -83,14 +92,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        }
        prepare_revision_walk(&rev);
 
-       html("<table class='list nowrap'>");
+       html("<table summary='log' class='list nowrap'>");
        html("<tr class='nohover'><th class='left'>Age</th>"
             "<th class='left'>Message</th>");
 
-       if (cgit_repo->enable_log_filecount) {
-               html("<th class='left'>Files</th>");
-               if (cgit_repo->enable_log_linecount)
-                       html("<th class='left'>Lines</th>");
+       if (ctx.repo->enable_log_filecount) {
+               html("<th class='right'>Files</th>");
+               if (ctx.repo->enable_log_linecount)
+                       html("<th class='right'>Lines</th>");
        }
        html("<th class='left'>Author</th></tr>\n");
 
@@ -116,15 +125,17 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        if (pager) {
                html("<div class='pager'>");
                if (ofs > 0) {
-                       cgit_log_link("[prev]", NULL, NULL, cgit_query_head,
-                                     cgit_query_sha1, cgit_query_path,
-                                     ofs - cnt);
+                       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, cgit_query_head,
-                                     cgit_query_sha1, cgit_query_path,
-                                     ofs + cnt);
+                       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>");
        }