From 32377a13f48956bc31cfb2cb8c6f0939f464e10c Mon Sep 17 00:00:00 2001 From: Vamsi Avula Date: Thu, 24 Aug 2023 10:10:33 +0530 Subject: [PATCH] templates: default placeholders to red With the idea that less severe placeholders (like description) could (and should) explicitly "opt out". (Both email and name placeholders will be red with this change.) --- cli/src/config/colors.toml | 2 ++ cli/tests/test_commit_template.rs | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cli/src/config/colors.toml b/cli/src/config/colors.toml index a4c1cf6ddd..17b4ee3cea 100644 --- a/cli/src/config/colors.toml +++ b/cli/src/config/colors.toml @@ -32,6 +32,7 @@ "divergent change_id"="red" "conflict" = "red" "empty" = "green" +"placeholder" = "red" "description placeholder" = "yellow" "empty description placeholder" = "green" "separator" = "bright black" @@ -53,6 +54,7 @@ "working_copy divergent change_id" = "bright red" "working_copy conflict" = "bright red" "working_copy empty" = "bright green" +"working_copy placeholder" = "bright red" "working_copy description placeholder" = "yellow" "working_copy empty description placeholder" = "bright green" "diff header" = "yellow" diff --git a/cli/tests/test_commit_template.rs b/cli/tests/test_commit_template.rs index d22f1a4ccb..39351fb504 100644 --- a/cli/tests/test_commit_template.rs +++ b/cli/tests/test_commit_template.rs @@ -248,13 +248,13 @@ fn test_log_builtin_templates_colored() { ); insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r###" - @ rlvkpnrz (no email set) 2001-02-03 04:05:08.000 +07:00 dc315397 (empty) (no description set) + @ rlvkpnrz (no email set) 2001-02-03 04:05:08.000 +07:00 dc315397 (empty) (no description set) ◉ qpvuntsm test.user 2001-02-03 04:05:07.000 +07:00 230dd059 (empty) (no description set) ◉ zzzzzzzz root 00000000 "###); insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r###" - @ rlvkpnrz (no email set) 2001-02-03 04:05:08.000 +07:00 dc315397 + @ rlvkpnrz (no email set) 2001-02-03 04:05:08.000 +07:00 dc315397 │ (empty) (no description set) ◉ qpvuntsm test.user@example.com 2001-02-03 04:05:07.000 +07:00 230dd059 │ (empty) (no description set) @@ -262,7 +262,7 @@ fn test_log_builtin_templates_colored() { "###); insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r###" - @ rlvkpnrz (no email set) 2001-02-03 04:05:08.000 +07:00 dc315397 + @ rlvkpnrz (no email set) 2001-02-03 04:05:08.000 +07:00 dc315397 │ (empty) (no description set) │ ◉ qpvuntsm test.user@example.com 2001-02-03 04:05:07.000 +07:00 230dd059 @@ -274,8 +274,8 @@ fn test_log_builtin_templates_colored() { insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r###" @ Commit ID: dc31539712c7294d1d712cec63cef4504b94ca74 │ Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp - │ Author: (no name set) <(no email set)> (2001-02-03 04:05:08.000 +07:00) - │ Committer: (no name set) <(no email set)> (2001-02-03 04:05:08.000 +07:00) + │ Author: (no name set) <(no email set)> (2001-02-03 04:05:08.000 +07:00) + │ Committer: (no name set) <(no email set)> (2001-02-03 04:05:08.000 +07:00) │ │  (no description set) │ @@ -288,8 +288,8 @@ fn test_log_builtin_templates_colored() { │ ◉ Commit ID: 0000000000000000000000000000000000000000 Change ID: zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz - Author: (no name set) <(no email set)> (1970-01-01 00:00:00.000 +00:00) - Committer: (no name set) <(no email set)> (1970-01-01 00:00:00.000 +00:00) + Author: (no name set) <(no email set)> (1970-01-01 00:00:00.000 +00:00) + Committer: (no name set) <(no email set)> (1970-01-01 00:00:00.000 +00:00)  (no description set)