X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/9a8f88658d51aeb86a79ac1121de13562ad2601f..4e9107abfe8d3edff17826875b417bcf40dc7390:/ui-log.c

diff --git a/ui-log.c b/ui-log.c
index c52af79..d38e40a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -8,51 +8,88 @@
 
 #include "cgit.h"
 
+int files, lines;
+
+void count_lines(char *line, int size)
+{
+	if (size>0 && (line[0] == '+' || line[0] == '-'))
+		lines++;
+}
+
+void inspect_files(struct diff_filepair *pair)
+{
+	files++;
+	if (cgit_repo->enable_log_linecount)
+		cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
+}
+
 void print_commit(struct commit *commit)
 {
-	char buf[32];
 	struct commitinfo *info;
-	struct tm *time;
 
 	info = cgit_parse_commit(commit);
-	time = gmtime(&commit->date);
 	html("<tr><td>");
-	strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
-	html_txt(buf);
+	cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
 	html("</td><td>");
-	char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1));
-	char *url = cgit_pageurl(cgit_query_repo, "commit", qry);
-	html_link_open(url, NULL, NULL);
-	html_txt(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;
+		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'>");
+			htmlf("%d", lines);
+		}
+	}
 	html("</td><td>");
 	html_txt(info->author);
 	html("</td></tr>\n");
-	free(info->author);
-	free(info->committer);
-	free(info->subject);
-	free(info);
+	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 *path, int pager)
 {
 	struct rev_info rev;
 	struct commit *commit;
-	const char *argv[2] = {NULL, tip};
+	const char *argv[] = {NULL, tip, NULL, NULL, NULL};
+	int argc = 2;
 	int i;
-	
+
+	if (!tip)
+		argv[1] = cgit_query_head;
+
+	if (grep)
+		argv[argc++] = fmt("--grep=%s", grep);
+	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;
-	setup_revisions(2, argv, &rev, NULL);
+	setup_revisions(argc, argv, &rev, NULL);
+	if (rev.grep_filter) {
+		rev.grep_filter->regflags |= REG_ICASE;
+		compile_grep_patterns(rev.grep_filter);
+	}
 	prepare_revision_walk(&rev);
 
-	html("<h2>Log</h2>");
-	html("<table class='list log'>");
-	html("<tr><th class='left'>Date</th><th class='left'>Message</th><th class='left'>Author</th></tr>\n");
+	html("<table class='list nowrap'>");
+	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>");
+		if (cgit_repo->enable_log_linecount)
+			html("<th class='left'>Lines</th>");
+	}
+	html("<th class='left'>Author</th></tr>\n");
 
 	if (ofs<0)
 		ofs = 0;
@@ -73,20 +110,19 @@ void cgit_print_log(const char *tip, int ofs, int cnt)
 	}
 	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&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&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);
+			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);
+		}
+		html("</div>");
 	}
-	html("</div>");
 }
-