Include cgit.conf in Makefile

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index def96f6d44f49b0806eaee2f86dd9a47d24bdbf8..6d5509bd3bce42e795a2c640c47a916e0085a277 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -8,6 +8,20 @@
 
 #include "cgit.h"
 
 
 #include "cgit.h"
 

+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)
 {
        char buf[32];
 void print_commit(struct commit *commit)
 {
        char buf[32];


@@ -17,14 +31,21 @@ void print_commit(struct commit *commit)
        info = cgit_parse_commit(commit);
        time = gmtime(&commit->date);
        html("<tr><td>");
        info = cgit_parse_commit(commit);
        time = gmtime(&commit->date);
        html("<tr><td>");

-       strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
+       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 *url = cgit_pageurl(cgit_query_repo, "commit", qry);
        html_link_open(url, NULL, NULL);
        html_txt(buf);
        html("</td><td>");
        char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1));
        char *url = cgit_pageurl(cgit_query_repo, "commit", qry);
        html_link_open(url, NULL, NULL);

-       html_txt(info->subject);
+       html_ntxt(cgit_max_msg_len, info->subject);

        html_link_close();
        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>");
        html_txt(info->author);
        html("</td></tr>\n");
        html("</td><td>");
        html_txt(info->author);
        html("</td></tr>\n");


@@ -32,25 +53,37 @@ void print_commit(struct commit *commit)
 }
 
 
 }
 
 

-void cgit_print_log(const char *tip, int ofs, int cnt)
+void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)

 {
        struct rev_info rev;
        struct commit *commit;
 {
        struct rev_info rev;
        struct commit *commit;

-       const char *argv[2] = {NULL, tip};
+       const char *argv[] = {NULL, tip, NULL, NULL, NULL};
+       int argc = 2;

        int i;
        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;
        rev.verbose_header = 1;
        rev.show_root_diff = 0;
        init_revisions(&rev, NULL);
        rev.abbrev = DEFAULT_ABBREV;
        rev.commit_format = CMIT_FMT_DEFAULT;
        rev.verbose_header = 1;
        rev.show_root_diff = 0;

-       setup_revisions(2, argv, &rev, NULL);
+       setup_revisions(argc, argv, &rev, NULL);
+       if (rev.grep_filter) {
+               rev.grep_filter->regflags |= REG_ICASE;
+               compile_grep_patterns(rev.grep_filter);
+       }

        prepare_revision_walk(&rev);
 
        prepare_revision_walk(&rev);
 

-       html("<h2>Log</h2>");
-       html("<table class='list log'>");
-       html("<tr><th class='left'>Date</th>"
+       html("<table class='list nowrap'>");
+       html("<tr class='nohover'><th class='left'>Date</th>"

             "<th class='left'>Message</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)
             "<th class='left'>Author</th></tr>\n");
 
        if (ofs<0)