Use GIT-1.6.0.2

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 4d2c2e0dcbc499b0c9db15f41ea3f41aba5ded31..8dd8b898c4deadb9c89dc53f070c2f22e0f56eb0 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -7,114 +7,149 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "html.h"
+#include "ui-shared.h"

 
 

-static int get_one_line(char *txt)
+int files, add_lines, rem_lines;
+
+void count_lines(char *line, int size)

 {
 {

-       char *t;
+       if (size <= 0)
+               return;
+
+       if (line[0] == '+')
+               add_lines++;

 
 

-       for(t=txt; *t != '\n' && t != '\0'; t++)
-               ;
-       *t = '\0';
-       return t-txt-1;
+       else if (line[0] == '-')
+               rem_lines++;

 }
 
 }
 

-static void cgit_print_commit_shortlog(struct commit *commit)
+void inspect_files(struct diff_filepair *pair)

 {
 {

-       char *h, *t, *p; 
-       char *tree = NULL, *author = NULL, *subject = NULL;
-       int len;
-       time_t sec;
-       struct tm *time;
-       char buf[32];
-
-       h = t = commit->buffer;
-       
-       if (strncmp(h, "tree ", 5))
-               die("Bad commit format: %s", 
-                   sha1_to_hex(commit->object.sha1));
-       
-       len = get_one_line(h);
-       tree = h+5;
-       h += len + 2;
-
-       while (!strncmp(h, "parent ", 7))
-               h += get_one_line(h) + 2;
-       
-       if (!strncmp(h, "author ", 7)) {
-               author = h+7;
-               h += get_one_line(h) + 2;
-               t = author;
-               while(t!=h && *t!='<') 
-                       t++;
-               *t='\0';
-               p = t;
-               while(--t!=author && *t==' ')
-                       *t='\0';
-               while(++p!=h && *p!='>')
-                       ;
-               while(++p!=h && !isdigit(*p))
-                       ;
-
-               t = p;
-               while(++p && isdigit(*p))
-                       ;
-               *p = '\0';
-               sec = atoi(t);
-               time = gmtime(&sec);
-       }
-
-       while((len = get_one_line(h)) > 0)
-               h += len+2;
-
-       h++;
-       len = get_one_line(h);
+       files++;
+       if (ctx.repo->enable_log_linecount)
+               cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
+}

 
 

-       subject = h;
+void print_commit(struct commit *commit)
+{
+       struct commitinfo *info;
+       char *tmp;

 
 

+       info = cgit_parse_commit(commit);

        html("<tr><td>");
        html("<tr><td>");

-       strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", 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, "view", qry);
-       html_link_open(url, NULL, NULL);
-       html_txt(subject);
+       tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
+       tmp = cgit_pageurl(ctx.repo->url, "commit", tmp);
+       html_link_open(tmp, NULL, NULL);
+       cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);

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

-       html_txt(author);
-       html("</td><td><a href='");
-       html_attr(cgit_pageurl(cgit_query_repo, "tree", 
-                              fmt("id=%s", 
-                                  sha1_to_hex(commit->tree->object.sha1))));
-       html("'>tree</a>");
+       cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
+                        sha1_to_hex(commit->object.sha1));
+       html("</td><td>");
+       html_txt(info->author);
+       if (ctx.repo->enable_log_filecount) {
+               files = 0;
+               add_lines = 0;
+               rem_lines = 0;
+               cgit_diff_commit(commit, inspect_files);
+               html("</td><td>");
+               htmlf("%d", files);
+               if (ctx.repo->enable_log_linecount) {
+                       html("</td><td>");
+                       htmlf("-%d/+%d", rem_lines, add_lines);
+               }
+       }

        html("</td></tr>\n");
        html("</td></tr>\n");

+       cgit_free_commitinfo(info);

 }
 
 }
 

-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 *pattern,
+                   char *path, int pager)

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

-       const char *argv[2] = {NULL, tip};
-       int n = 0;
-       
+       const char *argv[] = {NULL, tip, NULL, NULL, NULL};
+       int argc = 2;
+       int i, columns = 3;
+
+       if (!tip)
+               argv[1] = ctx.qry.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;
+       }

        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);
+       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'>");
-       html("<tr><th>Date</th><th>Message</th><th>Author</th><th>Link</th></tr>\n");
-       while ((commit = get_revision(&rev)) != NULL && n++ < 100) {
-               cgit_print_commit_shortlog(commit);
+       if (pager)
+               html("<table class='list nowrap'>");
+
+       html("<tr class='nohover'><th class='left'>Age</th>"
+            "<th class='left'>Commit message</th>"
+            "<th class='left'>Author</th>");
+       if (ctx.repo->enable_log_filecount) {
+               html("<th class='left'>Files</th>");
+               columns++;
+               if (ctx.repo->enable_log_linecount) {
+                       html("<th class='left'>Lines</th>");
+                       columns++;
+               }
+       }
+       html("</tr>\n");
+
+       if (ofs<0)
+               ofs = 0;
+
+       for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {

                free(commit->buffer);
                commit->buffer = NULL;
                free_commit_list(commit->parents);
                commit->parents = NULL;
        }
                free(commit->buffer);
                commit->buffer = NULL;
                free_commit_list(commit->parents);
                commit->parents = NULL;
        }

-       html("</table>\n");
-}

 
 

+       for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
+               print_commit(commit);
+               free(commit->buffer);
+               commit->buffer = NULL;
+               free_commit_list(commit->parents);
+               commit->parents = NULL;
+       }
+       if (pager) {
+               htmlf("</table><div class='pager'>",
+                    columns);
+               if (ofs > 0) {
+                       cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
+                                     ctx.qry.sha1, ctx.qry.path,
+                                     ofs - cnt, ctx.qry.grep,
+                                     ctx.qry.search);
+                       html("&nbsp;");
+               }
+               if ((commit = get_revision(&rev)) != NULL) {
+                       cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
+                                     ctx.qry.sha1, ctx.qry.path,
+                                     ofs + cnt, ctx.qry.grep,
+                                     ctx.qry.search);
+               }
+               html("</div>");
+       } else if ((commit = get_revision(&rev)) != NULL) {
+               html("<tr class='nohover'><td colspan='3'>");
+               cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0,
+                             NULL, NULL);
+               html("</td></tr>\n");
+       }
+}