// Copyright 2022 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 crate::common::get_stdout_string; use crate::common::TestEnvironment; #[test] fn test_evolog_with_or_without_diff() { 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, &["new", "-m", "my description"]); std::fs::write(repo_path.join("file1"), "foo\nbar\n").unwrap(); std::fs::write(repo_path.join("file2"), "foo\n").unwrap(); test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "@", "-d", "root()"]); std::fs::write(repo_path.join("file1"), "resolved\n").unwrap(); let stdout = test_env.jj_cmd_success(&repo_path, &["evolog"]); insta::assert_snapshot!(stdout, @r###" @ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 66b42ad3 │ my description × rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 cf73917d conflict │ my description ○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 068224a7 │ my description ○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 2b023b5f (empty) my description "###); // Color let stdout = test_env.jj_cmd_success(&repo_path, &["--color=always", "evolog"]); insta::assert_snapshot!(stdout, @r###" @ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 66b42ad3 │ my description × rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 cf73917d conflict │ my description ○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 068224a7 │ my description ○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 2b023b5f (empty) my description "###); // There should be no diff caused by the rebase because it was a pure rebase // (even even though it resulted in a conflict). let stdout = test_env.jj_cmd_success(&repo_path, &["evolog", "-p"]); insta::assert_snapshot!(stdout, @r###" @ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 66b42ad3 │ my description │ Resolved conflict in file1: │ 1 : <<<<<<< Conflict 1 of 1 │ 2 : %%%%%%% Changes from base to side #1 │ 3 : -foo │ 4 : +++++++ Contents of side #2 │ 5 : foo │ 6 : bar │ 7 1: >>>>>>> Conflict 1 of 1 endsresolved × rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 cf73917d conflict │ my description ○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 068224a7 │ my description │ Modified regular file file1: │ 1 1: foo │ 2: bar │ Added regular file file2: │ 1: foo ○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 2b023b5f (empty) my description "###); // Test `--limit` let stdout = test_env.jj_cmd_success(&repo_path, &["evolog", "--limit=2"]); insta::assert_snapshot!(stdout, @r###" @ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 66b42ad3 │ my description × rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 cf73917d conflict │ my description "###); // Test `--no-graph` let stdout = test_env.jj_cmd_success(&repo_path, &["evolog", "--no-graph"]); insta::assert_snapshot!(stdout, @r###" rlvkpnrz test.user@example.com 2001-02-03 08:05:10 66b42ad3 my description rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 cf73917d conflict my description rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 068224a7 my description rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 2b023b5f (empty) my description "###); // Test `--git` format, and that it implies `-p` let stdout = test_env.jj_cmd_success(&repo_path, &["evolog", "--no-graph", "--git"]); insta::assert_snapshot!(stdout, @r###" rlvkpnrz test.user@example.com 2001-02-03 08:05:10 66b42ad3 my description diff --git a/file1 b/file1 index 0000000000..2ab19ae607 100644 --- a/file1 +++ b/file1 @@ -1,7 +1,1 @@ -<<<<<<< Conflict 1 of 1 -%%%%%%% Changes from base to side #1 --foo -+++++++ Contents of side #2 -foo -bar ->>>>>>> Conflict 1 of 1 ends +resolved rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 cf73917d conflict my description rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 068224a7 my description diff --git a/file1 b/file1 index 257cc5642c..3bd1f0e297 100644 --- a/file1 +++ b/file1 @@ -1,1 +1,2 @@ foo +bar diff --git a/file2 b/file2 new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/file2 @@ -1,0 +1,1 @@ +foo rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 2b023b5f (empty) my description "###); } #[test] fn test_evolog_with_custom_symbols() { 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, &["new", "-m", "my description"]); std::fs::write(repo_path.join("file1"), "foo\nbar\n").unwrap(); std::fs::write(repo_path.join("file2"), "foo\n").unwrap(); test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "@", "-d", "root()"]); std::fs::write(repo_path.join("file1"), "resolved\n").unwrap(); let toml = concat!("templates.log_node = 'if(current_working_copy, \"$\", \"┝\")'\n",); let stdout = test_env.jj_cmd_success(&repo_path, &["evolog", "--config-toml", toml]); insta::assert_snapshot!(stdout, @r###" $ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 66b42ad3 │ my description ┝ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 cf73917d conflict │ my description ┝ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 068224a7 │ my description ┝ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 2b023b5f (empty) my description "###); } #[test] fn test_evolog_word_wrap() { 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 = |args: &[&str], columns: u32, word_wrap: bool| { let mut args = args.to_vec(); if word_wrap { args.push("--config-toml=ui.log-word-wrap=true"); } let assert = test_env .jj_cmd(&repo_path, &args) .env("COLUMNS", columns.to_string()) .assert() .success() .stderr(""); get_stdout_string(&assert) }; test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "first"]); // ui.log-word-wrap option applies to both graph/no-graph outputs insta::assert_snapshot!(render(&["evolog"], 40, false), @r###" @ qpvuntsm test.user@example.com 2001-02-03 08:05:08 fa15625b │ (empty) first ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059 (empty) (no description set) "###); insta::assert_snapshot!(render(&["evolog"], 40, true), @r###" @ qpvuntsm test.user@example.com │ 2001-02-03 08:05:08 fa15625b │ (empty) first ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059 (empty) (no description set) "###); insta::assert_snapshot!(render(&["evolog", "--no-graph"], 40, false), @r###" qpvuntsm test.user@example.com 2001-02-03 08:05:08 fa15625b (empty) first qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059 (empty) (no description set) "###); insta::assert_snapshot!(render(&["evolog", "--no-graph"], 40, true), @r###" qpvuntsm test.user@example.com 2001-02-03 08:05:08 fa15625b (empty) first qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059 (empty) (no description set) "###); } #[test] fn test_evolog_squash() { 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"]); std::fs::write(repo_path.join("file1"), "foo\n").unwrap(); test_env.jj_cmd_ok(&repo_path, &["new", "-m", "second"]); std::fs::write(repo_path.join("file1"), "foo\nbar\n").unwrap(); // not partial test_env.jj_cmd_ok(&repo_path, &["squash", "-m", "squashed 1"]); test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "third"]); std::fs::write(repo_path.join("file1"), "foo\nbar\nbaz\n").unwrap(); std::fs::write(repo_path.join("file2"), "foo2\n").unwrap(); std::fs::write(repo_path.join("file3"), "foo3\n").unwrap(); // partial test_env.jj_cmd_ok(&repo_path, &["squash", "-m", "squashed 2", "file1"]); test_env.jj_cmd_ok(&repo_path, &["new", "-m", "fourth"]); std::fs::write(repo_path.join("file4"), "foo4\n").unwrap(); test_env.jj_cmd_ok(&repo_path, &["new", "-m", "fifth"]); std::fs::write(repo_path.join("file5"), "foo5\n").unwrap(); // multiple sources test_env.jj_cmd_ok( &repo_path, &[ "squash", "-msquashed 3", "--from=description('fourth')|description('fifth')", "--into=description('squash')", ], ); let stdout = test_env.jj_cmd_success(&repo_path, &["evolog", "-p", "-r", "description('squash')"]); insta::assert_snapshot!(stdout, @r###" ○ qpvuntsm test.user@example.com 2001-02-03 08:05:15 d49749bf ├─┬─╮ squashed 3 │ │ ○ vruxwmqv hidden test.user@example.com 2001-02-03 08:05:15 8f2ae2b5 │ │ │ fifth │ │ │ Added regular file file5: │ │ │ 1: foo5 │ │ ○ vruxwmqv hidden test.user@example.com 2001-02-03 08:05:14 04d28ca9 │ │ (empty) fifth │ ○ yqosqzyt hidden test.user@example.com 2001-02-03 08:05:14 c5801e10 │ │ fourth │ │ Added regular file file4: │ │ 1: foo4 │ ○ yqosqzyt hidden test.user@example.com 2001-02-03 08:05:13 bb54a199 │ (empty) fourth ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:12 1408a0a7 ├─╮ squashed 2 │ │ Removed regular file file2: │ │ 1 : foo2 │ │ Removed regular file file3: │ │ 1 : foo3 │ ○ zsuskuln hidden test.user@example.com 2001-02-03 08:05:12 c9460789 │ │ third │ │ Modified regular file file1: │ │ 1 1: foo │ │ 2 2: bar │ │ 3: baz │ │ Added regular file file2: │ │ 1: foo2 │ │ Added regular file file3: │ │ 1: foo3 │ ○ zsuskuln hidden test.user@example.com 2001-02-03 08:05:11 66645763 │ │ (empty) third │ ○ zsuskuln hidden test.user@example.com 2001-02-03 08:05:10 1c7afcb4 │ (empty) (no description set) ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:10 e3c2a446 ├─╮ squashed 1 │ ○ kkmpptxz hidden test.user@example.com 2001-02-03 08:05:10 46acd22a │ │ second │ │ Modified regular file file1: │ │ 1 1: foo │ │ 2: bar │ ○ kkmpptxz hidden test.user@example.com 2001-02-03 08:05:09 cba41deb │ (empty) second ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 766420db │ first │ Added regular file file1: │ 1: foo ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 fa15625b │ (empty) first ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059 (empty) (no description set) "###); } #[test] fn test_evolog_with_no_template() { 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 stderr = test_env.jj_cmd_cli_error(&repo_path, &["evolog", "-T"]); insta::assert_snapshot!(stderr, @r###" error: a value is required for '--template