Makefile: install cgit.{css,png} in CGIT_DATA_PATH

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index e1d324d2bf406023f93d176f1e3e7e1b719b0518..d2129844032d59aebfa8172c3a6f34e8ad85c2cf 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -8,6 +8,7 @@
 
 #include "cgit.h"
 #include "html.h"
+#include "ui-shared.h"
 
 int files, add_lines, rem_lines;
 
@@ -33,42 +34,61 @@ void inspect_files(struct diff_filepair *pair)
 void print_commit(struct commit *commit)
 {
        struct commitinfo *info;
+       char *tmp;
 
        info = cgit_parse_commit(commit);
        html("<tr><td>");
+       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>");
        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 class='right'>");
+               html("</td><td>");
                htmlf("%d", files);
                if (ctx.repo->enable_log_linecount) {
-                       html("</td><td class='right'>");
+                       html("</td><td>");
                        htmlf("-%d/+%d", rem_lines, add_lines);
                }
        }
-       html("</td><td>");
-       html_txt(info->author);
        html("</td></tr>\n");
        cgit_free_commitinfo(info);
 }
 
+static const char *disambiguate_ref(const char *ref)
+{
+       unsigned char sha1[20];
+       const char *longref;
+
+       longref = fmt("refs/heads/%s", ref);
+       if (get_sha1(longref, sha1) == 0)
+               return longref;
+
+       return ref;
+}
 
-void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager)
+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;
-       const char *argv[] = {NULL, tip, NULL, NULL, NULL};
+       const char *argv[] = {NULL, NULL, NULL, NULL, NULL};
        int argc = 2;
-       int i;
+       int i, columns = 3;
 
        if (!tip)
-               argv[1] = ctx.qry.head;
+               tip = ctx.qry.head;
+
+       argv[1] = disambiguate_ref(tip);
 
        if (grep && pattern && (!strcmp(grep, "grep") ||
                                !strcmp(grep, "author") ||
@@ -85,22 +105,25 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        rev.verbose_header = 1;
        rev.show_root_diff = 0;
        setup_revisions(argc, argv, &rev, NULL);
-       if (rev.grep_filter) {
-               rev.grep_filter->regflags |= REG_ICASE;
-               compile_grep_patterns(rev.grep_filter);
-       }
+       rev.grep_filter.regflags |= REG_ICASE;
+       compile_grep_patterns(&rev.grep_filter);
        prepare_revision_walk(&rev);
 
-       html("<table summary='log' class='list nowrap'>");
-       html("<tr class='nohover'><th class='left'>Age</th>"
-            "<th class='left'>Message</th>");
+       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='right'>Files</th>");
-               if (ctx.repo->enable_log_linecount)
-                       html("<th class='right'>Lines</th>");
+               html("<th class='left'>Files</th>");
+               columns++;
+               if (ctx.repo->enable_log_linecount) {
+                       html("<th class='left'>Lines</th>");
+                       columns++;
+               }
        }
-       html("<th class='left'>Author</th></tr>\n");
+       html("</tr>\n");
 
        if (ofs<0)
                ofs = 0;
@@ -119,10 +142,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                free_commit_list(commit->parents);
                commit->parents = NULL;
        }
-       html("</table>\n");
-
        if (pager) {
-               html("<div class='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,
@@ -137,5 +159,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                                      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");
        }
 }