|
diff --git a/ui-log.c b/ui-log.c index 27f5a1a..8add66a 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -1,301 +1,428 @@ |
1 | /* ui-log.c: functions for log output |
1 | /* ui-log.c: functions for log output |
2 | * |
2 | * |
3 | * Copyright (C) 2006 Lars Hjemli |
3 | * Copyright (C) 2006 Lars Hjemli |
4 | * |
4 | * |
5 | * Licensed under GNU General Public License v2 |
5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) |
6 | * (see COPYING for full license text) |
7 | */ |
7 | */ |
8 | |
8 | |
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 | #include "vector.h" |
13 | |
13 | |
14 | int files, add_lines, rem_lines; |
14 | int files, add_lines, rem_lines; |
15 | |
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 | |
16 | void count_lines(char *line, int size) |
31 | void count_lines(char *line, int size) |
17 | { |
32 | { |
18 | if (size <= 0) |
33 | if (size <= 0) |
19 | return; |
34 | return; |
20 | |
35 | |
21 | if (line[0] == '+') |
36 | if (line[0] == '+') |
22 | add_lines++; |
37 | add_lines++; |
23 | |
38 | |
24 | else if (line[0] == '-') |
39 | else if (line[0] == '-') |
25 | rem_lines++; |
40 | rem_lines++; |
26 | } |
41 | } |
27 | |
42 | |
28 | void inspect_files(struct diff_filepair *pair) |
43 | void inspect_files(struct diff_filepair *pair) |
29 | { |
44 | { |
30 | unsigned long old_size = 0; |
45 | unsigned long old_size = 0; |
31 | unsigned long new_size = 0; |
46 | unsigned long new_size = 0; |
32 | int binary = 0; |
47 | int binary = 0; |
33 | |
48 | |
34 | files++; |
49 | files++; |
35 | if (ctx.repo->enable_log_linecount) |
50 | if (ctx.repo->enable_log_linecount) |
36 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
51 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
37 | &new_size, &binary, 0, ctx.qry.ignorews, |
52 | &new_size, &binary, 0, ctx.qry.ignorews, |
38 | count_lines); |
53 | count_lines); |
39 | } |
54 | } |
40 | |
55 | |
41 | void show_commit_decorations(struct commit *commit) |
56 | void show_commit_decorations(struct commit *commit) |
42 | { |
57 | { |
43 | struct name_decoration *deco; |
58 | struct name_decoration *deco; |
44 | static char buf[1024]; |
59 | static char buf[1024]; |
45 | |
60 | |
46 | buf[sizeof(buf) - 1] = 0; |
61 | buf[sizeof(buf) - 1] = 0; |
47 | deco = lookup_decoration(&name_decoration, &commit->object); |
62 | deco = lookup_decoration(&name_decoration, &commit->object); |
48 | while (deco) { |
63 | while (deco) { |
49 | if (!prefixcmp(deco->name, "refs/heads/")) { |
64 | if (!prefixcmp(deco->name, "refs/heads/")) { |
50 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); |
65 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); |
51 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, |
66 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, |
52 | ctx.qry.vpath, 0, NULL, NULL, |
67 | ctx.qry.vpath, 0, NULL, NULL, |
53 | ctx.qry.showmsg); |
68 | ctx.qry.showmsg); |
54 | } |
69 | } |
55 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { |
70 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { |
56 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); |
71 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); |
57 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
72 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
58 | } |
73 | } |
59 | else if (!prefixcmp(deco->name, "refs/tags/")) { |
74 | else if (!prefixcmp(deco->name, "refs/tags/")) { |
60 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); |
75 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); |
61 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
76 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
62 | } |
77 | } |
63 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
78 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
64 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
79 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
65 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
80 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
66 | sha1_to_hex(commit->object.sha1), |
81 | sha1_to_hex(commit->object.sha1), |
67 | ctx.qry.vpath, 0, NULL, NULL, |
82 | ctx.qry.vpath, 0, NULL, NULL, |
68 | ctx.qry.showmsg); |
83 | ctx.qry.showmsg); |
69 | } |
84 | } |
70 | else { |
85 | else { |
71 | strncpy(buf, deco->name, sizeof(buf) - 1); |
86 | strncpy(buf, deco->name, sizeof(buf) - 1); |
72 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
87 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
73 | sha1_to_hex(commit->object.sha1), |
88 | sha1_to_hex(commit->object.sha1), |
74 | ctx.qry.vpath, 0); |
89 | ctx.qry.vpath, 0); |
75 | } |
90 | } |
76 | deco = deco->next; |
91 | deco = deco->next; |
77 | } |
92 | } |
78 | } |
93 | } |
79 | |
94 | |
80 | void print_commit(struct commit *commit) |
95 | void print_commit(struct commit *commit, struct rev_info *revs) |
81 | { |
96 | { |
82 | struct commitinfo *info; |
97 | struct commitinfo *info; |
83 | char *tmp; |
98 | char *tmp; |
84 | 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 | } |
85 | |
120 | |
86 | info = cgit_parse_commit(commit); |
121 | info = cgit_parse_commit(commit); |
87 | htmlf("<tr%s><td>", |
122 | htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : ""); |
88 | ctx.qry.showmsg ? " class='logheader'" : ""); |
123 | |
89 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
124 | if (revs->graph) { |
90 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
125 | /* Print graph segment for current commit */ |
91 | html_link_open(tmp, NULL, NULL); |
126 | html("<td class='commitgraph'>"); |
92 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
127 | html(graphbuf.buf); |
93 | html_link_close(); |
128 | html("</td>"); |
94 | htmlf("</td><td%s>", |
129 | strbuf_setlen(&graphbuf, 0); |
95 | 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 | } |
96 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
167 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
97 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
168 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
98 | show_commit_decorations(commit); |
169 | show_commit_decorations(commit); |
99 | html("</td><td>"); |
170 | html("</td><td>"); |
100 | 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 | |
101 | if (ctx.repo->enable_log_filecount) { |
182 | if (ctx.repo->enable_log_filecount) { |
102 | files = 0; |
183 | files = 0; |
103 | add_lines = 0; |
184 | add_lines = 0; |
104 | rem_lines = 0; |
185 | rem_lines = 0; |
105 | cgit_diff_commit(commit, inspect_files, ctx.qry.vpath); |
186 | cgit_diff_commit(commit, inspect_files, ctx.qry.vpath); |
106 | html("</td><td>"); |
187 | html("</td><td>"); |
107 | htmlf("%d", files); |
188 | htmlf("%d", files); |
108 | if (ctx.repo->enable_log_linecount) { |
189 | if (ctx.repo->enable_log_linecount) { |
109 | html("</td><td>"); |
190 | html("</td><td>"); |
110 | htmlf("-%d/+%d", rem_lines, add_lines); |
191 | htmlf("-%d/+%d", rem_lines, add_lines); |
111 | } |
192 | } |
112 | } |
193 | } |
113 | html("</td></tr>\n"); |
194 | html("</td></tr>\n"); |
114 | if (ctx.qry.showmsg) { |
| |
115 | struct strbuf notes = STRBUF_INIT; |
| |
116 | format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0); |
| |
117 | |
195 | |
118 | if (ctx.repo->enable_log_filecount) { |
196 | if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */ |
119 | cols++; |
197 | html("<tr class='nohover'>"); |
120 | if (ctx.repo->enable_log_linecount) |
198 | |
121 | 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); |
122 | } |
210 | } |
123 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", |
211 | |
124 | cols); |
212 | if (revs->graph) { |
125 | html_txt(info->msg); |
213 | int lines = 0; |
126 | html("</td></tr>\n"); |
214 | |
127 | if (notes.len != 0) { |
215 | /* Calculate graph padding */ |
128 | html("<tr class='nohover'>"); |
216 | if (ctx.qry.showmsg) { |
129 | html("<td class='lognotes-label'>Notes:</td>"); |
217 | /* Count #lines in commit message + notes */ |
130 | htmlf("<td colspan='%d' class='lognotes'>", |
218 | const char *p = msgbuf.buf; |
131 | cols); |
219 | lines = 1; |
132 | html_txt(notes.buf); |
220 | while ((p = strchr(p, '\n'))) { |
133 | 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"); |
134 | } |
237 | } |
135 | 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"); |
136 | } |
246 | } |
| |
247 | |
| |
248 | strbuf_release(&msgbuf); |
| |
249 | strbuf_release(&graphbuf); |
137 | cgit_free_commitinfo(info); |
250 | cgit_free_commitinfo(info); |
138 | } |
251 | } |
139 | |
252 | |
140 | static const char *disambiguate_ref(const char *ref) |
253 | static const char *disambiguate_ref(const char *ref) |
141 | { |
254 | { |
142 | unsigned char sha1[20]; |
255 | unsigned char sha1[20]; |
143 | const char *longref; |
256 | const char *longref; |
144 | |
257 | |
145 | longref = fmt("refs/heads/%s", ref); |
258 | longref = fmt("refs/heads/%s", ref); |
146 | if (get_sha1(longref, sha1) == 0) |
259 | if (get_sha1(longref, sha1) == 0) |
147 | return longref; |
260 | return longref; |
148 | |
261 | |
149 | return ref; |
262 | return ref; |
150 | } |
263 | } |
151 | |
264 | |
152 | static char *next_token(char **src) |
265 | static char *next_token(char **src) |
153 | { |
266 | { |
154 | char *result; |
267 | char *result; |
155 | |
268 | |
156 | if (!src || !*src) |
269 | if (!src || !*src) |
157 | return NULL; |
270 | return NULL; |
158 | while (isspace(**src)) |
271 | while (isspace(**src)) |
159 | (*src)++; |
272 | (*src)++; |
160 | if (!**src) |
273 | if (!**src) |
161 | return NULL; |
274 | return NULL; |
162 | result = *src; |
275 | result = *src; |
163 | while (**src) { |
276 | while (**src) { |
164 | if (isspace(**src)) { |
277 | if (isspace(**src)) { |
165 | **src = '\0'; |
278 | **src = '\0'; |
166 | (*src)++; |
279 | (*src)++; |
167 | break; |
280 | break; |
168 | } |
281 | } |
169 | (*src)++; |
282 | (*src)++; |
170 | } |
283 | } |
171 | return result; |
284 | return result; |
172 | } |
285 | } |
173 | |
286 | |
174 | 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, |
175 | char *path, int pager) |
288 | char *path, int pager, int commit_graph) |
176 | { |
289 | { |
177 | struct rev_info rev; |
290 | struct rev_info rev; |
178 | struct commit *commit; |
291 | struct commit *commit; |
179 | struct vector vec = VECTOR_INIT(char *); |
292 | struct vector vec = VECTOR_INIT(char *); |
180 | int i, columns = 3; |
293 | int i, columns = 3; |
181 | char *arg; |
294 | char *arg; |
182 | |
295 | |
183 | /* First argv is NULL */ |
296 | /* First argv is NULL */ |
184 | vector_push(&vec, NULL, 0); |
297 | vector_push(&vec, NULL, 0); |
185 | |
298 | |
186 | if (!tip) |
299 | if (!tip) |
187 | tip = ctx.qry.head; |
300 | tip = ctx.qry.head; |
188 | tip = disambiguate_ref(tip); |
301 | tip = disambiguate_ref(tip); |
189 | vector_push(&vec, &tip, 0); |
302 | vector_push(&vec, &tip, 0); |
190 | |
303 | |
191 | if (grep && pattern && *pattern) { |
304 | if (grep && pattern && *pattern) { |
192 | pattern = xstrdup(pattern); |
305 | pattern = xstrdup(pattern); |
193 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
306 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
194 | !strcmp(grep, "committer")) { |
307 | !strcmp(grep, "committer")) { |
195 | arg = fmt("--%s=%s", grep, pattern); |
308 | arg = fmt("--%s=%s", grep, pattern); |
196 | vector_push(&vec, &arg, 0); |
309 | vector_push(&vec, &arg, 0); |
197 | } |
310 | } |
198 | if (!strcmp(grep, "range")) { |
311 | if (!strcmp(grep, "range")) { |
199 | /* Split the pattern at whitespace and add each token |
312 | /* Split the pattern at whitespace and add each token |
200 | * as a revision expression. Do not accept other |
313 | * as a revision expression. Do not accept other |
201 | * rev-list options. Also, replace the previously |
314 | * rev-list options. Also, replace the previously |
202 | * pushed tip (it's no longer relevant). |
315 | * pushed tip (it's no longer relevant). |
203 | */ |
316 | */ |
204 | vec.count--; |
317 | vec.count--; |
205 | while ((arg = next_token(&pattern))) { |
318 | while ((arg = next_token(&pattern))) { |
206 | if (*arg == '-') { |
319 | if (*arg == '-') { |
207 | fprintf(stderr, "Bad range expr: %s\n", |
320 | fprintf(stderr, "Bad range expr: %s\n", |
208 | arg); |
321 | arg); |
209 | break; |
322 | break; |
210 | } |
323 | } |
211 | vector_push(&vec, &arg, 0); |
324 | vector_push(&vec, &arg, 0); |
212 | } |
325 | } |
213 | } |
326 | } |
214 | } |
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); |
| |
335 | } |
215 | |
336 | |
216 | if (path) { |
337 | if (path) { |
217 | arg = "--"; |
338 | arg = "--"; |
218 | vector_push(&vec, &arg, 0); |
339 | vector_push(&vec, &arg, 0); |
219 | vector_push(&vec, &path, 0); |
340 | vector_push(&vec, &path, 0); |
220 | } |
341 | } |
221 | |
342 | |
222 | /* Make sure the vector is NULL-terminated */ |
343 | /* Make sure the vector is NULL-terminated */ |
223 | vector_push(&vec, NULL, 0); |
344 | vector_push(&vec, NULL, 0); |
224 | vec.count--; |
345 | vec.count--; |
225 | |
346 | |
226 | init_revisions(&rev, NULL); |
347 | init_revisions(&rev, NULL); |
227 | rev.abbrev = DEFAULT_ABBREV; |
348 | rev.abbrev = DEFAULT_ABBREV; |
228 | rev.commit_format = CMIT_FMT_DEFAULT; |
349 | rev.commit_format = CMIT_FMT_DEFAULT; |
229 | rev.verbose_header = 1; |
350 | rev.verbose_header = 1; |
230 | rev.show_root_diff = 0; |
351 | rev.show_root_diff = 0; |
231 | setup_revisions(vec.count, vec.data, &rev, NULL); |
352 | setup_revisions(vec.count, vec.data, &rev, NULL); |
232 | load_ref_decorations(DECORATE_FULL_REFS); |
353 | load_ref_decorations(DECORATE_FULL_REFS); |
233 | rev.show_decorations = 1; |
354 | rev.show_decorations = 1; |
234 | rev.grep_filter.regflags |= REG_ICASE; |
355 | rev.grep_filter.regflags |= REG_ICASE; |
235 | compile_grep_patterns(&rev.grep_filter); |
356 | compile_grep_patterns(&rev.grep_filter); |
236 | prepare_revision_walk(&rev); |
357 | prepare_revision_walk(&rev); |
237 | |
358 | |
238 | if (pager) |
359 | if (pager) |
239 | html("<table class='list nowrap'>"); |
360 | html("<table class='list nowrap'>"); |
240 | |
361 | |
241 | html("<tr class='nohover'><th class='left'>Age</th>" |
362 | html("<tr class='nohover'>"); |
242 | "<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"); |
243 | if (pager) { |
368 | if (pager) { |
244 | html(" ("); |
369 | html(" ("); |
245 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
370 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
246 | NULL, ctx.qry.head, ctx.qry.sha1, |
371 | NULL, ctx.qry.head, ctx.qry.sha1, |
247 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, |
372 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, |
248 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
373 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
249 | html(")"); |
374 | html(")"); |
250 | } |
375 | } |
251 | 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>"); |
252 | if (ctx.repo->enable_log_filecount) { |
379 | if (ctx.repo->enable_log_filecount) { |
253 | html("<th class='left'>Files</th>"); |
380 | html("<th class='left'>Files</th>"); |
254 | columns++; |
381 | columns++; |
255 | if (ctx.repo->enable_log_linecount) { |
382 | if (ctx.repo->enable_log_linecount) { |
256 | html("<th class='left'>Lines</th>"); |
383 | html("<th class='left'>Lines</th>"); |
257 | columns++; |
384 | columns++; |
258 | } |
385 | } |
259 | } |
386 | } |
260 | html("</tr>\n"); |
387 | html("</tr>\n"); |
261 | |
388 | |
262 | if (ofs<0) |
389 | if (ofs<0) |
263 | ofs = 0; |
390 | ofs = 0; |
264 | |
391 | |
265 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
392 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
266 | free(commit->buffer); |
393 | free(commit->buffer); |
267 | commit->buffer = NULL; |
394 | commit->buffer = NULL; |
268 | free_commit_list(commit->parents); |
395 | free_commit_list(commit->parents); |
269 | commit->parents = NULL; |
396 | commit->parents = NULL; |
270 | } |
397 | } |
271 | |
398 | |
272 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
399 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
273 | print_commit(commit); |
400 | print_commit(commit, &rev); |
274 | free(commit->buffer); |
401 | free(commit->buffer); |
275 | commit->buffer = NULL; |
402 | commit->buffer = NULL; |
276 | free_commit_list(commit->parents); |
403 | free_commit_list(commit->parents); |
277 | commit->parents = NULL; |
404 | commit->parents = NULL; |
278 | } |
405 | } |
279 | if (pager) { |
406 | if (pager) { |
280 | html("</table><div class='pager'>"); |
407 | html("</table><div class='pager'>"); |
281 | if (ofs > 0) { |
408 | if (ofs > 0) { |
282 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, |
409 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, |
283 | ctx.qry.sha1, ctx.qry.vpath, |
410 | ctx.qry.sha1, ctx.qry.vpath, |
284 | ofs - cnt, ctx.qry.grep, |
411 | ofs - cnt, ctx.qry.grep, |
285 | ctx.qry.search, ctx.qry.showmsg); |
412 | ctx.qry.search, ctx.qry.showmsg); |
286 | html(" "); |
413 | html(" "); |
287 | } |
414 | } |
288 | if ((commit = get_revision(&rev)) != NULL) { |
415 | if ((commit = get_revision(&rev)) != NULL) { |
289 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, |
416 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, |
290 | ctx.qry.sha1, ctx.qry.vpath, |
417 | ctx.qry.sha1, ctx.qry.vpath, |
291 | ofs + cnt, ctx.qry.grep, |
418 | ofs + cnt, ctx.qry.grep, |
292 | ctx.qry.search, ctx.qry.showmsg); |
419 | ctx.qry.search, ctx.qry.showmsg); |
293 | } |
420 | } |
294 | html("</div>"); |
421 | html("</div>"); |
295 | } else if ((commit = get_revision(&rev)) != NULL) { |
422 | } else if ((commit = get_revision(&rev)) != NULL) { |
296 | html("<tr class='nohover'><td colspan='3'>"); |
423 | html("<tr class='nohover'><td colspan='3'>"); |
297 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, |
424 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, |
298 | ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg); |
425 | ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg); |
299 | html("</td></tr>\n"); |
426 | html("</td></tr>\n"); |
300 | } |
427 | } |
301 | } |
428 | } |
|