X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/652a5a18db3b0409fedfaf8c5720446d87628ba0..1c32e008c8fda46f812c38f46ae7515bcf8002ee:/ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 2e6e9d6..aaffb4e 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -28,7 +28,7 @@ static const char *column_colors_html[] = {
 
 #define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1)
 
-void count_lines(char *line, int size)
+static void count_lines(char *line, int size)
 {
 	if (size <= 0)
 		return;
@@ -40,7 +40,7 @@ void count_lines(char *line, int size)
 		rem_lines++;
 }
 
-void inspect_files(struct diff_filepair *pair)
+static void inspect_files(struct diff_filepair *pair)
 {
 	unsigned long old_size = 0;
 	unsigned long new_size = 0;
@@ -76,6 +76,8 @@ void show_commit_decorations(struct commit *commit)
 			cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
 		}
 		else if (!prefixcmp(deco->name, "refs/remotes/")) {
+			if (!ctx.repo->enable_remote_branches)
+				goto next;
 			strncpy(buf, deco->name + 13, sizeof(buf) - 1);
 			cgit_log_link(buf, NULL, "remote-deco", NULL,
 				      sha1_to_hex(commit->object.sha1),
@@ -88,22 +90,22 @@ void show_commit_decorations(struct commit *commit)
 					 sha1_to_hex(commit->object.sha1),
 					 ctx.qry.vpath, 0);
 		}
+next:
 		deco = deco->next;
 	}
 }
 
-void print_commit(struct commit *commit, struct rev_info *revs)
+static void print_commit(struct commit *commit, struct rev_info *revs)
 {
 	struct commitinfo *info;
-	char *tmp;
-	int cols = revs->graph ? 3 : 2;
+	int columns = revs->graph ? 4 : 3;
 	struct strbuf graphbuf = STRBUF_INIT;
 	struct strbuf msgbuf = STRBUF_INIT;
 
 	if (ctx.repo->enable_log_filecount)
-		cols++;
+		columns++;
 	if (ctx.repo->enable_log_linecount)
-		cols++;
+		columns++;
 
 	if (revs->graph) {
 		/* Advance graph until current commit */
@@ -111,7 +113,7 @@ void print_commit(struct commit *commit, struct rev_info *revs)
 			/* Print graph segment in otherwise empty table row */
 			html("<tr class='nohover'><td class='commitgraph'>");
 			html(graphbuf.buf);
-			htmlf("</td><td colspan='%d' /></tr>\n", cols);
+			htmlf("</td><td colspan='%d' /></tr>\n", columns);
 			strbuf_setlen(&graphbuf, 0);
 		}
 		/* Current commit's graph segment is now ready in graphbuf */
@@ -129,11 +131,7 @@ void print_commit(struct commit *commit, struct rev_info *revs)
 	}
 	else {
 		html("<td>");
-		tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
-		tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
-		html_link_open(tmp, NULL, NULL);
 		cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
-		html_link_close();
 		html("</td>");
 	}
 
@@ -171,11 +169,7 @@ void print_commit(struct commit *commit, struct rev_info *revs)
 
 	if (revs->graph) {
 		html("</td><td>");
-		tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
-		tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
-		html_link_open(tmp, NULL, NULL);
 		cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
-		html_link_close();
 	}
 
 	if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) {
@@ -238,7 +232,7 @@ void print_commit(struct commit *commit, struct rev_info *revs)
 			html("<td/>"); /* Empty 'Age' column */
 
 		/* Print msgbuf into remainder of table row */
-		htmlf("<td colspan='%d'%s>\n", cols,
+		htmlf("<td colspan='%d'%s>\n", columns - (revs->graph ? 1 : 0),
 			ctx.qry.showmsg ? " class='logmsg'" : "");
 		html_txt(msgbuf.buf);
 		html("</td></tr>\n");
@@ -284,12 +278,12 @@ static char *next_token(char **src)
 }
 
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
-		    char *path, int pager, int commit_graph)
+		    char *path, int pager, int commit_graph, int commit_sort)
 {
 	struct rev_info rev;
 	struct commit *commit;
 	struct vector vec = VECTOR_INIT(char *);
-	int i, columns = 3;
+	int i, columns = commit_graph ? 4 : 3;
 	char *arg;
 
 	/* First argv is NULL */
@@ -333,6 +327,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 					COLUMN_COLORS_HTML_MAX);
 	}
 
+	if (commit_sort == 1) {
+		static const char *date_order_arg = "--date-order";
+		vector_push(&vec, &date_order_arg, 0);
+	} else if (commit_sort == 2) {
+		static const char *topo_order_arg = "--topo-order";
+		vector_push(&vec, &topo_order_arg, 0);
+	}
+
 	if (path) {
 		arg = "--";
 		vector_push(&vec, &arg, 0);
@@ -403,23 +405,26 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 		commit->parents = NULL;
 	}
 	if (pager) {
-		html("</table><div class='pager'>");
+		html("</table><ul class='pager'>");
 		if (ofs > 0) {
+			html("<li>");
 			cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
 				      ctx.qry.sha1, ctx.qry.vpath,
 				      ofs - cnt, ctx.qry.grep,
 				      ctx.qry.search, ctx.qry.showmsg);
-			html("&nbsp;");
+			html("</li>");
 		}
 		if ((commit = get_revision(&rev)) != NULL) {
+			html("<li>");
 			cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
 				      ctx.qry.sha1, ctx.qry.vpath,
 				      ofs + cnt, ctx.qry.grep,
 				      ctx.qry.search, ctx.qry.showmsg);
+			html("</li>");
 		}
-		html("</div>");
+		html("</ul>");
 	} else if ((commit = get_revision(&rev)) != NULL) {
-		html("<tr class='nohover'><td colspan='3'>");
+		htmlf("<tr class='nohover'><td colspan='%d'>", columns);
 		cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
 			      ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
 		html("</td></tr>\n");