Use GIT-1.5.4.rc4

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index e7f7d6f43daf86212951455f307a0d0ddfa89533..a41d2b2f03c181e73cf9ce2ce1b8657ad2851aaf 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -8,12 +8,18 @@
 
 #include "cgit.h"
 
 
 #include "cgit.h"
 

-int files, lines;
+int files, add_lines, rem_lines;

 
 void count_lines(char *line, int size)
 {
 
 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)
 }
 
 void inspect_files(struct diff_filepair *pair)


@@ -35,13 +41,14 @@ void print_commit(struct commit *commit)
                         sha1_to_hex(commit->object.sha1));
        if (cgit_repo->enable_log_filecount) {
                files = 0;
                         sha1_to_hex(commit->object.sha1));
        if (cgit_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) {
                        html("</td><td class='right'>");
                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);
+                       htmlf("-%d/+%d", rem_lines, add_lines);

                }
        }
        html("</td><td>");
                }
        }
        html("</td><td>");


@@ -83,14 +90,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        }
        prepare_revision_walk(&rev);
 
        }
        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("<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>");
+               html("<th class='right'>Files</th>");

                if (cgit_repo->enable_log_linecount)
                if (cgit_repo->enable_log_linecount)

-                       html("<th class='left'>Lines</th>");
+                       html("<th class='right'>Lines</th>");

        }
        html("<th class='left'>Author</th></tr>\n");
 
        }
        html("<th class='left'>Author</th></tr>\n");
 


@@ -118,13 +125,15 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                if (ofs > 0) {
                        cgit_log_link("[prev]", NULL, NULL, cgit_query_head,
                                      cgit_query_sha1, cgit_query_path,
                if (ofs > 0) {
                        cgit_log_link("[prev]", NULL, NULL, cgit_query_head,
                                      cgit_query_sha1, cgit_query_path,

-                                     ofs - cnt);
+                                     ofs - cnt, cgit_query_grep,
+                                     cgit_query_search);

                        html("&nbsp;");
                }
                if ((commit = get_revision(&rev)) != NULL) {
                        cgit_log_link("[next]", NULL, NULL, cgit_query_head,
                                      cgit_query_sha1, cgit_query_path,
                        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);
+                                     ofs + cnt, cgit_query_grep,
+                                     cgit_query_search);

                }
                html("</div>");
        }
                }
                html("</div>");
        }