|
diff --git a/ui-log.c b/ui-log.c index 5cf66cb..05b5c29 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -98,6 +98,7 @@ void print_commit(struct commit *commit, struct rev_info *revs) |
98 | char *tmp; |
98 | char *tmp; |
99 | int cols = 2; |
99 | int cols = 2; |
100 | struct strbuf graphbuf = STRBUF_INIT; |
100 | struct strbuf graphbuf = STRBUF_INIT; |
| |
101 | struct strbuf msgbuf = STRBUF_INIT; |
101 | |
102 | |
102 | if (ctx.repo->enable_log_filecount) { |
103 | if (ctx.repo->enable_log_filecount) { |
103 | cols++; |
104 | cols++; |
@@ -136,6 +137,31 @@ void print_commit(struct commit *commit, struct rev_info *revs) |
136 | } |
137 | } |
137 | |
138 | |
138 | htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : ""); |
139 | htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : ""); |
| |
140 | if (ctx.qry.showmsg) { |
| |
141 | /* line-wrap long commit subjects instead of truncating them */ |
| |
142 | size_t subject_len = strlen(info->subject); |
| |
143 | |
| |
144 | if (subject_len > ctx.cfg.max_msg_len && |
| |
145 | ctx.cfg.max_msg_len >= 15) { |
| |
146 | /* symbol for signaling line-wrap (in PAGE_ENCODING) */ |
| |
147 | const char wrap_symbol[] = { ' ', 0xE2, 0x86, 0xB5, 0 }; |
| |
148 | int i = ctx.cfg.max_msg_len - strlen(wrap_symbol); |
| |
149 | |
| |
150 | /* Rewind i to preceding space character */ |
| |
151 | while (i > 0 && !isspace(info->subject[i])) |
| |
152 | --i; |
| |
153 | if (!i) /* Oops, zero spaces. Reset i */ |
| |
154 | i = ctx.cfg.max_msg_len - strlen(wrap_symbol); |
| |
155 | |
| |
156 | /* add remainder starting at i to msgbuf */ |
| |
157 | strbuf_add(&msgbuf, info->subject + i, subject_len - i); |
| |
158 | strbuf_trim(&msgbuf); |
| |
159 | strbuf_add(&msgbuf, "\n\n", 2); |
| |
160 | |
| |
161 | /* Place wrap_symbol at position i in info->subject */ |
| |
162 | strcpy(info->subject + i, wrap_symbol); |
| |
163 | } |
| |
164 | } |
139 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
165 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
140 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
166 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
141 | show_commit_decorations(commit); |
167 | show_commit_decorations(commit); |
@@ -156,7 +182,6 @@ void print_commit(struct commit *commit, struct rev_info *revs) |
156 | html("</td></tr>\n"); |
182 | html("</td></tr>\n"); |
157 | |
183 | |
158 | if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */ |
184 | if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */ |
159 | struct strbuf msgbuf = STRBUF_INIT; |
| |
160 | html("<tr class='nohover'><td/>"); /* Empty 'Age' column */ |
185 | html("<tr class='nohover'><td/>"); /* Empty 'Age' column */ |
161 | |
186 | |
162 | if (ctx.qry.showmsg) { |
187 | if (ctx.qry.showmsg) { |
@@ -204,9 +229,9 @@ void print_commit(struct commit *commit, struct rev_info *revs) |
204 | ctx.qry.showmsg ? " class='logmsg'" : ""); |
229 | ctx.qry.showmsg ? " class='logmsg'" : ""); |
205 | html_txt(msgbuf.buf); |
230 | html_txt(msgbuf.buf); |
206 | html("</td></tr>\n"); |
231 | html("</td></tr>\n"); |
207 | strbuf_release(&msgbuf); |
| |
208 | } |
232 | } |
209 | |
233 | |
| |
234 | strbuf_release(&msgbuf); |
210 | strbuf_release(&graphbuf); |
235 | strbuf_release(&graphbuf); |
211 | cgit_free_commitinfo(info); |
236 | cgit_free_commitinfo(info); |
212 | } |
237 | } |
@@ -246,7 +271,7 @@ static char *next_token(char **src) |
246 | } |
271 | } |
247 | |
272 | |
248 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
273 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
249 | char *path, int pager) |
274 | char *path, int pager, int commit_graph) |
250 | { |
275 | { |
251 | struct rev_info rev; |
276 | struct rev_info rev; |
252 | struct commit *commit; |
277 | struct commit *commit; |
@@ -286,7 +311,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
286 | } |
311 | } |
287 | } |
312 | } |
288 | } |
313 | } |
289 | if (ctx.repo->enable_commit_graph) { |
314 | if (commit_graph) { |
290 | static const char *graph_arg = "--graph"; |
315 | static const char *graph_arg = "--graph"; |
291 | static const char *color_arg = "--color"; |
316 | static const char *color_arg = "--color"; |
292 | vector_push(&vec, &graph_arg, 0); |
317 | vector_push(&vec, &graph_arg, 0); |
@@ -321,7 +346,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
321 | html("<table class='list nowrap'>"); |
346 | html("<table class='list nowrap'>"); |
322 | |
347 | |
323 | html("<tr class='nohover'><th class='left'>Age</th>"); |
348 | html("<tr class='nohover'><th class='left'>Age</th>"); |
324 | if (ctx.repo->enable_commit_graph) |
349 | if (commit_graph) |
325 | html("<th></th>"); |
350 | html("<th></th>"); |
326 | html("<th class='left'>Commit message"); |
351 | html("<th class='left'>Commit message"); |
327 | if (pager) { |
352 | if (pager) { |
|