Do not alter incoming sha1 when handling the download refs.

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index b930bb245d58248add16c8c125df43bab30cea6a..6d5509bd3bce42e795a2c640c47a916e0085a277 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -10,9 +10,16 @@
 
 int files, lines;
 
+void count_lines(char *line, int size)
+{
+       if (size>0 && (line[0] == '+' || line[0] == '-'))
+               lines++;
+}
+
 void inspect_files(struct diff_filepair *pair)
 {
        files++;
+       cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
 }
 
 void print_commit(struct commit *commit)
@@ -32,11 +39,13 @@ void print_commit(struct commit *commit)
        html_link_open(url, NULL, NULL);
        html_ntxt(cgit_max_msg_len, info->subject);
        html_link_close();
-       html("</td><td class='right'>");
        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>");
        html_txt(info->author);
        html("</td></tr>\n");
@@ -44,16 +53,20 @@ void print_commit(struct commit *commit)
 }
 
 
-void cgit_print_log(const char *tip, int ofs, int cnt, char *grep)
+void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
 {
        struct rev_info rev;
        struct commit *commit;
-       const char *argv[3] = {NULL, tip, NULL};
+       const char *argv[] = {NULL, tip, NULL, NULL, NULL};
        int argc = 2;
        int i;
 
        if (grep)
                argv[argc++] = fmt("--grep=%s", grep);
+       if (path) {
+               argv[argc++] = "--";
+               argv[argc++] = path;
+       }
        init_revisions(&rev, NULL);
        rev.abbrev = DEFAULT_ABBREV;
        rev.commit_format = CMIT_FMT_DEFAULT;
@@ -70,6 +83,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep)
        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 (ofs<0)