about summary refs log tree commit diff stats
path: root/ui-log.c
diff options
context:
space:
mode:
authorJohan Herland2010-11-15 18:39:51 +0100
committerLars Hjemli2010-11-16 08:18:37 +0100
commit268b34af23cdcac87aed3300bfe6154cbc65753e (patch)
treefccbebc21c004f5967947275ba5086589086ec36 /ui-log.c
parentui-log: Implement support for commit graphs (diff)
downloadcgit-268b34af23cdcac87aed3300bfe6154cbc65753e.tar.gz
cgit-268b34af23cdcac87aed3300bfe6154cbc65753e.zip
ui-log: Colorize commit graph
Use the existing coloring logic in Git's graph code to color the lines
between commits in the commit graph.

Whereas Git normally uses ANSI color escapes to produce colors, we here
use graph_set_column_colors() to replace those with HTML color escapes,
that embed the graph lines in <span> tags that apply the desired color
using CSS.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-log.c')
-rw-r--r--ui-log.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/ui-log.c b/ui-log.c index 0d86fd5..5cf66cb 100644 --- a/ui-log.c +++ b/ui-log.c
@@ -13,6 +13,21 @@
13 13
14int files, add_lines, rem_lines; 14int files, add_lines, rem_lines;
15 15
16/*
17 * The list of available column colors in the commit graph.
18 */
19static 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
16void count_lines(char *line, int size) 31void count_lines(char *line, int size)
17{ 32{
18 if (size <= 0) 33 if (size <= 0)
@@ -273,7 +288,11 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
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) {