|
diff --git a/ui-log.c b/ui-log.c index 0d86fd5..5cf66cb 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -1,31 +1,46 @@ |
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; |
@@ -260,33 +275,37 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
260 | * rev-list options. Also, replace the previously |
275 | * rev-list options. Also, replace the previously |
261 | * pushed tip (it's no longer relevant). |
276 | * pushed tip (it's no longer relevant). |
262 | */ |
277 | */ |
263 | vec.count--; |
278 | vec.count--; |
264 | while ((arg = next_token(&pattern))) { |
279 | while ((arg = next_token(&pattern))) { |
265 | if (*arg == '-') { |
280 | if (*arg == '-') { |
266 | fprintf(stderr, "Bad range expr: %s\n", |
281 | fprintf(stderr, "Bad range expr: %s\n", |
267 | arg); |
282 | arg); |
268 | break; |
283 | break; |
269 | } |
284 | } |
270 | vector_push(&vec, &arg, 0); |
285 | vector_push(&vec, &arg, 0); |
271 | } |
286 | } |
272 | } |
287 | } |
273 | } |
288 | } |
274 | if (ctx.repo->enable_commit_graph) { |
289 | if (ctx.repo->enable_commit_graph) { |
275 | static const char *graph_arg = "--graph"; |
290 | static const char *graph_arg = "--graph"; |
| |
291 | static const char *color_arg = "--color"; |
276 | vector_push(&vec, &graph_arg, 0); |
292 | vector_push(&vec, &graph_arg, 0); |
| |
293 | vector_push(&vec, &color_arg, 0); |
| |
294 | graph_set_column_colors(column_colors_html, |
| |
295 | COLUMN_COLORS_HTML_MAX); |
277 | } |
296 | } |
278 | |
297 | |
279 | if (path) { |
298 | if (path) { |
280 | arg = "--"; |
299 | arg = "--"; |
281 | vector_push(&vec, &arg, 0); |
300 | vector_push(&vec, &arg, 0); |
282 | vector_push(&vec, &path, 0); |
301 | vector_push(&vec, &path, 0); |
283 | } |
302 | } |
284 | |
303 | |
285 | /* Make sure the vector is NULL-terminated */ |
304 | /* Make sure the vector is NULL-terminated */ |
286 | vector_push(&vec, NULL, 0); |
305 | vector_push(&vec, NULL, 0); |
287 | vec.count--; |
306 | vec.count--; |
288 | |
307 | |
289 | init_revisions(&rev, NULL); |
308 | init_revisions(&rev, NULL); |
290 | rev.abbrev = DEFAULT_ABBREV; |
309 | rev.abbrev = DEFAULT_ABBREV; |
291 | rev.commit_format = CMIT_FMT_DEFAULT; |
310 | rev.commit_format = CMIT_FMT_DEFAULT; |
292 | rev.verbose_header = 1; |
311 | rev.verbose_header = 1; |
|