ui-log: Line-wrap long commit subjects when showmsg is enabled

When showmsg is disabled ui-log truncates long commit subjects. This is good.
However, the same is not desirable when showmsg is enabled, since you then
end up with a truncated commit subject followed by the rest of the commit
message below.

Instead, when showmsg is enabled (and we're using all this space to display
the entire commit message, anyway), line-wrap the commit subject instead of
truncating it.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

4 files changed, 35 insertions, 8 deletions

diff --git a/cmd.c b/cmd.c
index 6dc9f5e..536515b 100644
--- a/cmd.c
+++ b/cmd.c
@@ -58,25 +58,26 @@ static void diff_fn(struct cgit_context *ctx)
 {
 	cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path);
 }
 
 static void info_fn(struct cgit_context *ctx)
 {
 	cgit_clone_info(ctx);
 }
 
 static void log_fn(struct cgit_context *ctx)
 {
 	cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count,
-		       ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1);
+		       ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1,
+		       ctx->repo->enable_commit_graph);
 }
 
 static void ls_cache_fn(struct cgit_context *ctx)
 {
 	ctx->page.mimetype = "text/plain";
 	ctx->page.filename = "ls-cache.txt";
 	cgit_print_http_headers(ctx);
 	cache_ls(ctx->cfg.cache_root);
 }
 
 static void objects_fn(struct cgit_context *ctx)
 {
diff --git a/ui-log.c b/ui-log.c
index 5cf66cb..05b5c29 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -89,24 +89,25 @@ void show_commit_decorations(struct commit *commit)
 					 ctx.qry.vpath, 0);
 		}
 		deco = deco->next;
 	}
 }
 
 void print_commit(struct commit *commit, struct rev_info *revs)
 {
 	struct commitinfo *info;
 	char *tmp;
 	int cols = 2;
 	struct strbuf graphbuf = STRBUF_INIT;
+	struct strbuf msgbuf = STRBUF_INIT;
 
 	if (ctx.repo->enable_log_filecount) {
 		cols++;
 		if (ctx.repo->enable_log_linecount)
 			cols++;
 	}
 
 	if (revs->graph) {
 		/* Advance graph until current commit */
 		while (!graph_next_line(revs->graph, &graphbuf)) {
 			/* Print graph segment in otherwise empty table row */
 			html("<tr class='nohover'><td/><td class='commitgraph'>");
@@ -127,45 +128,69 @@ void print_commit(struct commit *commit, struct rev_info *revs)
 	html_link_close();
 	html("</td>");
 
 	if (revs->graph) {
 		/* Print graph segment for current commit */
 		html("<td class='commitgraph'>");
 		html(graphbuf.buf);
 		html("</td>");
 		strbuf_setlen(&graphbuf, 0);
 	}
 
 	htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : "");
+	if (ctx.qry.showmsg) {
+		/* line-wrap long commit subjects instead of truncating them */
+		size_t subject_len = strlen(info->subject);
+
+		if (subject_len > ctx.cfg.max_msg_len &&
+		    ctx.cfg.max_msg_len >= 15) {
+			/* symbol for signaling line-wrap (in PAGE_ENCODING) */
+			const char wrap_symbol[] = { ' ', 0xE2, 0x86, 0xB5, 0 };
+			int i = ctx.cfg.max_msg_len - strlen(wrap_symbol);
+
+			/* Rewind i to preceding space character */
+			while (i > 0 && !isspace(info->subject[i]))
+				--i;
+			if (!i) /* Oops, zero spaces. Reset i */
+				i = ctx.cfg.max_msg_len - strlen(wrap_symbol);
+
+			/* add remainder starting at i to msgbuf */
+			strbuf_add(&msgbuf, info->subject + i, subject_len - i);
+			strbuf_trim(&msgbuf);
+			strbuf_add(&msgbuf, "\n\n", 2);
+
+			/* Place wrap_symbol at position i in info->subject */
+			strcpy(info->subject + i, wrap_symbol);
+		}
+	}
 	cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
 			 sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
 	show_commit_decorations(commit);
 	html("</td><td>");
 	html_txt(info->author);
 	if (ctx.repo->enable_log_filecount) {
 		files = 0;
 		add_lines = 0;
 		rem_lines = 0;
 		cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
 		html("</td><td>");
 		htmlf("%d", files);
 		if (ctx.repo->enable_log_linecount) {
 			html("</td><td>");
 			htmlf("-%d/+%d", rem_lines, add_lines);
 		}
 	}
 	html("</td></tr>\n");
 
 	if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
-		struct strbuf msgbuf = STRBUF_INIT;
 		html("<tr class='nohover'><td/>"); /* Empty 'Age' column */
 
 		if (ctx.qry.showmsg) {
 			/* Concatenate commit message + notes in msgbuf */
 			if (info->msg && *(info->msg)) {
 				strbuf_addstr(&msgbuf, info->msg);
 				strbuf_addch(&msgbuf, '\n');
 			}
 			format_note(NULL, commit->object.sha1, &msgbuf,
 			            PAGE_ENCODING,
 			            NOTES_SHOW_HEADER | NOTES_INDENT);
 			strbuf_addch(&msgbuf, '\n');
@@ -195,27 +220,27 @@ void print_commit(struct commit *commit, struct rev_info *revs)
 				graph_next_line(revs->graph, &graphbuf);
 				html(graphbuf.buf);
 				lines--;
 			}
 			html("</td>\n");
 		}
 
 		/* Print msgbuf into remainder of table row */
 		htmlf("<td colspan='%d'%s>\n", cols,
 			ctx.qry.showmsg ? " class='logmsg'" : "");
 		html_txt(msgbuf.buf);
 		html("</td></tr>\n");
-		strbuf_release(&msgbuf);
 	}
 
