X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/420712ac2531f65a2b94d5ec6d8e03de6942331e..426032f767763b46f462de51d1ebded34f671d79:/ui-log.c?ds=inline

diff --git a/ui-log.c b/ui-log.c
index dce50f7..bb17e1d 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -8,106 +8,88 @@
 
 #include "cgit.h"
 
-static int get_one_line(char *txt)
-{
-	char *t;
+int files, lines;
 
-	for(t=txt; *t != '\n' && t != '\0'; t++)
-		;
-	*t = '\0';
-	return t-txt-1;
+void count_lines(char *line, int size)
+{
+	if (size>0 && (line[0] == '+' || line[0] == '-'))
+		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 (cgit_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;
 
+	info = cgit_parse_commit(commit);
 	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, "view", qry);
+	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_txt(subject);
+	html_ntxt(cgit_max_msg_len, info->subject);
 	html_link_close();
+	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(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>");
+	html_txt(info->author);
 	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 *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 (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'>");
-	html("<tr><th>Date</th><th>Message</th><th>Author</th><th>Link</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;
@@ -120,7 +102,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt)
 	}
 
 	for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
-		cgit_print_commit_shortlog(commit);
+		print_commit(commit);
 		free(commit->buffer);
 		commit->buffer = NULL;
 		free_commit_list(commit->parents);
@@ -128,20 +110,21 @@ 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) {
+			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;");
+		}
+		html("</div>");
 	}
-	html("</div>");
 }
-