Merge branch 'virtual-url'

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 6d5509bd3bce42e795a2c640c47a916e0085a277..4237921d2844f471d2ae48186ff51bd7863787d1 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -19,7 +19,8 @@ void count_lines(char *line, int size)
 void inspect_files(struct diff_filepair *pair)
 {
        files++;
-       cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
+       if (cgit_repo->enable_log_linecount)
+               cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
 }
 
 void print_commit(struct commit *commit)
@@ -34,18 +35,22 @@ void print_commit(struct commit *commit)
        strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M", time);
        html_txt(buf);
        html("</td><td>");
-       char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1));
+       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);
        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);
+       if (cgit_repo->enable_log_filecount) {
+               files = 0;
+               lines = 0;
+               cgit_diff_commit(commit, inspect_files);
+               html("</td><td class='right'>");
+               htmlf("%d", files);
+               if (cgit_repo->enable_log_linecount) {
+                       html("</td><td class='right'>");
+                       htmlf("%d", lines);
+               }
+       }
        html("</td><td>");
        html_txt(info->author);
        html("</td></tr>\n");
@@ -81,10 +86,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
 
        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");
+            "<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>");
+       }
+       html("<th class='left'>Author</th></tr>\n");
 
        if (ofs<0)
                ofs = 0;
@@ -121,4 +130,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
        }
        html("</div>");
 }
-