Use GIT-1.5.5-rc2

[cgit.git] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 75bbbe48e3c640af1b5db42a9975e5e3f2a40ed9..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)


@@ -31,20 +37,18 @@ void print_commit(struct commit *commit)
        html("<tr><td>");
        cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
        html("</td><td>");
        html("<tr><td>");
        cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
        html("</td><td>");

-       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();
+       cgit_commit_link(info->subject, NULL, NULL, cgit_query_head,
+                        sha1_to_hex(commit->object.sha1));

        if (cgit_repo->enable_log_filecount) {
                files = 0;
        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>");


@@ -54,7 +58,7 @@ void print_commit(struct commit *commit)
 }
 
 
 }
 
 

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

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


@@ -62,8 +66,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
        int argc = 2;
        int i;
 
        int argc = 2;
        int i;
 

-       if (grep)
-               argv[argc++] = fmt("--grep=%s", grep);
+       if (!tip)
+               argv[1] = cgit_query_head;
+
+       if (grep && pattern && (!strcmp(grep, "grep") ||
+                               !strcmp(grep, "author") ||
+                               !strcmp(grep, "committer")))
+               argv[argc++] = fmt("--%s=%s", grep, pattern);
+

        if (path) {
                argv[argc++] = "--";
                argv[argc++] = path;
        if (path) {
                argv[argc++] = "--";
                argv[argc++] = path;


@@ -80,14 +90,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
        }
        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");
 


@@ -110,19 +120,21 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
        }
        html("</table>\n");
 
        }
        html("</table>\n");
 

-       html("<div class='pager'>");
-       if (ofs > 0) {
-               html("&nbsp;<a href='");
-               html(cgit_pageurl(cgit_query_repo, cgit_query_page,
-                                 fmt("h=%s&amp;ofs=%d", tip, ofs-cnt)));
-               html("'>[prev]</a>&nbsp;");
-               }
-
-       if ((commit = get_revision(&rev)) != NULL) {
-               html("&nbsp;<a href='");
-               html(cgit_pageurl(cgit_query_repo, "log",
-                                 fmt("h=%s&amp;ofs=%d", tip, ofs+cnt)));
-               html("'>[next]</a>&nbsp;");
+       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_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,
+                                     ofs + cnt, cgit_query_grep,
+                                     cgit_query_search);
+               }
+               html("</div>");

        }
        }

-       html("</div>");

 }
 }