From 863f1760f9ec05eaffde74abae5aec21814c5e01 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Tue, 15 Aug 2023 18:17:15 -0700 Subject: [PATCH] log template: make root commit green instead of bright green Bright green really pops on my screen, and I don't think there is a reason for the root commit to be attention-grabbing. This follows up on https://github.com/martinvonz/jj/pull/2084. --- cli/src/config/colors.toml | 2 +- cli/tests/test_commit_template.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli/src/config/colors.toml b/cli/src/config/colors.toml index 8ec731ac3..5d8503529 100644 --- a/cli/src/config/colors.toml +++ b/cli/src/config/colors.toml @@ -33,7 +33,7 @@ "conflict" = "red" "empty" = "green" "separator" = "bright black" -"root" = {fg = "bright green", bold = true} +"root" = "green" "working_copy" = { bold = true } "working_copy commit_id" = "bright blue" diff --git a/cli/tests/test_commit_template.rs b/cli/tests/test_commit_template.rs index fe87cdac6..7725c98f0 100644 --- a/cli/tests/test_commit_template.rs +++ b/cli/tests/test_commit_template.rs @@ -138,7 +138,7 @@ fn test_log_default() { │ (empty) description 1 ◉ qpvuntsm test.user@example.com 2001-02-03 04:05:08.000 +07:00 4291e264 │ add a file - ◉ zzzzzzzz root 00000000 + ◉ zzzzzzzz root 00000000 "###); // Color without graph @@ -148,7 +148,7 @@ fn test_log_default() { (empty) description 1 qpvuntsm test.user@example.com 2001-02-03 04:05:08.000 +07:00 4291e264 add a file - zzzzzzzz root 00000000 + zzzzzzzz root 00000000 "###); } @@ -233,7 +233,7 @@ fn test_log_obslog_divergence() { │ description 2 │ @ qpvuntsm?? test.user@example.com 2001-02-03 04:05:08.000 +07:00 7a17d52e ├─╯ description 1 - ◉ zzzzzzzz root 00000000 + ◉ zzzzzzzz root 00000000 "###); // Obslog and hidden divergent @@ -274,7 +274,7 @@ fn test_log_git_head() { │ initial ◉ qpvuntsm test.user@example.com 2001-02-03 04:05:07.000 +07:00 master HEAD@git 230dd059 │ (empty) (no description set) - ◉ zzzzzzzz root 00000000 + ◉ zzzzzzzz root 00000000 "###); }