From 268b34af23cdcac87aed3300bfe6154cbc65753e Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Mon, 15 Nov 2010 18:39:51 +0100 Subject: 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 tags that apply the desired color using CSS. Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli --- cgit.css | 24 ++++++++++++++++++++++++ ui-log.c | 19 +++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/cgit.css b/cgit.css index 7600e84..1ebef55 100644 --- a/cgit.css +++ b/cgit.css @@ -158,6 +158,30 @@ table.list td.commitgraph { 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; 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 @@ int files, add_lines, rem_lines; +/* + * The list of available column colors in the commit graph. + */ +static const char *column_colors_html[] = { + "", + "", + "", + "", + "", + "", + "", +}; + +#define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1) + void count_lines(char *line, int size) { if (size <= 0) @@ -273,7 +288,11 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern } 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) { -- cgit 1.4.1 b67ba8d7&follow=1'>root/compat_readpassphrase.c (unfollow)
Commit message (Expand)Author
2022-07-30Update copyrights, authorsJune McEnroe
2022-07-30Remove EditModeJune McEnroe
2022-07-28Use tiparm on to_status_lineJune McEnroe
2022-06-26Only show old topic if something was removedJune McEnroe
2022-06-24Use two lines to show topic diffsJune McEnroe
2022-05-29Allow setting fallback nicks and highlight on anyJune McEnroe
2022-05-29Document visibility of unknown repliesJune McEnroe
2022-05-29Put unknown numerics in parenthesesJune McEnroe
2022-05-08Route unknown channel replies to channelsJune McEnroe
2022-05-08Show "You arrive" message only onceJune McEnroe
2022-05-08Write unknown replies to Network with Ice heatJune McEnroe
2022-04-20Sanitize leading dots from log path componentsJune McEnroe
2022-03-31Add screenshot to READMEJune McEnroe
2022-03-16Skip non-spacing when moving and deleting by "character"June McEnroe
2022-03-13Document using -S to connect over IPv4 or IPv6June McEnroe
2022-03-09Always refresh the screen with ^LChristian Kellermann
2022-03-05Update STANDARDS section authors, titles and URLsJune McEnroe
2022-03-02Show own nick on /nick without paramsJune McEnroe
2022-02-26Specify commands which depend on capsJune McEnroe
2022-02-26Only add available commands to completeJune McEnroe
2022-02-26Factor out commandAvailableJune McEnroe
2022-02-23Give examples of "general events" 2.1June McEnroe
2022-02-23Add missing unistd.h include in input.cJune McEnroe
2022-02-22Document the interfaceJune McEnroe
2022-02-20Clean up unimplemented editing mode stuffJune McEnroe
2022-02-20Save input buffer contentsJune McEnroe
2022-02-20Share a cut buffer between all edit buffersJune McEnroe
2022-02-20Assert return values in edit testsJune McEnroe
2022-02-20Move mbs out of struct Edit, use a global bufferJune McEnroe
2022-02-20Clear edit buffer before running commandJune McEnroe
2022-02-20Show indicator in status when window has pending inputJune McEnroe
2022-02-20Use separate edit buffers for each IDJune McEnroe
2022-02-20Make sure new cap is actually larger than new lengthJune McEnroe
2022-02-20Remove unused mbs.len field from struct EditJune McEnroe
2022-02-19Remove unneeded includes in ui.cJune McEnroe
2022-02-19Reimplement tab completeJune McEnroe
2022-02-19Handle errors from editFn, etc.June McEnroe
2022-02-19Reimplement text macrosJune McEnroe
2022-02-19Factor out input handling to input.cJune McEnroe
2022-02-19Factor out window management to window.cJune McEnroe
2022-02-19Enable -Wmissing-prototypesJune McEnroe
2022-02-19Fix edit.[ch] license notice additional permissionsJune McEnroe
2022-02-19Run line editing testsJune McEnroe
2022-02-18Implement new line editing "library"June McEnroe
2022-02-18Simplify cursor positioning in inputJune McEnroe
2022-02-18Fix M-f orderingJune McEnroe
2022-02-12Move sandman build to scripts/MakefileJune McEnroe
2022-02-12Use compat_readpassphrase.c on LinuxJune McEnroe
2022-02-12Copy RPP defines from oconfigureJune McEnroe