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>

2 files changed, 43 insertions, 0 deletions

diff --git a/cgit.css b/cgit.css
index 7600e84..1ebef55 100644
--- a/cgit.css
+++ b/cgit.css
@@ -137,48 +137,72 @@ table.list tr:hover {
 table.list tr.nohover:hover {
         background: white;
 }
 
 table.list th {
         font-weight: bold;
         /* color: #888;
         border-top: dashed 1px #888;
         border-bottom: dashed 1px #888;
         */
         padding: 0.1em 0.5em 0.05em 0.5em;
         vertical-align: baseline;
 }
 
 table.list td {
         border: none;
         padding: 0.1em 0.5em 0.1em 0.5em;
 }
 
 table.list td.commitgraph {
         font-family: monospace;
         white-space: pre;
 }
 
+table.list td.commitgraph .column1 {
+        color: #a00;
+}
+
+table.list td.commitgraph .column2 {
+        color: #0a0;
+}
+
+table.list td.commitgraph .column3 {
+        color: #aa0;
+}
+
+table.list td.commitgraph .column4 {
+        color: #00a;
+}
+
+table.list td.commitgraph .column5 {
+        color: #a0a;
+}
+
+table.list td.commitgraph .column6 {
+        color: #0aa;
+}
+
 table.list td.logsubject {
         font-family: monospace;
         font-weight: bold;
 }
 
 table.list td.logmsg {
         font-family: monospace;
         white-space: pre;
         padding: 0 0.5em;
 }
 
 table.list td a {
         color: black;
 }
 
 table.list td a.ls-dir {
         font-weight: bold;
         color: #00f;
 }
 
 table.list td a:hover {
         color: #00f;
 }
 
diff --git a/ui-log.c b/ui-log.c
index 0d86fd5..5cf66cb 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,39 +1,54 @@
 /* ui-log.c: functions for log output
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "vector.h"
 
 int files, add_lines, rem_lines;
 
+/*
+ * The list of available column colors in the commit graph.
+ */
+static const char *column_colors_html[] = {
+        "<span class='column1'>",
+        "<span class='column2'>",
+        "<span class='column3'>",
+        "<span class='column4'>",
+        "<span class='column5'>",
+        "<span class='column6'>",
+        "</span>",
+};
+
+#define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1)
+
 void count_lines(char *line, int size)
 {
         if (size <= 0)
                 return;
 
         if (line[0] == '+')
                 add_lines++;
 
         else if (line[0] == '-')
                 rem_lines++;
 }
 
 void inspect_files(struct diff_filepair *pair)
 {
         unsigned long old_size = 0;
         unsigned long new_size = 0;
         int binary = 0;
 
         files++;
         if (ctx.repo->enable_log_linecount)
                 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
                                 &new_size, &binary, 0, ctx.qry.ignorews,
                                 count_lines);
 }
@@ -252,49 +267,53 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                 if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
                     !strcmp(grep, "committer")) {
                         arg = fmt("--%s=%s", grep, pattern);
                         vector_push(&vec, &arg, 0);
                 }
                 if (!strcmp(grep, "range")) {
                         /* Split the pattern at whitespace and add each token
                          * as a revision expression. Do not accept other
                          * rev-list options. Also, replace the previously
                          * pushed tip (it's no longer relevant).
                          */
                         vec.count--;
                         while ((arg = next_token(&pattern))) {
                                 if (*arg == '-') {
                                         fprintf(stderr, "Bad range expr: %s\n",
                                                 arg);
                                         break;
                                 }
                                 vector_push(&vec, &arg, 0);
                         }
                 }
         }
         if (ctx.repo->enable_commit_graph) {
                 static const char *graph_arg = "--graph";
+                static const char *color_arg = "--color";
                 vector_push(&vec, &graph_arg, 0);
+                vector_push(&vec, &color_arg, 0);
+                graph_set_column_colors(column_colors_html,
+                                        COLUMN_COLORS_HTML_MAX);
         }
 
         if (path) {
                 arg = "--";
                 vector_push(&vec, &arg, 0);
                 vector_push(&vec, &path, 0);
         }
 
         /* Make sure the vector is NULL-terminated */
         vector_push(&vec, NULL, 0);
         vec.count--;
 
         init_revisions(&rev, NULL);
         rev.abbrev = DEFAULT_ABBREV;
         rev.commit_format = CMIT_FMT_DEFAULT;
         rev.verbose_header = 1;
         rev.show_root_diff = 0;
         setup_revisions(vec.count, vec.data, &rev, NULL);
         load_ref_decorations(DECORATE_FULL_REFS);
         rev.show_decorations = 1;
         rev.grep_filter.regflags |= REG_ICASE;
         compile_grep_patterns(&rev.grep_filter);
         prepare_revision_walk(&rev);