X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/48dc00342effe3ba530ff6cbb79e5d0d5fc740fd..3b86b44fc761cfa8b97c44bbbdd63c9fbf1127ed:/ui-log.c

diff --git a/ui-log.c b/ui-log.c
index b930bb2..4237921 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -10,9 +10,17 @@
 
 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)
@@ -27,16 +35,22 @@ void print_commit(struct commit *commit)
 	strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M", time);
 	html_txt(buf);
 	html("</td><td>");
-	char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1));
+	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_ntxt(cgit_max_msg_len, info->subject);
 	html_link_close();
-	html("</td><td class='right'>");
-	files = 0;
-	lines = 0;
-	cgit_diff_commit(commit, inspect_files);
-	htmlf("%d", files);
+	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");
@@ -44,16 +58,20 @@ void print_commit(struct commit *commit)
 }
 
 
-void cgit_print_log(const char *tip, int ofs, int cnt, char *grep)
+void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
 {
 	struct rev_info rev;
 	struct commit *commit;
-	const char *argv[3] = {NULL, tip, NULL};
+	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;
@@ -68,9 +86,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep)
 
 	html("<table class='list nowrap'>");
 	html("<tr class='nohover'><th class='left'>Date</th>"
-	     "<th class='left'>Message</th>"
-	     "<th class='left'>Files</th>"
-	     "<th class='left'>Author</th></tr>\n");
+	     "<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;
@@ -107,4 +130,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep)
 	}
 	html("</div>");
 }
-