|
diff --git a/ui-log.c b/ui-log.c index 5cf66cb..05b5c29 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -93,16 +93,17 @@ void show_commit_decorations(struct commit *commit) |
93 | } |
93 | } |
94 | |
94 | |
95 | void print_commit(struct commit *commit, struct rev_info *revs) |
95 | void print_commit(struct commit *commit, struct rev_info *revs) |
96 | { |
96 | { |
97 | struct commitinfo *info; |
97 | struct commitinfo *info; |
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++; |
104 | if (ctx.repo->enable_log_linecount) |
105 | if (ctx.repo->enable_log_linecount) |
105 | cols++; |
106 | cols++; |
106 | } |
107 | } |
107 | |
108 | |
108 | if (revs->graph) { |
109 | if (revs->graph) { |
@@ -131,16 +132,41 @@ void print_commit(struct commit *commit, struct rev_info *revs) |
131 | /* Print graph segment for current commit */ |
132 | /* Print graph segment for current commit */ |
132 | html("<td class='commitgraph'>"); |
133 | html("<td class='commitgraph'>"); |
133 | html(graphbuf.buf); |
134 | html(graphbuf.buf); |
134 | html("</td>"); |
135 | html("</td>"); |
135 | strbuf_setlen(&graphbuf, 0); |
136 | strbuf_setlen(&graphbuf, 0); |
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); |
142 | html("</td><td>"); |
168 | html("</td><td>"); |
143 | html_txt(info->author); |
169 | html_txt(info->author); |
144 | if (ctx.repo->enable_log_filecount) { |
170 | if (ctx.repo->enable_log_filecount) { |
145 | files = 0; |
171 | files = 0; |
146 | add_lines = 0; |
172 | add_lines = 0; |
@@ -151,17 +177,16 @@ void print_commit(struct commit *commit, struct rev_info *revs) |
151 | if (ctx.repo->enable_log_linecount) { |
177 | if (ctx.repo->enable_log_linecount) { |
152 | html("</td><td>"); |
178 | html("</td><td>"); |
153 | htmlf("-%d/+%d", rem_lines, add_lines); |
179 | htmlf("-%d/+%d", rem_lines, add_lines); |
154 | } |
180 | } |
155 | } |
181 | } |
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) { |
163 | /* Concatenate commit message + notes in msgbuf */ |
188 | /* Concatenate commit message + notes in msgbuf */ |
164 | if (info->msg && *(info->msg)) { |
189 | if (info->msg && *(info->msg)) { |
165 | strbuf_addstr(&msgbuf, info->msg); |
190 | strbuf_addstr(&msgbuf, info->msg); |
166 | strbuf_addch(&msgbuf, '\n'); |
191 | strbuf_addch(&msgbuf, '\n'); |
167 | } |
192 | } |
@@ -199,19 +224,19 @@ void print_commit(struct commit *commit, struct rev_info *revs) |
199 | html("</td>\n"); |
224 | html("</td>\n"); |
200 | } |
225 | } |
201 | |
226 | |
202 | /* Print msgbuf into remainder of table row */ |
227 | /* Print msgbuf into remainder of table row */ |
203 | htmlf("<td colspan='%d'%s>\n", cols, |
228 | htmlf("<td colspan='%d'%s>\n", cols, |
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 | } |
213 | |
238 | |
214 | static const char *disambiguate_ref(const char *ref) |
239 | static const char *disambiguate_ref(const char *ref) |
215 | { |
240 | { |
216 | unsigned char sha1[20]; |
241 | unsigned char sha1[20]; |
217 | const char *longref; |
242 | const char *longref; |
@@ -241,17 +266,17 @@ static char *next_token(char **src) |
241 | break; |
266 | break; |
242 | } |
267 | } |
243 | (*src)++; |
268 | (*src)++; |
244 | } |
269 | } |
245 | return result; |
270 | return result; |
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; |
253 | struct vector vec = VECTOR_INIT(char *); |
278 | struct vector vec = VECTOR_INIT(char *); |
254 | int i, columns = 3; |
279 | int i, columns = 3; |
255 | char *arg; |
280 | char *arg; |
256 | |
281 | |
257 | /* First argv is NULL */ |
282 | /* First argv is NULL */ |
@@ -281,17 +306,17 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
281 | fprintf(stderr, "Bad range expr: %s\n", |
306 | fprintf(stderr, "Bad range expr: %s\n", |
282 | arg); |
307 | arg); |
283 | break; |
308 | break; |
284 | } |
309 | } |
285 | vector_push(&vec, &arg, 0); |
310 | vector_push(&vec, &arg, 0); |
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); |
293 | vector_push(&vec, &color_arg, 0); |
318 | vector_push(&vec, &color_arg, 0); |
294 | graph_set_column_colors(column_colors_html, |
319 | graph_set_column_colors(column_colors_html, |
295 | COLUMN_COLORS_HTML_MAX); |
320 | COLUMN_COLORS_HTML_MAX); |
296 | } |
321 | } |
297 | |
322 | |
@@ -316,17 +341,17 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
316 | rev.grep_filter.regflags |= REG_ICASE; |
341 | rev.grep_filter.regflags |= REG_ICASE; |
317 | compile_grep_patterns(&rev.grep_filter); |
342 | compile_grep_patterns(&rev.grep_filter); |
318 | prepare_revision_walk(&rev); |
343 | prepare_revision_walk(&rev); |
319 | |
344 | |
320 | if (pager) |
345 | if (pager) |
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) { |
328 | html(" ("); |
353 | html(" ("); |
329 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
354 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
330 | NULL, ctx.qry.head, ctx.qry.sha1, |
355 | NULL, ctx.qry.head, ctx.qry.sha1, |
331 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, |
356 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, |
332 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
357 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
|