X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/d14d77fe95c3b6224b40df9b101dded0deea913c..54272e60965ec6a98b49cbf67d72a4b1f5adc55b:/ui-log.c

diff --git a/ui-log.c b/ui-log.c
index a39474b..8dd8b89 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -7,6 +7,8 @@
  */
 
 #include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
 
 int files, add_lines, rem_lines;
 
@@ -25,46 +27,52 @@ void count_lines(char *line, int size)
 void inspect_files(struct diff_filepair *pair)
 {
 	files++;
-	if (cgit_repo->enable_log_linecount)
+	if (ctx.repo->enable_log_linecount)
 		cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
 }
 
 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));
-	if (cgit_repo->enable_log_filecount) {
+	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 (cgit_repo->enable_log_linecount) {
-			html("</td><td class='right'>");
+		if (ctx.repo->enable_log_linecount) {
+			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);
 }
 
 
-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};
 	int argc = 2;
-	int i;
+	int i, columns = 3;
 
 	if (!tip)
 		argv[1] = ctx.qry.head;
@@ -84,22 +92,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'>");
 
-	if (cgit_repo->enable_log_filecount) {
-		html("<th class='right'>Files</th>");
-		if (cgit_repo->enable_log_linecount)
-			html("<th class='right'>Lines</th>");
+	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("<th class='left'>Author</th></tr>\n");
+	html("</tr>\n");
 
 	if (ofs<0)
 		ofs = 0;
@@ -118,10 +129,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,
@@ -136,5 +146,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");
 	}
 }