// 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 itertools::Itertools; use regex::Regex; use crate::common::TestEnvironment; #[test] fn test_show() { 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, &["show"]); let stdout = stdout.lines().skip(2).join("\n"); insta::assert_snapshot!(stdout, @r###" Author: Test User (2001-02-03 08:05:07) Committer: Test User (2001-02-03 08:05:07) (no description set) "###); } #[test] fn test_show_basic() { 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(); std::fs::write(repo_path.join("file2"), "foo\nbaz qux\n").unwrap(); test_env.jj_cmd_ok(&repo_path, &["new"]); std::fs::remove_file(repo_path.join("file1")).unwrap(); std::fs::write(repo_path.join("file2"), "foo\nbar\nbaz quux\n").unwrap(); std::fs::write(repo_path.join("file3"), "foo\n").unwrap(); let stdout = test_env.jj_cmd_success(&repo_path, &["show"]); insta::assert_snapshot!(stdout, @r###" Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp Author: Test User (2001-02-03 08:05:09) Committer: Test User (2001-02-03 08:05:09) (no description set) Removed regular file file1: 1 : foo Modified regular file file2: 1 1: foo 2: bar 2 3: baz quxquux Added regular file file3: 1: foo "###); let stdout = test_env.jj_cmd_success(&repo_path, &["show", "--context=0"]); insta::assert_snapshot!(stdout, @r###" Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp Author: Test User (2001-02-03 08:05:09) Committer: Test User (2001-02-03 08:05:09) (no description set) Removed regular file file1: 1 : foo Modified regular file file2: 1 1: foo 2: bar 2 3: baz quxquux Added regular file file3: 1: foo "###); let stdout = test_env.jj_cmd_success(&repo_path, &["show", "--color=debug"]); insta::assert_snapshot!(stdout, @r###" Commit ID: <> Change ID: <> Author: <> <<>> (<>) Committer: <> <<>> (<>) <> <> <><><> <> <><><><> <><><><> <><><><><><><> <> <><><><> "###); let stdout = test_env.jj_cmd_success(&repo_path, &["show", "-s"]); insta::assert_snapshot!(stdout, @r###" Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp Author: Test User (2001-02-03 08:05:09) Committer: Test User (2001-02-03 08:05:09) (no description set) D file1 M file2 A file3 "###); let stdout = test_env.jj_cmd_success(&repo_path, &["show", "--types"]); insta::assert_snapshot!(stdout, @r###" Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp Author: Test User (2001-02-03 08:05:09) Committer: Test User (2001-02-03 08:05:09) (no description set) F- file1 FF file2 -F file3 "###); let stdout = test_env.jj_cmd_success(&repo_path, &["show", "--git"]); insta::assert_snapshot!(stdout, @r###" Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp Author: Test User (2001-02-03 08:05:09) Committer: Test User (2001-02-03 08:05:09) (no description set) diff --git a/file1 b/file1 deleted file mode 100644 index 257cc5642c..0000000000 --- a/file1 +++ /dev/null @@ -1,1 +1,0 @@ -foo diff --git a/file2 b/file2 index 523a4a9de8..485b56a572 100644 --- a/file2 +++ b/file2 @@ -1,2 +1,3 @@ foo -baz qux +bar +baz quux diff --git a/file3 b/file3 new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/file3 @@ -1,0 +1,1 @@ +foo "###); let stdout = test_env.jj_cmd_success(&repo_path, &["show", "--git", "--context=0"]); insta::assert_snapshot!(stdout, @r###" Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp Author: Test User (2001-02-03 08:05:09) Committer: Test User (2001-02-03 08:05:09) (no description set) diff --git a/file1 b/file1 deleted file mode 100644 index 257cc5642c..0000000000 --- a/file1 +++ /dev/null @@ -1,1 +1,0 @@ -foo diff --git a/file2 b/file2 index 523a4a9de8..485b56a572 100644 --- a/file2 +++ b/file2 @@ -2,1 +2,2 @@ -baz qux +bar +baz quux diff --git a/file3 b/file3 new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/file3 @@ -1,0 +1,1 @@ +foo "###); let stdout = test_env.jj_cmd_success(&repo_path, &["show", "--git", "--color=debug"]); insta::assert_snapshot!(stdout, @r###" Commit ID: <> Change ID: <> Author: <> <<>> (<>) Committer: <> <<>> (<>) <> <> <> <> <> <> <> <><> <> <> <> <> <> <> <><><> <><> <><><> <> <> <> <> <> <> <><> "###); let stdout = test_env.jj_cmd_success(&repo_path, &["show", "-s", "--git"]); insta::assert_snapshot!(stdout, @r###" Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp Author: Test User (2001-02-03 08:05:09) Committer: Test User (2001-02-03 08:05:09) (no description set) D file1 M file2 A file3 diff --git a/file1 b/file1 deleted file mode 100644 index 257cc5642c..0000000000 --- a/file1 +++ /dev/null @@ -1,1 +1,0 @@ -foo diff --git a/file2 b/file2 index 523a4a9de8..485b56a572 100644 --- a/file2 +++ b/file2 @@ -1,2 +1,3 @@ foo -baz qux +bar +baz quux diff --git a/file3 b/file3 new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/file3 @@ -1,0 +1,1 @@ +foo "###); let stdout = test_env.jj_cmd_success(&repo_path, &["show", "--stat"]); insta::assert_snapshot!(stdout, @r###" Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp Author: Test User (2001-02-03 08:05:09) Committer: Test User (2001-02-03 08:05:09) (no description set) file1 | 1 - file2 | 3 ++- file3 | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) "###); } #[test] fn test_show_with_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"); test_env.jj_cmd_ok(&repo_path, &["new", "-m", "a new commit"]); let stdout = test_env.jj_cmd_success(&repo_path, &["show", "-T", "description"]); insta::assert_snapshot!(stdout, @r###" a new commit "###); } #[test] fn test_show_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, &["show", "-T"]); insta::assert_snapshot!(stderr, @r###" error: a value is required for '--template