mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-12 07:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

log template: make root commit green instead of bright green

Browse source 
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.
This commit is contained in:
Ilya Grigoriev 2023-08-15 18:17:15 -07:00
parent 4c3265477b
commit 863f1760f9
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/src/config/colors.toml
View file

@ -33,7 +33,7 @@
"conflict" = "red" "conflict" = "red"
"empty" = "green" "empty" = "green"
"separator" = "bright black" "separator" = "bright black"
"root" = {fg = "bright green", bold = true} "root" = "green"
"working_copy" = { bold = true } "working_copy" = { bold = true }
"working_copy commit_id" = "bright blue" "working_copy commit_id" = "bright blue"

8
cli/tests/test_commit_template.rs
View file

@ -138,7 +138,7 @@ fn test_log_default() {
│ (empty) description 1 │ (empty) description 1
◉ qpvuntsm test.user@example.com 2001-02-03 04:05:08.000 +07:00 4291e264 ◉ qpvuntsm test.user@example.com 2001-02-03 04:05:08.000 +07:00 4291e264
│ add a file │ add a file
◉ zzzzzzzz root 00000000 ◉ zzzzzzzz root 00000000
"###); "###);
// Color without graph // Color without graph
@ -148,7 +148,7 @@ fn test_log_default() {
(empty) description 1 (empty) description 1
qpvuntsm test.user@example.com 2001-02-03 04:05:08.000 +07:00 4291e264 qpvuntsm test.user@example.com 2001-02-03 04:05:08.000 +07:00 4291e264
add a file add a file
zzzzzzzz root 00000000 zzzzzzzz root 00000000
"###); "###);
} }
@ -233,7 +233,7 @@ fn test_log_obslog_divergence() {
│ description 2 │ description 2
│ @ qpvuntsm?? test.user@example.com 2001-02-03 04:05:08.000 +07:00 7a17d52e │ @ qpvuntsm?? test.user@example.com 2001-02-03 04:05:08.000 +07:00 7a17d52e
├─╯ description 1 ├─╯ description 1
◉ zzzzzzzz root 00000000 ◉ zzzzzzzz root 00000000
"###); "###);
// Obslog and hidden divergent // Obslog and hidden divergent
@ -274,7 +274,7 @@ fn test_log_git_head() {
│ initial │ initial
◉ qpvuntsm test.user@example.com 2001-02-03 04:05:07.000 +07:00 master HEAD@git 230dd059 ◉ qpvuntsm test.user@example.com 2001-02-03 04:05:07.000 +07:00 master HEAD@git 230dd059
│ (empty) (no description set) │ (empty) (no description set)
◉ zzzzzzzz root 00000000 ◉ zzzzzzzz root 00000000
"###); "###);
} }