// Copyright 2023 The Jujutsu Authors//// Licensed under the Apache License, Version 2.0 (the "License");// you may not use this file except in compliance with the License.// You may obtain a copy of the License at//// https://www.apache.org/licenses/LICENSE-2.0//// Unless required by applicable law or agreed to in writing, software// distributed under the License is distributed on an "AS IS" BASIS,// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.// See the License for the specific language governing permissions and// limitations under the License. use regex::Regex; use crate::common::TestEnvironment; #[test]fn test_log_parents() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); test_env.jj_cmd_ok(&repo_path, &["new"]); test_env.jj_cmd_ok(&repo_path, &["new", "@-"]); test_env.jj_cmd_ok(&repo_path, &["new", "@", "@-"]); let template = r#"commit_id ++ "\nP: " ++ parents.len() ++ " " ++ parents.map(|c| c.commit_id()) ++ "\n""#; let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", template]); insta::assert_snapshot!(stdout, @r###" @ c067170d4ca1bc6162b64f7550617ec809647f84 ├─╮ P: 2 4db490c88528133d579540b6900b8098f0c17701 230dd059e1b059aefc0da06a2e5a7dbf22362f22 ○ │ 4db490c88528133d579540b6900b8098f0c17701 ├─╯ P: 1 230dd059e1b059aefc0da06a2e5a7dbf22362f22 ○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 │ P: 1 0000000000000000000000000000000000000000 ◆ 0000000000000000000000000000000000000000 P: 0 "###); let template = r#"parents.map(|c| c.commit_id().shortest(4))"#; let stdout = test_env.jj_cmd_success( &repo_path, &["log", "-T", template, "-r@", "--color=always"], ); insta::assert_snapshot!(stdout, @r###" [1m[38;5;2m@[0m [1m[38;5;4m4[0m[38;5;8mdb4[39m [1m[38;5;4m2[0m[38;5;8m30d[39m │ ~ "###); // Commit object isn't printable let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-T", "parents"]); insta::assert_snapshot!(stderr, @r###" Error: Failed to parse template: Expected expression of type "Template", but actual type is "List<Commit>" Caused by: --> 1:1 | 1 | parents | ^-----^ | = Expected expression of type "Template", but actual type is "List<Commit>" "###); // Redundant argument passed to keyword method let template = r#"parents.map(|c| c.commit_id(""))"#; let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-T", template]); insta::assert_snapshot!(stderr, @r###" Error: Failed to parse template: Function "commit_id": Expected 0 arguments Caused by: --> 1:29 | 1 | parents.map(|c| c.commit_id("")) | ^^ | = Function "commit_id": Expected 0 arguments "###);} #[test]fn test_log_author_timestamp() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "first"]); test_env.jj_cmd_ok(&repo_path, &["new", "-m", "second"]); let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "author.timestamp()"]); insta::assert_snapshot!(stdout, @r###" @ 2001-02-03 04:05:09.000 +07:00 ○ 2001-02-03 04:05:08.000 +07:00 ◆ 1970-01-01 00:00:00.000 +00:00 "###);} #[test]fn test_log_author_timestamp_ago() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "first"]); test_env.jj_cmd_ok(&repo_path, &["new", "-m", "second"]); let template = r#"author.timestamp().ago() ++ "\n""#; let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--no-graph", "-T", template]); let line_re = Regex::new(r"[0-9]+ years ago").unwrap(); assert!( stdout.lines().all(|x| line_re.is_match(x)), "expected every line to match regex" );} #[test]fn test_log_author_timestamp_utc() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "author.timestamp().utc()"]); insta::assert_snapshot!(stdout, @r###" @ 2001-02-02 21:05:07.000 +00:00 ◆ 1970-01-01 00:00:00.000 +00:00 "###);} #[cfg(unix)]#[test]fn test_log_author_timestamp_local() { let mut test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); test_env.add_env_var("TZ", "UTC-05:30"); let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "author.timestamp().local()"]); insta::assert_snapshot!(stdout, @r###" @ 2001-02-03 08:05:07.000 +11:00 ◆ 1970-01-01 11:00:00.000 +11:00 "###); test_env.add_env_var("TZ", "UTC+10:00"); let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "author.timestamp().local()"]); insta::assert_snapshot!(stdout, @r###" @ 2001-02-03 08:05:07.000 +11:00 ◆ 1970-01-01 11:00:00.000 +11:00 "###);} #[test]fn test_log_author_timestamp_after_before() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "first"]); let template = r#" separate(" ", author.timestamp(), ":", if(author.timestamp().after("1969"), "(after 1969)", "(before 1969)"), if(author.timestamp().before("1975"), "(before 1975)", "(after 1975)"), if(author.timestamp().before("now"), "(before now)", "(after now)") ) ++ "\n""#; let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--no-graph", "-T", template]); insta::assert_snapshot!(stdout, @r#" 2001-02-03 04:05:08.000 +07:00 : (after 1969) (after 1975) (before now) 1970-01-01 00:00:00.000 +00:00 : (after 1969) (before 1975) (before now) "#); // Should display error with invalid date. let template = r#"author.timestamp().after("invalid date")"#; let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r@", "--no-graph", "-T", template]); insta::assert_snapshot!(stderr, @r#" Error: Failed to parse template: Invalid date pattern Caused by: 1: --> 1:26 | 1 | author.timestamp().after("invalid date") | ^------------^ | = Invalid date pattern 2: expected week day or month name "#);} #[test]fn test_mine_is_true_when_author_is_user() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); test_env.jj_cmd_ok( &repo_path, &[ "--config-toml=user.email='johndoe@example.com'", "--config-toml=user.name='John Doe'", "new", ], ); let stdout = test_env.jj_cmd_success( &repo_path, &[ "log", "-T", r#"coalesce(if(mine, "mine"), author.email(), email_placeholder)"#, ], ); insta::assert_snapshot!(stdout, @r###" @ johndoe@example.com ○ mine ◆ (no email set) "###);} #[test]fn test_log_default() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); std::fs::write(repo_path.join("file1"), "foo\n").unwrap(); test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "add a file"]); test_env.jj_cmd_ok(&repo_path, &["new", "-m", "description 1"]); test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "my-bookmark"]); // Test default log output format let stdout = test_env.jj_cmd_success(&repo_path, &["log"]); insta::assert_snapshot!(stdout, @r###" @ kkmpptxz test.user@example.com 2001-02-03 08:05:09 my-bookmark bac9ff9e │ (empty) description 1 ○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 aa2015d7 │ add a file ◆ zzzzzzzz root() 00000000 "###); // Color let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--color=always"]); insta::assert_snapshot!(stdout, @r#" [1m[38;5;2m@[0m [1m[38;5;13mk[38;5;8mkmpptxz[39m [38;5;3mtest.user@example.com[39m [38;5;14m2001-02-03 08:05:09[39m [38;5;13mmy-bookmark[39m [38;5;12mb[38;5;8mac9ff9e[39m[0m │ [1m[38;5;10m(empty)[39m description 1[0m ○ [1m[38;5;5mq[0m[38;5;8mpvuntsm[39m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 08:05:08[39m [1m[38;5;4ma[0m[38;5;8ma2015d7[39m │ add a file [1m[38;5;14m◆[0m [1m[38;5;5mz[0m[38;5;8mzzzzzzz[39m [38;5;2mroot()[39m [1m[38;5;4m0[0m[38;5;8m0000000[39m "#); // Color without graph let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--color=always", "--no-graph"]); insta::assert_snapshot!(stdout, @r#" [1m[38;5;13mk[38;5;8mkmpptxz[39m [38;5;3mtest.user@example.com[39m [38;5;14m2001-02-03 08:05:09[39m [38;5;13mmy-bookmark[39m [38;5;12mb[38;5;8mac9ff9e[39m[0m [1m[38;5;10m(empty)[39m description 1[0m [1m[38;5;5mq[0m[38;5;8mpvuntsm[39m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 08:05:08[39m [1m[38;5;4ma[0m[38;5;8ma2015d7[39m add a file [1m[38;5;5mz[0m[38;5;8mzzzzzzz[39m [38;5;2mroot()[39m [1m[38;5;4m0[0m[38;5;8m0000000[39m "#);} #[test]fn test_log_default_without_working_copy() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); test_env.jj_cmd_ok(&repo_path, &["workspace", "forget"]); let stdout = test_env.jj_cmd_success(&repo_path, &["log"]); insta::assert_snapshot!(stdout, @r#" ◆ zzzzzzzz root() 00000000 "#);} #[test]fn test_log_builtin_templates() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); // Render without graph and append "[EOF]" marker to test line ending let render = |template| { test_env.jj_cmd_success(&repo_path, &["log", "-T", template, "--no-graph"]) + "[EOF]\n" }; test_env.jj_cmd_ok( &repo_path, &[ "--config-toml=user.email=''", "--config-toml=user.name=''", "new", ], ); test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "my-bookmark"]); insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r###" rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397 (empty) (no description set) qpvuntsm test.user 2001-02-03 08:05:07 230dd059 (empty) (no description set) zzzzzzzz root() 00000000 [EOF] "###); insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r###" rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397 (empty) (no description set) qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059 (empty) (no description set) zzzzzzzz root() 00000000 [EOF] "###); insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r###" rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397 (empty) (no description set) qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059 (empty) (no description set) zzzzzzzz root() 00000000 [EOF] "###); insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r###" Commit ID: dc31539712c7294d1d712cec63cef4504b94ca74 Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp Bookmarks: my-bookmark Author: (no name set) <(no email set)> (2001-02-03 08:05:08) Committer: (no name set) <(no email set)> (2001-02-03 08:05:08) (no description set) Commit ID: 230dd059e1b059aefc0da06a2e5a7dbf22362f22 Change ID: qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu Author: Test User <test.user@example.com> (2001-02-03 08:05:07) Committer: Test User <test.user@example.com> (2001-02-03 08:05:07) (no description set) Commit ID: 0000000000000000000000000000000000000000 Change ID: zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz Author: (no name set) <(no email set)> (1970-01-01 11:00:00) Committer: (no name set) <(no email set)> (1970-01-01 11:00:00) (no description set) [EOF] "###);} #[test]fn test_log_builtin_templates_colored() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); let render = |template| test_env.jj_cmd_success(&repo_path, &["--color=always", "log", "-T", template]); test_env.jj_cmd_ok( &repo_path, &[ "--config-toml=user.email=''", "--config-toml=user.name=''", "new", ], ); test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "my-bookmark"]); insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r#" [1m[38;5;2m@[0m [1m[38;5;13mr[38;5;8mlvkpnrz[39m [38;5;9m(no email set)[39m [38;5;14m2001-02-03 08:05:08[39m [38;5;13mmy-bookmark[39m [38;5;12md[38;5;8mc315397[39m [38;5;10m(empty)[39m [38;5;10m(no description set)[39m[0m ○ [1m[38;5;5mq[0m[38;5;8mpvuntsm[39m [38;5;3mtest.user[39m [38;5;6m2001-02-03 08:05:07[39m [1m[38;5;4m2[0m[38;5;8m30dd059[39m [38;5;2m(empty)[39m [38;5;2m(no description set)[39m [1m[38;5;14m◆[0m [1m[38;5;5mz[0m[38;5;8mzzzzzzz[39m [38;5;2mroot()[39m [1m[38;5;4m0[0m[38;5;8m0000000[39m "#); insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r#" [1m[38;5;2m@[0m [1m[38;5;13mr[38;5;8mlvkpnrz[39m [38;5;9m(no email set)[39m [38;5;14m2001-02-03 08:05:08[39m [38;5;13mmy-bookmark[39m [38;5;12md[38;5;8mc315397[39m[0m │ [1m[38;5;10m(empty)[39m [38;5;10m(no description set)[39m[0m ○ [1m[38;5;5mq[0m[38;5;8mpvuntsm[39m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 08:05:07[39m [1m[38;5;4m2[0m[38;5;8m30dd059[39m │ [38;5;2m(empty)[39m [38;5;2m(no description set)[39m [1m[38;5;14m◆[0m [1m[38;5;5mz[0m[38;5;8mzzzzzzz[39m [38;5;2mroot()[39m [1m[38;5;4m0[0m[38;5;8m0000000[39m "#); insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r#" [1m[38;5;2m@[0m [1m[38;5;13mr[38;5;8mlvkpnrz[39m [38;5;9m(no email set)[39m [38;5;14m2001-02-03 08:05:08[39m [38;5;13mmy-bookmark[39m [38;5;12md[38;5;8mc315397[39m[0m │ [1m[38;5;10m(empty)[39m [38;5;10m(no description set)[39m[0m │ ○ [1m[38;5;5mq[0m[38;5;8mpvuntsm[39m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 08:05:07[39m [1m[38;5;4m2[0m[38;5;8m30dd059[39m │ [38;5;2m(empty)[39m [38;5;2m(no description set)[39m │ [1m[38;5;14m◆[0m [1m[38;5;5mz[0m[38;5;8mzzzzzzz[39m [38;5;2mroot()[39m [1m[38;5;4m0[0m[38;5;8m0000000[39m "#); insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r###" [1m[38;5;2m@[0m Commit ID: [38;5;4mdc31539712c7294d1d712cec63cef4504b94ca74[39m │ Change ID: [38;5;5mrlvkpnrzqnoowoytxnquwvuryrwnrmlp[39m │ Bookmarks: [38;5;5mmy-bookmark[39m │ Author: [38;5;1m(no name set)[39m <[38;5;1m(no email set)[39m> ([38;5;6m2001-02-03 08:05:08[39m) │ Committer: [38;5;1m(no name set)[39m <[38;5;1m(no email set)[39m> ([38;5;6m2001-02-03 08:05:08[39m) │ │ [38;5;2m (no description set)[39m │ ○ Commit ID: [38;5;4m230dd059e1b059aefc0da06a2e5a7dbf22362f22[39m │ Change ID: [38;5;5mqpvuntsmwlqtpsluzzsnyyzlmlwvmlnu[39m │ Author: [38;5;3mTest User[39m <[38;5;3mtest.user@example.com[39m> ([38;5;6m2001-02-03 08:05:07[39m) │ Committer: [38;5;3mTest User[39m <[38;5;3mtest.user@example.com[39m> ([38;5;6m2001-02-03 08:05:07[39m) │ │ [38;5;2m (no description set)[39m │ [1m[38;5;14m◆[0m Commit ID: [38;5;4m0000000000000000000000000000000000000000[39m Change ID: [38;5;5mzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz[39m Author: [38;5;1m(no name set)[39m <[38;5;1m(no email set)[39m> ([38;5;6m1970-01-01 11:00:00[39m) Committer: [38;5;1m(no name set)[39m <[38;5;1m(no email set)[39m> ([38;5;6m1970-01-01 11:00:00[39m) [38;5;2m (no description set)[39m "###);} #[test]fn test_log_builtin_templates_colored_debug() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); let render = |template| test_env.jj_cmd_success(&repo_path, &["--color=debug", "log", "-T", template]); test_env.jj_cmd_ok( &repo_path, &[ "--config-toml=user.email=''", "--config-toml=user.name=''", "new", ], ); test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "my-bookmark"]); insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r#" [1m[38;5;2m<<node working_copy::@>>[0m [1m[38;5;13m<<log working_copy change_id shortest prefix::r>>[38;5;8m<<log working_copy change_id shortest rest::lvkpnrz>>[39m<<log working_copy:: >>[38;5;9m<<log working_copy email placeholder::(no email set)>>[39m<<log working_copy:: >>[38;5;14m<<log working_copy committer timestamp local format::2001-02-03 08:05:08>>[39m<<log working_copy:: >>[38;5;13m<<log working_copy bookmarks name::my-bookmark>>[39m<<log working_copy:: >>[38;5;12m<<log working_copy commit_id shortest prefix::d>>[38;5;8m<<log working_copy commit_id shortest rest::c315397>>[39m<<log working_copy:: >>[38;5;10m<<log working_copy empty::(empty)>>[39m<<log working_copy:: >>[38;5;10m<<log working_copy empty description placeholder::(no description set)>>[39m<<log working_copy::>>[0m <<node::○>> [1m[38;5;5m<<log change_id shortest prefix::q>>[0m[38;5;8m<<log change_id shortest rest::pvuntsm>>[39m<<log:: >>[38;5;3m<<log author username::test.user>>[39m<<log:: >>[38;5;6m<<log committer timestamp local format::2001-02-03 08:05:07>>[39m<<log:: >>[1m[38;5;4m<<log commit_id shortest prefix::2>>[0m[38;5;8m<<log commit_id shortest rest::30dd059>>[39m<<log:: >>[38;5;2m<<log empty::(empty)>>[39m<<log:: >>[38;5;2m<<log empty description placeholder::(no description set)>>[39m<<log::>> [1m[38;5;14m<<node immutable::◆>>[0m [1m[38;5;5m<<log change_id shortest prefix::z>>[0m[38;5;8m<<log change_id shortest rest::zzzzzzz>>[39m<<log:: >>[38;5;2m<<log root::root()>>[39m<<log:: >>[1m[38;5;4m<<log commit_id shortest prefix::0>>[0m[38;5;8m<<log commit_id shortest rest::0000000>>[39m<<log::>> "#); insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r#" [1m[38;5;2m<<node working_copy::@>>[0m [1m[38;5;13m<<log working_copy change_id shortest prefix::r>>[38;5;8m<<log working_copy change_id shortest rest::lvkpnrz>>[39m<<log working_copy:: >>[38;5;9m<<log working_copy email placeholder::(no email set)>>[39m<<log working_copy:: >>[38;5;14m<<log working_copy committer timestamp local format::2001-02-03 08:05:08>>[39m<<log working_copy:: >>[38;5;13m<<log working_copy bookmarks name::my-bookmark>>[39m<<log working_copy:: >>[38;5;12m<<log working_copy commit_id shortest prefix::d>>[38;5;8m<<log working_copy commit_id shortest rest::c315397>>[39m<<log working_copy::>>[0m │ [1m[38;5;10m<<log working_copy empty::(empty)>>[39m<<log working_copy:: >>[38;5;10m<<log working_copy empty description placeholder::(no description set)>>[39m<<log working_copy::>>[0m <<node::○>> [1m[38;5;5m<<log change_id shortest prefix::q>>[0m[38;5;8m<<log change_id shortest rest::pvuntsm>>[39m<<log:: >>[38;5;3m<<log author email::test.user@example.com>>[39m<<log:: >>[38;5;6m<<log committer timestamp local format::2001-02-03 08:05:07>>[39m<<log:: >>[1m[38;5;4m<<log commit_id shortest prefix::2>>[0m[38;5;8m<<log commit_id shortest rest::30dd059>>[39m<<log::>> │ [38;5;2m<<log empty::(empty)>>[39m<<log:: >>[38;5;2m<<log empty description placeholder::(no description set)>>[39m<<log::>> [1m[38;5;14m<<node immutable::◆>>[0m [1m[38;5;5m<<log change_id shortest prefix::z>>[0m[38;5;8m<<log change_id shortest rest::zzzzzzz>>[39m<<log:: >>[38;5;2m<<log root::root()>>[39m<<log:: >>[1m[38;5;4m<<log commit_id shortest prefix::0>>[0m[38;5;8m<<log commit_id shortest rest::0000000>>[39m<<log::>> "#); insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r#" [1m[38;5;2m<<node working_copy::@>>[0m [1m[38;5;13m<<log working_copy change_id shortest prefix::r>>[38;5;8m<<log working_copy change_id shortest rest::lvkpnrz>>[39m<<log working_copy:: >>[38;5;9m<<log working_copy email placeholder::(no email set)>>[39m<<log working_copy:: >>[38;5;14m<<log working_copy committer timestamp local format::2001-02-03 08:05:08>>[39m<<log working_copy:: >>[38;5;13m<<log working_copy bookmarks name::my-bookmark>>[39m<<log working_copy:: >>[38;5;12m<<log working_copy commit_id shortest prefix::d>>[38;5;8m<<log working_copy commit_id shortest rest::c315397>>[39m<<log working_copy::>>[0m │ [1m[38;5;10m<<log working_copy empty::(empty)>>[39m<<log working_copy:: >>[38;5;10m<<log working_copy empty description placeholder::(no description set)>>[39m<<log working_copy::>>[0m │ <<log::>> <<node::○>> [1m[38;5;5m<<log change_id shortest prefix::q>>[0m[38;5;8m<<log change_id shortest rest::pvuntsm>>[39m<<log:: >>[38;5;3m<<log author email::test.user@example.com>>[39m<<log:: >>[38;5;6m<<log committer timestamp local format::2001-02-03 08:05:07>>[39m<<log:: >>[1m[38;5;4m<<log commit_id shortest prefix::2>>[0m[38;5;8m<<log commit_id shortest rest::30dd059>>[39m<<log::>> │ [38;5;2m<<log empty::(empty)>>[39m<<log:: >>[38;5;2m<<log empty description placeholder::(no description set)>>[39m<<log::>> │ <<log::>> [1m[38;5;14m<<node immutable::◆>>[0m [1m[38;5;5m<<log change_id shortest prefix::z>>[0m[38;5;8m<<log change_id shortest rest::zzzzzzz>>[39m<<log:: >>[38;5;2m<<log root::root()>>[39m<<log:: >>[1m[38;5;4m<<log commit_id shortest prefix::0>>[0m[38;5;8m<<log commit_id shortest rest::0000000>>[39m<<log::>> <<log::>> "#); insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r###" [1m[38;5;2m<<node working_copy::@>>[0m <<log::Commit ID: >>[38;5;4m<<log commit_id::dc31539712c7294d1d712cec63cef4504b94ca74>>[39m<<log::>> │ <<log::Change ID: >>[38;5;5m<<log change_id::rlvkpnrzqnoowoytxnquwvuryrwnrmlp>>[39m<<log::>> │ <<log::Bookmarks: >>[38;5;5m<<log local_bookmarks name::my-bookmark>>[39m<<log::>> │ <<log::Author: >>[38;5;1m<<log name placeholder::(no name set)>>[39m<<log:: <>>[38;5;1m<<log email placeholder::(no email set)>>[39m<<log::> (>>[38;5;6m<<log author timestamp local format::2001-02-03 08:05:08>>[39m<<log::)>> │ <<log::Committer: >>[38;5;1m<<log name placeholder::(no name set)>>[39m<<log:: <>>[38;5;1m<<log email placeholder::(no email set)>>[39m<<log::> (>>[38;5;6m<<log committer timestamp local format::2001-02-03 08:05:08>>[39m<<log::)>> │ <<log::>> │ [38;5;2m<<log empty description placeholder:: (no description set)>>[39m<<log::>> │ <<log::>> <<node::○>> <<log::Commit ID: >>[38;5;4m<<log commit_id::230dd059e1b059aefc0da06a2e5a7dbf22362f22>>[39m<<log::>> │ <<log::Change ID: >>[38;5;5m<<log change_id::qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu>>[39m<<log::>> │ <<log::Author: >>[38;5;3m<<log author name::Test User>>[39m<<log:: <>>[38;5;3m<<log author email::test.user@example.com>>[39m<<log::> (>>[38;5;6m<<log author timestamp local format::2001-02-03 08:05:07>>[39m<<log::)>> │ <<log::Committer: >>[38;5;3m<<log committer name::Test User>>[39m<<log:: <>>[38;5;3m<<log committer email::test.user@example.com>>[39m<<log::> (>>[38;5;6m<<log committer timestamp local format::2001-02-03 08:05:07>>[39m<<log::)>> │ <<log::>> │ [38;5;2m<<log empty description placeholder:: (no description set)>>[39m<<log::>> │ <<log::>> [1m[38;5;14m<<node immutable::◆>>[0m <<log::Commit ID: >>[38;5;4m<<log commit_id::0000000000000000000000000000000000000000>>[39m<<log::>> <<log::Change ID: >>[38;5;5m<<log change_id::zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz>>[39m<<log::>> <<log::Author: >>[38;5;1m<<log name placeholder::(no name set)>>[39m<<log:: <>>[38;5;1m<<log email placeholder::(no email set)>>[39m<<log::> (>>[38;5;6m<<log author timestamp local format::1970-01-01 11:00:00>>[39m<<log::)>> <<log::Committer: >>[38;5;1m<<log name placeholder::(no name set)>>[39m<<log:: <>>[38;5;1m<<log email placeholder::(no email set)>>[39m<<log::> (>>[38;5;6m<<log committer timestamp local format::1970-01-01 11:00:00>>[39m<<log::)>> <<log::>> [38;5;2m<<log empty description placeholder:: (no description set)>>[39m<<log::>> <<log::>> "###);} #[test]fn test_log_evolog_divergence() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); std::fs::write(repo_path.join("file"), "foo\n").unwrap(); test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "description 1"]); let stdout = test_env.jj_cmd_success(&repo_path, &["log"]); // No divergence insta::assert_snapshot!(stdout, @r###" @ qpvuntsm test.user@example.com 2001-02-03 08:05:08 ff309c29 │ description 1 ◆ zzzzzzzz root() 00000000 "###); // Create divergenceLines 1–500 of 1228. Load more
// Copyright 2023 The Jujutsu Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. use regex::Regex; use crate::common::TestEnvironment; #[test] fn test_log_parents() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); test_env.jj_cmd_ok(&repo_path, &["new"]); test_env.jj_cmd_ok(&repo_path, &["new", "@-"]); test_env.jj_cmd_ok(&repo_path, &["new", "@", "@-"]); let template = r#"commit_id ++ "\nP: " ++ parents.len() ++ " " ++ parents.map(|c| c.commit_id()) ++ "\n""#; let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", template]); insta::assert_snapshot!(stdout, @r###" @ c067170d4ca1bc6162b64f7550617ec809647f84 ├─╮ P: 2 4db490c88528133d579540b6900b8098f0c17701 230dd059e1b059aefc0da06a2e5a7dbf22362f22 ○ │ 4db490c88528133d579540b6900b8098f0c17701 ├─╯ P: 1 230dd059e1b059aefc0da06a2e5a7dbf22362f22 ○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 │ P: 1 0000000000000000000000000000000000000000 ◆ 0000000000000000000000000000000000000000 P: 0 "###); let template = r#"parents.map(|c| c.commit_id().shortest(4))"#; let stdout = test_env.jj_cmd_success( &repo_path, &["log", "-T", template, "-r@", "--color=always"], ); insta::assert_snapshot!(stdout, @r###" [1m[38;5;2m@[0m [1m[38;5;4m4[0m[38;5;8mdb4[39m [1m[38;5;4m2[0m[38;5;8m30d[39m │ ~ "###); // Commit object isn't printable let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-T", "parents"]); insta::assert_snapshot!(stderr, @r###" Error: Failed to parse template: Expected expression of type "Template", but actual type is "List<Commit>" Caused by: --> 1:1 | 1 | parents | ^-----^ | = Expected expression of type "Template", but actual type is "List<Commit>" "###); // Redundant argument passed to keyword method let template = r#"parents.map(|c| c.commit_id(""))"#; let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-T", template]); insta::assert_snapshot!(stderr, @r###" Error: Failed to parse template: Function "commit_id": Expected 0 arguments Caused by: --> 1:29 | 1 | parents.map(|c| c.commit_id("")) | ^^ | = Function "commit_id": Expected 0 arguments "###); } #[test] fn test_log_author_timestamp() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "first"]); test_env.jj_cmd_ok(&repo_path, &["new", "-m", "second"]); let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "author.timestamp()"]); insta::assert_snapshot!(stdout, @r###" @ 2001-02-03 04:05:09.000 +07:00 ○ 2001-02-03 04:05:08.000 +07:00 ◆ 1970-01-01 00:00:00.000 +00:00 "###); } #[test] fn test_log_author_timestamp_ago() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "first"]); test_env.jj_cmd_ok(&repo_path, &["new", "-m", "second"]); let template = r#"author.timestamp().ago() ++ "\n""#; let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--no-graph", "-T", template]); let line_re = Regex::new(r"[0-9]+ years ago").unwrap(); assert!( stdout.lines().all(|x| line_re.is_match(x)), "expected every line to match regex" ); } #[test] fn test_log_author_timestamp_utc() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "author.timestamp().utc()"]); insta::assert_snapshot!(stdout, @r###" @ 2001-02-02 21:05:07.000 +00:00 ◆ 1970-01-01 00:00:00.000 +00:00 "###); } #[cfg(unix)] #[test] fn test_log_author_timestamp_local() { let mut test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); test_env.add_env_var("TZ", "UTC-05:30"); let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "author.timestamp().local()"]); insta::assert_snapshot!(stdout, @r###" @ 2001-02-03 08:05:07.000 +11:00 ◆ 1970-01-01 11:00:00.000 +11:00 "###); test_env.add_env_var("TZ", "UTC+10:00"); let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "author.timestamp().local()"]); insta::assert_snapshot!(stdout, @r###" @ 2001-02-03 08:05:07.000 +11:00 ◆ 1970-01-01 11:00:00.000 +11:00 "###); } #[test] fn test_log_author_timestamp_after_before() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "first"]); let template = r#" separate(" ", author.timestamp(), ":", if(author.timestamp().after("1969"), "(after 1969)", "(before 1969)"), if(author.timestamp().before("1975"), "(before 1975)", "(after 1975)"), if(author.timestamp().before("now"), "(before now)", "(after now)") ) ++ "\n""#; let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--no-graph", "-T", template]); insta::assert_snapshot!(stdout, @r#" 2001-02-03 04:05:08.000 +07:00 : (after 1969) (after 1975) (before now) 1970-01-01 00:00:00.000 +00:00 : (after 1969) (before 1975) (before now) "#); // Should display error with invalid date. let template = r#"author.timestamp().after("invalid date")"#; let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r@", "--no-graph", "-T", template]); insta::assert_snapshot!(stderr, @r#" Error: Failed to parse template: Invalid date pattern Caused by: 1: --> 1:26 | 1 | author.timestamp().after("invalid date") | ^------------^ | = Invalid date pattern 2: expected week day or month name "#); } #[test] fn test_mine_is_true_when_author_is_user() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); test_env.jj_cmd_ok( &repo_path, &[ "--config-toml=user.email='johndoe@example.com'", "--config-toml=user.name='John Doe'", "new", ], ); let stdout = test_env.jj_cmd_success( &repo_path, &[ "log", "-T", r#"coalesce(if(mine, "mine"), author.email(), email_placeholder)"#, ], ); insta::assert_snapshot!(stdout, @r###" @ johndoe@example.com ○ mine ◆ (no email set) "###); } #[test] fn test_log_default() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); std::fs::write(repo_path.join("file1"), "foo\n").unwrap(); test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "add a file"]); test_env.jj_cmd_ok(&repo_path, &["new", "-m", "description 1"]); test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "my-bookmark"]); // Test default log output format let stdout = test_env.jj_cmd_success(&repo_path, &["log"]); insta::assert_snapshot!(stdout, @r###" @ kkmpptxz test.user@example.com 2001-02-03 08:05:09 my-bookmark bac9ff9e │ (empty) description 1 ○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 aa2015d7 │ add a file ◆ zzzzzzzz root() 00000000 "###); // Color let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--color=always"]); insta::assert_snapshot!(stdout, @r#" [1m[38;5;2m@[0m [1m[38;5;13mk[38;5;8mkmpptxz[39m [38;5;3mtest.user@example.com[39m [38;5;14m2001-02-03 08:05:09[39m [38;5;13mmy-bookmark[39m [38;5;12mb[38;5;8mac9ff9e[39m[0m │ [1m[38;5;10m(empty)[39m description 1[0m ○ [1m[38;5;5mq[0m[38;5;8mpvuntsm[39m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 08:05:08[39m [1m[38;5;4ma[0m[38;5;8ma2015d7[39m │ add a file [1m[38;5;14m◆[0m [1m[38;5;5mz[0m[38;5;8mzzzzzzz[39m [38;5;2mroot()[39m [1m[38;5;4m0[0m[38;5;8m0000000[39m "#); // Color without graph let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--color=always", "--no-graph"]); insta::assert_snapshot!(stdout, @r#" [1m[38;5;13mk[38;5;8mkmpptxz[39m [38;5;3mtest.user@example.com[39m [38;5;14m2001-02-03 08:05:09[39m [38;5;13mmy-bookmark[39m [38;5;12mb[38;5;8mac9ff9e[39m[0m [1m[38;5;10m(empty)[39m description 1[0m [1m[38;5;5mq[0m[38;5;8mpvuntsm[39m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 08:05:08[39m [1m[38;5;4ma[0m[38;5;8ma2015d7[39m add a file [1m[38;5;5mz[0m[38;5;8mzzzzzzz[39m [38;5;2mroot()[39m [1m[38;5;4m0[0m[38;5;8m0000000[39m "#); } #[test] fn test_log_default_without_working_copy() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); test_env.jj_cmd_ok(&repo_path, &["workspace", "forget"]); let stdout = test_env.jj_cmd_success(&repo_path, &["log"]); insta::assert_snapshot!(stdout, @r#" ◆ zzzzzzzz root() 00000000 "#); } #[test] fn test_log_builtin_templates() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); // Render without graph and append "[EOF]" marker to test line ending let render = |template| { test_env.jj_cmd_success(&repo_path, &["log", "-T", template, "--no-graph"]) + "[EOF]\n" }; test_env.jj_cmd_ok( &repo_path, &[ "--config-toml=user.email=''", "--config-toml=user.name=''", "new", ], ); test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "my-bookmark"]); insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r###" rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397 (empty) (no description set) qpvuntsm test.user 2001-02-03 08:05:07 230dd059 (empty) (no description set) zzzzzzzz root() 00000000 [EOF] "###); insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r###" rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397 (empty) (no description set) qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059 (empty) (no description set) zzzzzzzz root() 00000000 [EOF] "###); insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r###" rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397 (empty) (no description set) qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059 (empty) (no description set) zzzzzzzz root() 00000000 [EOF] "###); insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r###" Commit ID: dc31539712c7294d1d712cec63cef4504b94ca74 Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp Bookmarks: my-bookmark Author: (no name set) <(no email set)> (2001-02-03 08:05:08) Committer: (no name set) <(no email set)> (2001-02-03 08:05:08) (no description set) Commit ID: 230dd059e1b059aefc0da06a2e5a7dbf22362f22 Change ID: qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu Author: Test User <test.user@example.com> (2001-02-03 08:05:07) Committer: Test User <test.user@example.com> (2001-02-03 08:05:07) (no description set) Commit ID: 0000000000000000000000000000000000000000 Change ID: zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz Author: (no name set) <(no email set)> (1970-01-01 11:00:00) Committer: (no name set) <(no email set)> (1970-01-01 11:00:00) (no description set) [EOF] "###); } #[test] fn test_log_builtin_templates_colored() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); let render = |template| test_env.jj_cmd_success(&repo_path, &["--color=always", "log", "-T", template]); test_env.jj_cmd_ok( &repo_path, &[ "--config-toml=user.email=''", "--config-toml=user.name=''", "new", ], ); test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "my-bookmark"]); insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r#" [1m[38;5;2m@[0m [1m[38;5;13mr[38;5;8mlvkpnrz[39m [38;5;9m(no email set)[39m [38;5;14m2001-02-03 08:05:08[39m [38;5;13mmy-bookmark[39m [38;5;12md[38;5;8mc315397[39m [38;5;10m(empty)[39m [38;5;10m(no description set)[39m[0m ○ [1m[38;5;5mq[0m[38;5;8mpvuntsm[39m [38;5;3mtest.user[39m [38;5;6m2001-02-03 08:05:07[39m [1m[38;5;4m2[0m[38;5;8m30dd059[39m [38;5;2m(empty)[39m [38;5;2m(no description set)[39m [1m[38;5;14m◆[0m [1m[38;5;5mz[0m[38;5;8mzzzzzzz[39m [38;5;2mroot()[39m [1m[38;5;4m0[0m[38;5;8m0000000[39m "#); insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r#" [1m[38;5;2m@[0m [1m[38;5;13mr[38;5;8mlvkpnrz[39m [38;5;9m(no email set)[39m [38;5;14m2001-02-03 08:05:08[39m [38;5;13mmy-bookmark[39m [38;5;12md[38;5;8mc315397[39m[0m │ [1m[38;5;10m(empty)[39m [38;5;10m(no description set)[39m[0m ○ [1m[38;5;5mq[0m[38;5;8mpvuntsm[39m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 08:05:07[39m [1m[38;5;4m2[0m[38;5;8m30dd059[39m │ [38;5;2m(empty)[39m [38;5;2m(no description set)[39m [1m[38;5;14m◆[0m [1m[38;5;5mz[0m[38;5;8mzzzzzzz[39m [38;5;2mroot()[39m [1m[38;5;4m0[0m[38;5;8m0000000[39m "#); insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r#" [1m[38;5;2m@[0m [1m[38;5;13mr[38;5;8mlvkpnrz[39m [38;5;9m(no email set)[39m [38;5;14m2001-02-03 08:05:08[39m [38;5;13mmy-bookmark[39m [38;5;12md[38;5;8mc315397[39m[0m │ [1m[38;5;10m(empty)[39m [38;5;10m(no description set)[39m[0m │ ○ [1m[38;5;5mq[0m[38;5;8mpvuntsm[39m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 08:05:07[39m [1m[38;5;4m2[0m[38;5;8m30dd059[39m │ [38;5;2m(empty)[39m [38;5;2m(no description set)[39m │ [1m[38;5;14m◆[0m [1m[38;5;5mz[0m[38;5;8mzzzzzzz[39m [38;5;2mroot()[39m [1m[38;5;4m0[0m[38;5;8m0000000[39m "#); insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r###" [1m[38;5;2m@[0m Commit ID: [38;5;4mdc31539712c7294d1d712cec63cef4504b94ca74[39m │ Change ID: [38;5;5mrlvkpnrzqnoowoytxnquwvuryrwnrmlp[39m │ Bookmarks: [38;5;5mmy-bookmark[39m │ Author: [38;5;1m(no name set)[39m <[38;5;1m(no email set)[39m> ([38;5;6m2001-02-03 08:05:08[39m) │ Committer: [38;5;1m(no name set)[39m <[38;5;1m(no email set)[39m> ([38;5;6m2001-02-03 08:05:08[39m) │ │ [38;5;2m (no description set)[39m │ ○ Commit ID: [38;5;4m230dd059e1b059aefc0da06a2e5a7dbf22362f22[39m │ Change ID: [38;5;5mqpvuntsmwlqtpsluzzsnyyzlmlwvmlnu[39m │ Author: [38;5;3mTest User[39m <[38;5;3mtest.user@example.com[39m> ([38;5;6m2001-02-03 08:05:07[39m) │ Committer: [38;5;3mTest User[39m <[38;5;3mtest.user@example.com[39m> ([38;5;6m2001-02-03 08:05:07[39m) │ │ [38;5;2m (no description set)[39m │ [1m[38;5;14m◆[0m Commit ID: [38;5;4m0000000000000000000000000000000000000000[39m Change ID: [38;5;5mzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz[39m Author: [38;5;1m(no name set)[39m <[38;5;1m(no email set)[39m> ([38;5;6m1970-01-01 11:00:00[39m) Committer: [38;5;1m(no name set)[39m <[38;5;1m(no email set)[39m> ([38;5;6m1970-01-01 11:00:00[39m) [38;5;2m (no description set)[39m "###); } #[test] fn test_log_builtin_templates_colored_debug() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); let render = |template| test_env.jj_cmd_success(&repo_path, &["--color=debug", "log", "-T", template]); test_env.jj_cmd_ok( &repo_path, &[ "--config-toml=user.email=''", "--config-toml=user.name=''", "new", ], ); test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "my-bookmark"]); insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r#" [1m[38;5;2m<<node working_copy::@>>[0m [1m[38;5;13m<<log working_copy change_id shortest prefix::r>>[38;5;8m<<log working_copy change_id shortest rest::lvkpnrz>>[39m<<log working_copy:: >>[38;5;9m<<log working_copy email placeholder::(no email set)>>[39m<<log working_copy:: >>[38;5;14m<<log working_copy committer timestamp local format::2001-02-03 08:05:08>>[39m<<log working_copy:: >>[38;5;13m<<log working_copy bookmarks name::my-bookmark>>[39m<<log working_copy:: >>[38;5;12m<<log working_copy commit_id shortest prefix::d>>[38;5;8m<<log working_copy commit_id shortest rest::c315397>>[39m<<log working_copy:: >>[38;5;10m<<log working_copy empty::(empty)>>[39m<<log working_copy:: >>[38;5;10m<<log working_copy empty description placeholder::(no description set)>>[39m<<log working_copy::>>[0m <<node::○>> [1m[38;5;5m<<log change_id shortest prefix::q>>[0m[38;5;8m<<log change_id shortest rest::pvuntsm>>[39m<<log:: >>[38;5;3m<<log author username::test.user>>[39m<<log:: >>[38;5;6m<<log committer timestamp local format::2001-02-03 08:05:07>>[39m<<log:: >>[1m[38;5;4m<<log commit_id shortest prefix::2>>[0m[38;5;8m<<log commit_id shortest rest::30dd059>>[39m<<log:: >>[38;5;2m<<log empty::(empty)>>[39m<<log:: >>[38;5;2m<<log empty description placeholder::(no description set)>>[39m<<log::>> [1m[38;5;14m<<node immutable::◆>>[0m [1m[38;5;5m<<log change_id shortest prefix::z>>[0m[38;5;8m<<log change_id shortest rest::zzzzzzz>>[39m<<log:: >>[38;5;2m<<log root::root()>>[39m<<log:: >>[1m[38;5;4m<<log commit_id shortest prefix::0>>[0m[38;5;8m<<log commit_id shortest rest::0000000>>[39m<<log::>> "#); insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r#" [1m[38;5;2m<<node working_copy::@>>[0m [1m[38;5;13m<<log working_copy change_id shortest prefix::r>>[38;5;8m<<log working_copy change_id shortest rest::lvkpnrz>>[39m<<log working_copy:: >>[38;5;9m<<log working_copy email placeholder::(no email set)>>[39m<<log working_copy:: >>[38;5;14m<<log working_copy committer timestamp local format::2001-02-03 08:05:08>>[39m<<log working_copy:: >>[38;5;13m<<log working_copy bookmarks name::my-bookmark>>[39m<<log working_copy:: >>[38;5;12m<<log working_copy commit_id shortest prefix::d>>[38;5;8m<<log working_copy commit_id shortest rest::c315397>>[39m<<log working_copy::>>[0m │ [1m[38;5;10m<<log working_copy empty::(empty)>>[39m<<log working_copy:: >>[38;5;10m<<log working_copy empty description placeholder::(no description set)>>[39m<<log working_copy::>>[0m <<node::○>> [1m[38;5;5m<<log change_id shortest prefix::q>>[0m[38;5;8m<<log change_id shortest rest::pvuntsm>>[39m<<log:: >>[38;5;3m<<log author email::test.user@example.com>>[39m<<log:: >>[38;5;6m<<log committer timestamp local format::2001-02-03 08:05:07>>[39m<<log:: >>[1m[38;5;4m<<log commit_id shortest prefix::2>>[0m[38;5;8m<<log commit_id shortest rest::30dd059>>[39m<<log::>> │ [38;5;2m<<log empty::(empty)>>[39m<<log:: >>[38;5;2m<<log empty description placeholder::(no description set)>>[39m<<log::>> [1m[38;5;14m<<node immutable::◆>>[0m [1m[38;5;5m<<log change_id shortest prefix::z>>[0m[38;5;8m<<log change_id shortest rest::zzzzzzz>>[39m<<log:: >>[38;5;2m<<log root::root()>>[39m<<log:: >>[1m[38;5;4m<<log commit_id shortest prefix::0>>[0m[38;5;8m<<log commit_id shortest rest::0000000>>[39m<<log::>> "#); insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r#" [1m[38;5;2m<<node working_copy::@>>[0m [1m[38;5;13m<<log working_copy change_id shortest prefix::r>>[38;5;8m<<log working_copy change_id shortest rest::lvkpnrz>>[39m<<log working_copy:: >>[38;5;9m<<log working_copy email placeholder::(no email set)>>[39m<<log working_copy:: >>[38;5;14m<<log working_copy committer timestamp local format::2001-02-03 08:05:08>>[39m<<log working_copy:: >>[38;5;13m<<log working_copy bookmarks name::my-bookmark>>[39m<<log working_copy:: >>[38;5;12m<<log working_copy commit_id shortest prefix::d>>[38;5;8m<<log working_copy commit_id shortest rest::c315397>>[39m<<log working_copy::>>[0m │ [1m[38;5;10m<<log working_copy empty::(empty)>>[39m<<log working_copy:: >>[38;5;10m<<log working_copy empty description placeholder::(no description set)>>[39m<<log working_copy::>>[0m │ <<log::>> <<node::○>> [1m[38;5;5m<<log change_id shortest prefix::q>>[0m[38;5;8m<<log change_id shortest rest::pvuntsm>>[39m<<log:: >>[38;5;3m<<log author email::test.user@example.com>>[39m<<log:: >>[38;5;6m<<log committer timestamp local format::2001-02-03 08:05:07>>[39m<<log:: >>[1m[38;5;4m<<log commit_id shortest prefix::2>>[0m[38;5;8m<<log commit_id shortest rest::30dd059>>[39m<<log::>> │ [38;5;2m<<log empty::(empty)>>[39m<<log:: >>[38;5;2m<<log empty description placeholder::(no description set)>>[39m<<log::>> │ <<log::>> [1m[38;5;14m<<node immutable::◆>>[0m [1m[38;5;5m<<log change_id shortest prefix::z>>[0m[38;5;8m<<log change_id shortest rest::zzzzzzz>>[39m<<log:: >>[38;5;2m<<log root::root()>>[39m<<log:: >>[1m[38;5;4m<<log commit_id shortest prefix::0>>[0m[38;5;8m<<log commit_id shortest rest::0000000>>[39m<<log::>> <<log::>> "#); insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r###" [1m[38;5;2m<<node working_copy::@>>[0m <<log::Commit ID: >>[38;5;4m<<log commit_id::dc31539712c7294d1d712cec63cef4504b94ca74>>[39m<<log::>> │ <<log::Change ID: >>[38;5;5m<<log change_id::rlvkpnrzqnoowoytxnquwvuryrwnrmlp>>[39m<<log::>> │ <<log::Bookmarks: >>[38;5;5m<<log local_bookmarks name::my-bookmark>>[39m<<log::>> │ <<log::Author: >>[38;5;1m<<log name placeholder::(no name set)>>[39m<<log:: <>>[38;5;1m<<log email placeholder::(no email set)>>[39m<<log::> (>>[38;5;6m<<log author timestamp local format::2001-02-03 08:05:08>>[39m<<log::)>> │ <<log::Committer: >>[38;5;1m<<log name placeholder::(no name set)>>[39m<<log:: <>>[38;5;1m<<log email placeholder::(no email set)>>[39m<<log::> (>>[38;5;6m<<log committer timestamp local format::2001-02-03 08:05:08>>[39m<<log::)>> │ <<log::>> │ [38;5;2m<<log empty description placeholder:: (no description set)>>[39m<<log::>> │ <<log::>> <<node::○>> <<log::Commit ID: >>[38;5;4m<<log commit_id::230dd059e1b059aefc0da06a2e5a7dbf22362f22>>[39m<<log::>> │ <<log::Change ID: >>[38;5;5m<<log change_id::qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu>>[39m<<log::>> │ <<log::Author: >>[38;5;3m<<log author name::Test User>>[39m<<log:: <>>[38;5;3m<<log author email::test.user@example.com>>[39m<<log::> (>>[38;5;6m<<log author timestamp local format::2001-02-03 08:05:07>>[39m<<log::)>> │ <<log::Committer: >>[38;5;3m<<log committer name::Test User>>[39m<<log:: <>>[38;5;3m<<log committer email::test.user@example.com>>[39m<<log::> (>>[38;5;6m<<log committer timestamp local format::2001-02-03 08:05:07>>[39m<<log::)>> │ <<log::>> │ [38;5;2m<<log empty description placeholder:: (no description set)>>[39m<<log::>> │ <<log::>> [1m[38;5;14m<<node immutable::◆>>[0m <<log::Commit ID: >>[38;5;4m<<log commit_id::0000000000000000000000000000000000000000>>[39m<<log::>> <<log::Change ID: >>[38;5;5m<<log change_id::zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz>>[39m<<log::>> <<log::Author: >>[38;5;1m<<log name placeholder::(no name set)>>[39m<<log:: <>>[38;5;1m<<log email placeholder::(no email set)>>[39m<<log::> (>>[38;5;6m<<log author timestamp local format::1970-01-01 11:00:00>>[39m<<log::)>> <<log::Committer: >>[38;5;1m<<log name placeholder::(no name set)>>[39m<<log:: <>>[38;5;1m<<log email placeholder::(no email set)>>[39m<<log::> (>>[38;5;6m<<log committer timestamp local format::1970-01-01 11:00:00>>[39m<<log::)>> <<log::>> [38;5;2m<<log empty description placeholder:: (no description set)>>[39m<<log::>> <<log::>> "###); } #[test] fn test_log_evolog_divergence() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]); let repo_path = test_env.env_root().join("repo"); std::fs::write(repo_path.join("file"), "foo\n").unwrap(); test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "description 1"]); let stdout = test_env.jj_cmd_success(&repo_path, &["log"]); // No divergence insta::assert_snapshot!(stdout, @r###" @ qpvuntsm test.user@example.com 2001-02-03 08:05:08 ff309c29 │ description 1 ◆ zzzzzzzz root() 00000000 "###); // Create divergence