|
diff --git a/ui-log.c b/ui-log.c index b9771fa..8add66a 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -9,9 +9,25 @@ |
9 | #include "cgit.h" |
9 | #include "cgit.h" |
10 | #include "html.h" |
10 | #include "html.h" |
11 | #include "ui-shared.h" |
11 | #include "ui-shared.h" |
| |
12 | #include "vector.h" |
12 | |
13 | |
13 | int files, add_lines, rem_lines; |
14 | int files, add_lines, rem_lines; |
14 | |
15 | |
| |
16 | /* |
| |
17 | * The list of available column colors in the commit graph. |
| |
18 | */ |
| |
19 | static const char *column_colors_html[] = { |
| |
20 | "<span class='column1'>", |
| |
21 | "<span class='column2'>", |
| |
22 | "<span class='column3'>", |
| |
23 | "<span class='column4'>", |
| |
24 | "<span class='column5'>", |
| |
25 | "<span class='column6'>", |
| |
26 | "</span>", |
| |
27 | }; |
| |
28 | |
| |
29 | #define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1) |
| |
30 | |
15 | void count_lines(char *line, int size) |
31 | void count_lines(char *line, int size) |
16 | { |
32 | { |
17 | if (size <= 0) |
33 | if (size <= 0) |
@@ -76,27 +92,93 @@ void show_commit_decorations(struct commit *commit) |
76 | } |
92 | } |
77 | } |
93 | } |
78 | |
94 | |
79 | void print_commit(struct commit *commit) |
95 | void print_commit(struct commit *commit, struct rev_info *revs) |
80 | { |
96 | { |
81 | struct commitinfo *info; |
97 | struct commitinfo *info; |
82 | char *tmp; |
98 | char *tmp; |
83 | int cols = 2; |
99 | int cols = revs->graph ? 3 : 2; |
| |
100 | struct strbuf graphbuf = STRBUF_INIT; |
| |
101 | struct strbuf msgbuf = STRBUF_INIT; |
| |
102 | |
| |
103 | if (ctx.repo->enable_log_filecount) { |
| |
104 | cols++; |
| |
105 | if (ctx.repo->enable_log_linecount) |
| |
106 | cols++; |
| |
107 | } |
| |
108 | |
| |
109 | if (revs->graph) { |
| |
110 | /* Advance graph until current commit */ |
| |
111 | while (!graph_next_line(revs->graph, &graphbuf)) { |
| |
112 | /* Print graph segment in otherwise empty table row */ |
| |
113 | html("<tr class='nohover'><td class='commitgraph'>"); |
| |
114 | html(graphbuf.buf); |
| |
115 | htmlf("</td><td colspan='%d' /></tr>\n", cols); |
| |
116 | strbuf_setlen(&graphbuf, 0); |
| |
117 | } |
| |
118 | /* Current commit's graph segment is now ready in graphbuf */ |
| |
119 | } |
84 | |
120 | |
85 | info = cgit_parse_commit(commit); |
121 | info = cgit_parse_commit(commit); |
86 | htmlf("<tr%s><td>", |
122 | htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : ""); |
87 | ctx.qry.showmsg ? " class='logheader'" : ""); |
123 | |
88 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
124 | if (revs->graph) { |
89 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
125 | /* Print graph segment for current commit */ |
90 | html_link_open(tmp, NULL, NULL); |
126 | html("<td class='commitgraph'>"); |
91 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
127 | html(graphbuf.buf); |
92 | html_link_close(); |
128 | html("</td>"); |
93 | htmlf("</td><td%s>", |
129 | strbuf_setlen(&graphbuf, 0); |
94 | ctx.qry.showmsg ? " class='logsubject'" : ""); |
130 | } |
| |
131 | else { |
| |
132 | html("<td>"); |
| |
133 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
| |
134 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
| |
135 | html_link_open(tmp, NULL, NULL); |
| |
136 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
| |
137 | html_link_close(); |
| |
138 | html("</td>"); |
| |
139 | } |
| |
140 | |
| |
141 | htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : ""); |
| |
142 | if (ctx.qry.showmsg) { |
| |
143 | /* line-wrap long commit subjects instead of truncating them */ |
| |
144 | size_t subject_len = strlen(info->subject); |
| |
145 | |
| |
146 | if (subject_len > ctx.cfg.max_msg_len && |
| |
147 | ctx.cfg.max_msg_len >= 15) { |
| |
148 | /* symbol for signaling line-wrap (in PAGE_ENCODING) */ |
| |
149 | const char wrap_symbol[] = { ' ', 0xE2, 0x86, 0xB5, 0 }; |
| |
150 | int i = ctx.cfg.max_msg_len - strlen(wrap_symbol); |
| |
151 | |
| |
152 | /* Rewind i to preceding space character */ |
| |
153 | while (i > 0 && !isspace(info->subject[i])) |
| |
154 | --i; |
| |
155 | if (!i) /* Oops, zero spaces. Reset i */ |
| |
156 | i = ctx.cfg.max_msg_len - strlen(wrap_symbol); |
| |
157 | |
| |
158 | /* add remainder starting at i to msgbuf */ |
| |
159 | strbuf_add(&msgbuf, info->subject + i, subject_len - i); |
| |
160 | strbuf_trim(&msgbuf); |
| |
161 | strbuf_add(&msgbuf, "\n\n", 2); |
| |
162 | |
| |
163 | /* Place wrap_symbol at position i in info->subject */ |
| |
164 | strcpy(info->subject + i, wrap_symbol); |
| |
165 | } |
| |
166 | } |
95 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
167 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
96 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
168 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
97 | show_commit_decorations(commit); |
169 | show_commit_decorations(commit); |
98 | html("</td><td>"); |
170 | html("</td><td>"); |
99 | html_txt(info->author); |
171 | html_txt(info->author); |
| |
172 | |
| |
173 | if (revs->graph) { |
| |
174 | html("</td><td>"); |
| |
175 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
| |
176 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
| |
177 | html_link_open(tmp, NULL, NULL); |
| |
178 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
| |
179 | html_link_close(); |
| |
180 | } |
| |
181 | |
100 | if (ctx.repo->enable_log_filecount) { |
182 | if (ctx.repo->enable_log_filecount) { |
101 | files = 0; |
183 | files = 0; |
102 | add_lines = 0; |
184 | add_lines = 0; |
@@ -110,29 +192,61 @@ void print_commit(struct commit *commit) |
110 | } |
192 | } |
111 | } |
193 | } |
112 | html("</td></tr>\n"); |
194 | html("</td></tr>\n"); |
113 | if (ctx.qry.showmsg) { |
| |
114 | struct strbuf notes = STRBUF_INIT; |
| |
115 | format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0); |
| |
116 | |
195 | |
117 | if (ctx.repo->enable_log_filecount) { |
196 | if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */ |
118 | cols++; |
197 | html("<tr class='nohover'>"); |
119 | if (ctx.repo->enable_log_linecount) |
198 | |
120 | cols++; |
199 | if (ctx.qry.showmsg) { |
| |
200 | /* Concatenate commit message + notes in msgbuf */ |
| |
201 | if (info->msg && *(info->msg)) { |
| |
202 | strbuf_addstr(&msgbuf, info->msg); |
| |
203 | strbuf_addch(&msgbuf, '\n'); |
| |
204 | } |
| |
205 | format_note(NULL, commit->object.sha1, &msgbuf, |
| |
206 | PAGE_ENCODING, |
| |
207 | NOTES_SHOW_HEADER | NOTES_INDENT); |
| |
208 | strbuf_addch(&msgbuf, '\n'); |
| |
209 | strbuf_ltrim(&msgbuf); |
121 | } |
210 | } |
122 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", |
211 | |
123 | cols); |
212 | if (revs->graph) { |
124 | html_txt(info->msg); |
213 | int lines = 0; |
125 | html("</td></tr>\n"); |
214 | |
126 | if (notes.len != 0) { |
215 | /* Calculate graph padding */ |
127 | html("<tr class='nohover'>"); |
216 | if (ctx.qry.showmsg) { |
128 | html("<td class='lognotes-label'>Notes:</td>"); |
217 | /* Count #lines in commit message + notes */ |
129 | htmlf("<td colspan='%d' class='lognotes'>", |
218 | const char *p = msgbuf.buf; |
130 | cols); |
219 | lines = 1; |
131 | html_txt(notes.buf); |
220 | while ((p = strchr(p, '\n'))) { |
132 | html("</td></tr>\n"); |
221 | p++; |
| |
222 | lines++; |
| |
223 | } |
| |
224 | } |
| |
225 | |
| |
226 | /* Print graph padding */ |
| |
227 | html("<td class='commitgraph'>"); |
| |
228 | while (lines > 0 || !graph_is_commit_finished(revs->graph)) { |
| |
229 | if (graphbuf.len) |
| |
230 | html("\n"); |
| |
231 | strbuf_setlen(&graphbuf, 0); |
| |
232 | graph_next_line(revs->graph, &graphbuf); |
| |
233 | html(graphbuf.buf); |
| |
234 | lines--; |
| |
235 | } |
| |
236 | html("</td>\n"); |
133 | } |
237 | } |
134 | strbuf_release(¬es); |
238 | else |
| |
239 | html("<td/>"); /* Empty 'Age' column */ |
| |
240 | |
| |
241 | /* Print msgbuf into remainder of table row */ |
| |
242 | htmlf("<td colspan='%d'%s>\n", cols, |
| |
243 | ctx.qry.showmsg ? " class='logmsg'" : ""); |
| |
244 | html_txt(msgbuf.buf); |
| |
245 | html("</td></tr>\n"); |
135 | } |
246 | } |
| |
247 | |
| |
248 | strbuf_release(&msgbuf); |
| |
249 | strbuf_release(&graphbuf); |
136 | cgit_free_commitinfo(info); |
250 | cgit_free_commitinfo(info); |
137 | } |
251 | } |
138 | |
252 | |
@@ -148,38 +262,94 @@ static const char *disambiguate_ref(const char *ref) |
148 | return ref; |
262 | return ref; |
149 | } |
263 | } |
150 | |
264 | |
| |
265 | static char *next_token(char **src) |
| |
266 | { |
| |
267 | char *result; |
| |
268 | |
| |
269 | if (!src || !*src) |
| |
270 | return NULL; |
| |
271 | while (isspace(**src)) |
| |
272 | (*src)++; |
| |
273 | if (!**src) |
| |
274 | return NULL; |
| |
275 | result = *src; |
| |
276 | while (**src) { |
| |
277 | if (isspace(**src)) { |
| |
278 | **src = '\0'; |
| |
279 | (*src)++; |
| |
280 | break; |
| |
281 | } |
| |
282 | (*src)++; |
| |
283 | } |
| |
284 | return result; |
| |
285 | } |
| |
286 | |
151 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
287 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
152 | char *path, int pager) |
288 | char *path, int pager, int commit_graph) |
153 | { |
289 | { |
154 | struct rev_info rev; |
290 | struct rev_info rev; |
155 | struct commit *commit; |
291 | struct commit *commit; |
156 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; |
292 | struct vector vec = VECTOR_INIT(char *); |
157 | int argc = 2; |
| |
158 | int i, columns = 3; |
293 | int i, columns = 3; |
| |
294 | char *arg; |
| |
295 | |
| |
296 | /* First argv is NULL */ |
| |
297 | vector_push(&vec, NULL, 0); |
159 | |
298 | |
160 | if (!tip) |
299 | if (!tip) |
161 | tip = ctx.qry.head; |
300 | tip = ctx.qry.head; |
162 | |
301 | tip = disambiguate_ref(tip); |
163 | argv[1] = disambiguate_ref(tip); |
302 | vector_push(&vec, &tip, 0); |
164 | |
303 | |
165 | if (grep && pattern && *pattern) { |
304 | if (grep && pattern && *pattern) { |
| |
305 | pattern = xstrdup(pattern); |
166 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
306 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
167 | !strcmp(grep, "committer")) |
307 | !strcmp(grep, "committer")) { |
168 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
308 | arg = fmt("--%s=%s", grep, pattern); |
169 | if (!strcmp(grep, "range")) |
309 | vector_push(&vec, &arg, 0); |
170 | argv[1] = pattern; |
310 | } |
| |
311 | if (!strcmp(grep, "range")) { |
| |
312 | /* Split the pattern at whitespace and add each token |
| |
313 | * as a revision expression. Do not accept other |
| |
314 | * rev-list options. Also, replace the previously |
| |
315 | * pushed tip (it's no longer relevant). |
| |
316 | */ |
| |
317 | vec.count--; |
| |
318 | while ((arg = next_token(&pattern))) { |
| |
319 | if (*arg == '-') { |
| |
320 | fprintf(stderr, "Bad range expr: %s\n", |
| |
321 | arg); |
| |
322 | break; |
| |
323 | } |
| |
324 | vector_push(&vec, &arg, 0); |
| |
325 | } |
| |
326 | } |
| |
327 | } |
| |
328 | if (commit_graph) { |
| |
329 | static const char *graph_arg = "--graph"; |
| |
330 | static const char *color_arg = "--color"; |
| |
331 | vector_push(&vec, &graph_arg, 0); |
| |
332 | vector_push(&vec, &color_arg, 0); |
| |
333 | graph_set_column_colors(column_colors_html, |
| |
334 | COLUMN_COLORS_HTML_MAX); |
171 | } |
335 | } |
172 | |
336 | |
173 | if (path) { |
337 | if (path) { |
174 | argv[argc++] = "--"; |
338 | arg = "--"; |
175 | argv[argc++] = path; |
339 | vector_push(&vec, &arg, 0); |
| |
340 | vector_push(&vec, &path, 0); |
176 | } |
341 | } |
| |
342 | |
| |
343 | /* Make sure the vector is NULL-terminated */ |
| |
344 | vector_push(&vec, NULL, 0); |
| |
345 | vec.count--; |
| |
346 | |
177 | init_revisions(&rev, NULL); |
347 | init_revisions(&rev, NULL); |
178 | rev.abbrev = DEFAULT_ABBREV; |
348 | rev.abbrev = DEFAULT_ABBREV; |
179 | rev.commit_format = CMIT_FMT_DEFAULT; |
349 | rev.commit_format = CMIT_FMT_DEFAULT; |
180 | rev.verbose_header = 1; |
350 | rev.verbose_header = 1; |
181 | rev.show_root_diff = 0; |
351 | rev.show_root_diff = 0; |
182 | setup_revisions(argc, argv, &rev, NULL); |
352 | setup_revisions(vec.count, vec.data, &rev, NULL); |
183 | load_ref_decorations(DECORATE_FULL_REFS); |
353 | load_ref_decorations(DECORATE_FULL_REFS); |
184 | rev.show_decorations = 1; |
354 | rev.show_decorations = 1; |
185 | rev.grep_filter.regflags |= REG_ICASE; |
355 | rev.grep_filter.regflags |= REG_ICASE; |
@@ -189,8 +359,12 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
189 | if (pager) |
359 | if (pager) |
190 | html("<table class='list nowrap'>"); |
360 | html("<table class='list nowrap'>"); |
191 | |
361 | |
192 | html("<tr class='nohover'><th class='left'>Age</th>" |
362 | html("<tr class='nohover'>"); |
193 | "<th class='left'>Commit message"); |
363 | if (commit_graph) |
| |
364 | html("<th></th>"); |
| |
365 | else |
| |
366 | html("<th class='left'>Age</th>"); |
| |
367 | html("<th class='left'>Commit message"); |
194 | if (pager) { |
368 | if (pager) { |
195 | html(" ("); |
369 | html(" ("); |
196 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
370 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
@@ -200,6 +374,8 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
200 | html(")"); |
374 | html(")"); |
201 | } |
375 | } |
202 | html("</th><th class='left'>Author</th>"); |
376 | html("</th><th class='left'>Author</th>"); |
| |
377 | if (commit_graph) |
| |
378 | html("<th class='left'>Age</th>"); |
203 | if (ctx.repo->enable_log_filecount) { |
379 | if (ctx.repo->enable_log_filecount) { |
204 | html("<th class='left'>Files</th>"); |
380 | html("<th class='left'>Files</th>"); |
205 | columns++; |
381 | columns++; |
@@ -221,7 +397,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
221 | } |
397 | } |
222 | |
398 | |
223 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
399 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
224 | print_commit(commit); |
400 | print_commit(commit, &rev); |
225 | free(commit->buffer); |
401 | free(commit->buffer); |
226 | commit->buffer = NULL; |
402 | commit->buffer = NULL; |
227 | free_commit_list(commit->parents); |
403 | free_commit_list(commit->parents); |
|