+	strbuf_release(&msgbuf);
 	strbuf_release(&graphbuf);
 	cgit_free_commitinfo(info);
 }
 
 static const char *disambiguate_ref(const char *ref)
 {
 	unsigned char sha1[20];
 	const char *longref;
 
 	longref = fmt("refs/heads/%s", ref);
 	if (get_sha1(longref, sha1) == 0)
 		return longref;
@@ -237,25 +262,25 @@ static char *next_token(char **src)
 	while (**src) {
 		if (isspace(**src)) {
 			**src = '\0';
 			(*src)++;
 			break;
 		}
 		(*src)++;
 	}
 	return result;
 }
 
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
-		    char *path, int pager)
+		    char *path, int pager, int commit_graph)
 {
 	struct rev_info rev;
 	struct commit *commit;
 	struct vector vec = VECTOR_INIT(char *);
 	int i, columns = 3;
 	char *arg;
 
 	/* First argv is NULL */
 	vector_push(&vec, NULL, 0);
 
 	if (!tip)
 		tip = ctx.qry.head;
@@ -277,25 +302,25 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 			 */
 			vec.count--;
 			while ((arg = next_token(&pattern))) {
 				if (*arg == '-') {
 					fprintf(stderr, "Bad range expr: %s\n",
 						arg);
 					break;
 				}
 				vector_push(&vec, &arg, 0);
 			}
 		}
 	}
-	if (ctx.repo->enable_commit_graph) {
+	if (commit_graph) {
 		static const char *graph_arg = "--graph";
 		static const char *color_arg = "--color";
 		vector_push(&vec, &graph_arg, 0);
 		vector_push(&vec, &color_arg, 0);
 		graph_set_column_colors(column_colors_html,
 					COLUMN_COLORS_HTML_MAX);
 	}
 
 	if (path) {
 		arg = "--";
 		vector_push(&vec, &arg, 0);
 		vector_push(&vec, &path, 0);
@@ -312,25 +337,25 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 	rev.show_root_diff = 0;
 	setup_revisions(vec.count, vec.data, &rev, NULL);
 	load_ref_decorations(DECORATE_FULL_REFS);
 	rev.show_decorations = 1;
 	rev.grep_filter.regflags |= REG_ICASE;
 	compile_grep_patterns(&rev.grep_filter);
 	prepare_revision_walk(&rev);
 
 	if (pager)
 		html("<table class='list nowrap'>");
 
 	html("<tr class='nohover'><th class='left'>Age</th>");
-	if (ctx.repo->enable_commit_graph)
+	if (commit_graph)
 		html("<th></th>");
 	html("<th class='left'>Commit message");
 	if (pager) {
 		html(" (");
 		cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
 			      NULL, ctx.qry.head, ctx.qry.sha1,
 			      ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
 			      ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
 		html(")");
 	}
 	html("</th><th class='left'>Author</th>");
 	if (ctx.repo->enable_log_filecount) {
diff --git a/ui-log.h b/ui-log.h
index 6034055..d0cb779 100644
--- a/ui-log.h
+++ b/ui-log.h
@@ -1,8 +1,9 @@
 #ifndef UI_LOG_H
 #define UI_LOG_H
 
 extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
-			   char *pattern, char *path, int pager);
+			   char *pattern, char *path, int pager,
+			   int commit_graph);
 extern void show_commit_decorations(struct commit *commit);
 
 #endif /* UI_LOG_H */
diff --git a/ui-summary.c b/ui-summary.c
index b203bcc..5be2545 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -50,25 +50,25 @@ static void print_urls(char *txt, char *suffix)
 	}
 }
 
 void cgit_print_summary()
 {
 	html("<table summary='repository info' class='list nowrap'>");
 	cgit_print_branches(ctx.cfg.summary_branches);
 	html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
 	cgit_print_tags(ctx.cfg.summary_tags);
 	if (ctx.cfg.summary_log > 0) {
 		html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
 		cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
-			       NULL, NULL, 0);
+			       NULL, NULL, 0, 0);
 	}
 	if (ctx.repo->clone_url)
 		print_urls(ctx.repo->clone_url, NULL);
 	else if (ctx.cfg.clone_prefix)
 		print_urls(ctx.cfg.clone_prefix, ctx.repo->url);
 	html("</table>");
 }
 
 void cgit_print_repo_readme(char *path)
 {
 	char *slash, *tmp, *colon, *ref;