X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/237ef7b06d461ddf27b21cd13bfcb50befa4a916..3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b:/ui-log.c?ds=sidebyside

diff --git a/ui-log.c b/ui-log.c
index c80fd73..9f5fdf6 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -31,11 +31,8 @@ void print_commit(struct commit *commit)
 	html("<tr><td>");
 	cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
 	html("</td><td>");
-	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();
+	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;
@@ -54,7 +51,7 @@ void print_commit(struct commit *commit)
 }
 
 
-void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
+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;
@@ -62,8 +59,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
 	int argc = 2;
 	int i;
 
-	if (grep)
-		argv[argc++] = fmt("--grep=%s", grep);
+	if (!tip)
+		argv[1] = cgit_query_head;
+
+	if (grep && pattern && (!strcmp(grep, "grep") ||
+				!strcmp(grep, "author") ||
+				!strcmp(grep, "committer")))
+		argv[argc++] = fmt("--%s=%s", grep, pattern);
+
 	if (path) {
 		argv[argc++] = "--";
 		argv[argc++] = path;
@@ -110,19 +113,21 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
 	}
 	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, cgit_query_grep,
+				      cgit_query_search);
+			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, cgit_query_grep,
+				      cgit_query_search);
+		}
+		html("</div>");
 	}
-	html("</div>");
 }