// 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 std::path::Path;use std::path::PathBuf; use test_case::test_case; use crate::common::CommandOutput;use crate::common::TestEnvironment; #[must_use]fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> CommandOutput { let template = r#"separate(" ", change_id.short(), empty, local_bookmarks, description)"#; test_env.run_jj_in(cwd, ["log", "-T", template])} #[must_use]fn get_workspace_log_output(test_env: &TestEnvironment, cwd: &Path) -> CommandOutput { let template = r#"separate(" ", change_id.short(), working_copies, description)"#; test_env.run_jj_in(cwd, ["log", "-T", template, "-r", "all()"])} #[must_use]fn get_recorded_dates(test_env: &TestEnvironment, cwd: &Path, revset: &str) -> CommandOutput { let template = r#"separate("\n", "Author date: " ++ author.timestamp(), "Committer date: " ++ committer.timestamp())"#; test_env.run_jj_in(cwd, ["log", "--no-graph", "-T", template, "-r", revset])} #[test]fn test_split_by_paths() { let mut test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); let repo_path = test_env.env_root().join("repo"); std::fs::write(repo_path.join("file1"), "foo").unwrap(); std::fs::write(repo_path.join("file2"), "foo").unwrap(); std::fs::write(repo_path.join("file3"), "foo").unwrap(); insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" @ qpvuntsmwlqt false ◆ zzzzzzzzzzzz true [EOF] "); insta::assert_snapshot!(get_recorded_dates(&test_env, &repo_path,"@"), @r" Author date: 2001-02-03 04:05:08.000 +07:00 Committer date: 2001-02-03 04:05:08.000 +07:00[EOF] "); let edit_script = test_env.set_up_fake_editor(); std::fs::write( edit_script, ["dump editor0", "next invocation\n", "dump editor1"].join("\0"), ) .unwrap(); let output = test_env.run_jj_in(&repo_path, ["split", "file2"]); insta::assert_snapshot!(output, @r" ------- stderr ------- First part: qpvuntsm 65569ca7 (no description set) Second part: zsuskuln 709756f0 (no description set) Working copy (@) now at: zsuskuln 709756f0 (no description set) Parent commit (@-) : qpvuntsm 65569ca7 (no description set) [EOF] "); insta::assert_snapshot!( std::fs::read_to_string(test_env.env_root().join("editor0")).unwrap(), @r#" JJ: Enter a description for the first commit. JJ: This commit contains the following changes: JJ: A file2 JJ: JJ: Lines starting with "JJ:" (like this one) will be removed. "#); assert!(!test_env.env_root().join("editor1").exists()); insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" @ zsuskulnrvyr false ○ qpvuntsmwlqt false ◆ zzzzzzzzzzzz true [EOF] "); // The author dates of the new commits should be inherited from the commit being // split. The committer dates should be newer. insta::assert_snapshot!(get_recorded_dates(&test_env, &repo_path,"@"), @r" Author date: 2001-02-03 04:05:08.000 +07:00 Committer date: 2001-02-03 04:05:10.000 +07:00[EOF] "); insta::assert_snapshot!(get_recorded_dates(&test_env, &repo_path,"@-"), @r" Author date: 2001-02-03 04:05:08.000 +07:00 Committer date: 2001-02-03 04:05:10.000 +07:00[EOF] "); let output = test_env.run_jj_in(&repo_path, ["diff", "-s", "-r", "@-"]); insta::assert_snapshot!(output, @r" A file2 [EOF] "); let output = test_env.run_jj_in(&repo_path, ["diff", "-s"]); insta::assert_snapshot!(output, @r" A file1 A file3 [EOF] "); // Insert an empty commit after @- with "split ." test_env.set_up_fake_editor(); let output = test_env.run_jj_in(&repo_path, ["split", "-r", "@-", "."]); insta::assert_snapshot!(output, @r" ------- stderr ------- Warning: All changes have been selected, so the second commit will be empty Rebased 1 descendant commits First part: qpvuntsm 9da0eea0 (no description set) Second part: znkkpsqq 5b5714a3 (empty) (no description set) Working copy (@) now at: zsuskuln 0c798ee7 (no description set) Parent commit (@-) : znkkpsqq 5b5714a3 (empty) (no description set) [EOF] "); insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" @ zsuskulnrvyr false ○ znkkpsqqskkl true ○ qpvuntsmwlqt false ◆ zzzzzzzzzzzz true [EOF] "); let output = test_env.run_jj_in(&repo_path, ["diff", "-s", "-r", "@--"]); insta::assert_snapshot!(output, @r" A file2 [EOF] "); // Remove newly created empty commit test_env.run_jj_in(&repo_path, ["abandon", "@-"]).success(); // Insert an empty commit before @- with "split nonexistent" test_env.set_up_fake_editor(); let output = test_env.run_jj_in(&repo_path, ["split", "-r", "@-", "nonexistent"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Warning: No changes have been selected, so the first commit will be empty Rebased 1 descendant commits First part: qpvuntsm bd42f95a (empty) (no description set) Second part: lylxulpl ed55c86b (no description set) Working copy (@) now at: zsuskuln 1e1ed741 (no description set) Parent commit (@-) : lylxulpl ed55c86b (no description set) [EOF] "); insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" @ zsuskulnrvyr false ○ lylxulplsnyw false ○ qpvuntsmwlqt true ◆ zzzzzzzzzzzz true [EOF] "); let output = test_env.run_jj_in(&repo_path, ["diff", "-s", "-r", "@-"]); insta::assert_snapshot!(output, @r" A file2 [EOF] ");} #[test]fn test_split_with_non_empty_description() { let mut test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#); let workspace_path = test_env.env_root().join("repo"); std::fs::write(workspace_path.join("file1"), "foo\n").unwrap(); std::fs::write(workspace_path.join("file2"), "bar\n").unwrap(); test_env .run_jj_in(&workspace_path, ["describe", "-m", "test"]) .success(); let edit_script = test_env.set_up_fake_editor(); std::fs::write( edit_script, [ "dump editor1", "write\npart 1", "next invocation\n", "dump editor2", "write\npart 2", ] .join("\0"), ) .unwrap(); let output = test_env.run_jj_in(&workspace_path, ["split", "file1"]); insta::assert_snapshot!(output, @r" ------- stderr ------- First part: qpvuntsm 231a3c00 part 1 Second part: kkmpptxz e96291aa part 2 Working copy (@) now at: kkmpptxz e96291aa part 2 Parent commit (@-) : qpvuntsm 231a3c00 part 1 [EOF] "); insta::assert_snapshot!( std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r#" JJ: Enter a description for the first commit. test JJ: This commit contains the following changes: JJ: A file1 JJ: JJ: Lines starting with "JJ:" (like this one) will be removed. "#); insta::assert_snapshot!( std::fs::read_to_string(test_env.env_root().join("editor2")).unwrap(), @r#" JJ: Enter a description for the second commit. test JJ: This commit contains the following changes: JJ: A file2 JJ: JJ: Lines starting with "JJ:" (like this one) will be removed. "#); insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r" @ kkmpptxzrspx false part 2 ○ qpvuntsmwlqt false part 1 ◆ zzzzzzzzzzzz true [EOF] ");} #[test]fn test_split_with_default_description() { let mut test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#); let workspace_path = test_env.env_root().join("repo"); std::fs::write(workspace_path.join("file1"), "foo\n").unwrap(); std::fs::write(workspace_path.join("file2"), "bar\n").unwrap(); let edit_script = test_env.set_up_fake_editor(); std::fs::write( edit_script, ["dump editor1", "next invocation\n", "dump editor2"].join("\0"), ) .unwrap(); let output = test_env.run_jj_in(&workspace_path, ["split", "file1"]); insta::assert_snapshot!(output, @r" ------- stderr ------- First part: qpvuntsm 02ee5d60 TESTED=TODO Second part: rlvkpnrz 33cd046b (no description set) Working copy (@) now at: rlvkpnrz 33cd046b (no description set) Parent commit (@-) : qpvuntsm 02ee5d60 TESTED=TODO [EOF] "); // Since the commit being split has no description, the user will only be // prompted to add a description to the first commit, which will use the // default value we set. The second commit will inherit the empty // description from the commit being split. insta::assert_snapshot!( std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r#" JJ: Enter a description for the first commit. TESTED=TODO JJ: This commit contains the following changes: JJ: A file1 JJ: JJ: Lines starting with "JJ:" (like this one) will be removed. "#); assert!(!test_env.env_root().join("editor2").exists()); insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r" @ rlvkpnrzqnoo false ○ qpvuntsmwlqt false TESTED=TODO ◆ zzzzzzzzzzzz true [EOF] ");} #[test]fn test_split_with_descendants() { // Configure the environment and make the initial commits. let mut test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); let workspace_path = test_env.env_root().join("repo"); // First commit. This is the one we will split later. std::fs::write(workspace_path.join("file1"), "foo\n").unwrap(); std::fs::write(workspace_path.join("file2"), "bar\n").unwrap(); test_env .run_jj_in(&workspace_path, ["commit", "-m", "Add file1 & file2"]) .success(); // Second commit. std::fs::write(workspace_path.join("file3"), "baz\n").unwrap(); test_env .run_jj_in(&workspace_path, ["commit", "-m", "Add file3"]) .success(); // Third commit. std::fs::write(workspace_path.join("file4"), "foobarbaz\n").unwrap(); test_env .run_jj_in(&workspace_path, ["describe", "-m", "Add file4"]) .success(); insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###" @ kkmpptxzrspx false Add file4 ○ rlvkpnrzqnoo false Add file3 ○ qpvuntsmwlqt false Add file1 & file2 ◆ zzzzzzzzzzzz true [EOF] "###); // Set up the editor and do the split. let edit_script = test_env.set_up_fake_editor(); std::fs::write( edit_script, [ "dump editor1", "write\nAdd file1", "next invocation\n", "dump editor2", "write\nAdd file2", ] .join("\0"), ) .unwrap(); let output = test_env.run_jj_in(&workspace_path, ["split", "file1", "-r", "qpvu"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Rebased 2 descendant commits First part: qpvuntsm 34dd141b Add file1 Second part: royxmykx 465e03d0 Add file2 Working copy (@) now at: kkmpptxz 2d5d641f Add file4 Parent commit (@-) : rlvkpnrz b3bd9eb7 Add file3 [EOF] "); insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###" @ kkmpptxzrspx false Add file4 ○ rlvkpnrzqnoo false Add file3 ○ royxmykxtrkr false Add file2 ○ qpvuntsmwlqt false Add file1 ◆ zzzzzzzzzzzz true [EOF] "###); // The commit we're splitting has a description, so the user will be // prompted to enter a description for each of the commits. insta::assert_snapshot!( std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r#" JJ: Enter a description for the first commit. Add file1 & file2 JJ: This commit contains the following changes: JJ: A file1 JJ: JJ: Lines starting with "JJ:" (like this one) will be removed. "#); insta::assert_snapshot!( std::fs::read_to_string(test_env.env_root().join("editor2")).unwrap(), @r#" JJ: Enter a description for the second commit. Add file1 & file2 JJ: This commit contains the following changes: JJ: A file2 JJ: JJ: Lines starting with "JJ:" (like this one) will be removed. "#); // Check the evolog for the first commit. It shows four entries: // - The initial empty commit. // - The rewritten commit from the snapshot after the files were added. // - The rewritten commit once the description is added during `jj commit`. // - The rewritten commit after the split. let evolog_1 = test_env.run_jj_in(&workspace_path, ["evolog", "-r", "qpvun"]); insta::assert_snapshot!(evolog_1, @r###" ○ qpvuntsm test.user@example.com 2001-02-03 08:05:12 34dd141b │ Add file1 ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 764d46f1 │ Add file1 & file2 ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 44af2155 │ (no description set) ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059 (empty) (no description set) [EOF] "###); // The evolog for the second commit is the same, except that the change id // changes after the split. let evolog_2 = test_env.run_jj_in(&workspace_path, ["evolog", "-r", "royxm"]); insta::assert_snapshot!(evolog_2, @r###" ○ royxmykx test.user@example.com 2001-02-03 08:05:12 465e03d0 │ Add file2 ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 764d46f1 │ Add file1 & file2 ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 44af2155 │ (no description set) ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059 (empty) (no description set) [EOF] "###);} // This test makes sure that the children of the commit being split retain any// other parents which weren't involved in the split.#[test]fn test_split_with_merge_child() { let mut test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); let workspace_path = test_env.env_root().join("repo"); test_env .run_jj_in(&workspace_path, ["describe", "-m=1"]) .success(); test_env .run_jj_in(&workspace_path, ["new", "root()", "-m=a"]) .success(); std::fs::write(workspace_path.join("file1"), "foo\n").unwrap(); std::fs::write(workspace_path.join("file2"), "bar\n").unwrap(); test_env .run_jj_in( &workspace_path, ["new", "description(1)", "description(a)", "-m=2"], ) .success(); insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r" @ zsuskulnrvyr true 2 ├─╮ │ ○ kkmpptxzrspx false a ○ │ qpvuntsmwlqt true 1 ├─╯ ◆ zzzzzzzzzzzz true [EOF] "); // Set up the editor and do the split. let edit_script = test_env.set_up_fake_editor(); std::fs::write( edit_script, ["write\nAdd file1", "next invocation\n", "write\nAdd file2"].join("\0"), ) .unwrap(); let output = test_env.run_jj_in(&workspace_path, ["split", "-r", "description(a)", "file1"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Rebased 1 descendant commits First part: kkmpptxz e8006b47 Add file1 Second part: royxmykx 5e1b793d Add file2 Working copy (@) now at: zsuskuln 696935af (empty) 2 Parent commit (@-) : qpvuntsm 8b64ddff (empty) 1 Parent commit (@-) : royxmykx 5e1b793d Add file2 [EOF] "); insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r" @ zsuskulnrvyr true 2 ├─╮ │ ○ royxmykxtrkr false Add file2 │ ○ kkmpptxzrspx false Add file1 ○ │ qpvuntsmwlqt true 1 ├─╯ ◆ zzzzzzzzzzzz true [EOF] ");} #[test]// Split a commit with no descendants into siblings. Also tests that the default// description is set correctly on the first commit.fn test_split_parallel_no_descendants() { let mut test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#); let workspace_path = test_env.env_root().join("repo"); std::fs::write(workspace_path.join("file1"), "foo\n").unwrap(); std::fs::write(workspace_path.join("file2"), "bar\n").unwrap(); insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r" @ qpvuntsmwlqt false ◆ zzzzzzzzzzzz true [EOF] "); let edit_script = test_env.set_up_fake_editor(); std::fs::write( edit_script, ["dump editor1", "next invocation\n", "dump editor2"].join("\0"), ) .unwrap(); let output = test_env.run_jj_in(&workspace_path, ["split", "--parallel", "file1"]); insta::assert_snapshot!(output, @r" ------- stderr -------Lines 1–500 of 1165. Load more
// 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 std::path::Path; use std::path::PathBuf; use test_case::test_case; use crate::common::CommandOutput; use crate::common::TestEnvironment; #[must_use] fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> CommandOutput { let template = r#"separate(" ", change_id.short(), empty, local_bookmarks, description)"#; test_env.run_jj_in(cwd, ["log", "-T", template]) } #[must_use] fn get_workspace_log_output(test_env: &TestEnvironment, cwd: &Path) -> CommandOutput { let template = r#"separate(" ", change_id.short(), working_copies, description)"#; test_env.run_jj_in(cwd, ["log", "-T", template, "-r", "all()"]) } #[must_use] fn get_recorded_dates(test_env: &TestEnvironment, cwd: &Path, revset: &str) -> CommandOutput { let template = r#"separate("\n", "Author date: " ++ author.timestamp(), "Committer date: " ++ committer.timestamp())"#; test_env.run_jj_in(cwd, ["log", "--no-graph", "-T", template, "-r", revset]) } #[test] fn test_split_by_paths() { let mut test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); let repo_path = test_env.env_root().join("repo"); std::fs::write(repo_path.join("file1"), "foo").unwrap(); std::fs::write(repo_path.join("file2"), "foo").unwrap(); std::fs::write(repo_path.join("file3"), "foo").unwrap(); insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" @ qpvuntsmwlqt false ◆ zzzzzzzzzzzz true [EOF] "); insta::assert_snapshot!(get_recorded_dates(&test_env, &repo_path,"@"), @r" Author date: 2001-02-03 04:05:08.000 +07:00 Committer date: 2001-02-03 04:05:08.000 +07:00[EOF] "); let edit_script = test_env.set_up_fake_editor(); std::fs::write( edit_script, ["dump editor0", "next invocation\n", "dump editor1"].join("\0"), ) .unwrap(); let output = test_env.run_jj_in(&repo_path, ["split", "file2"]); insta::assert_snapshot!(output, @r" ------- stderr ------- First part: qpvuntsm 65569ca7 (no description set) Second part: zsuskuln 709756f0 (no description set) Working copy (@) now at: zsuskuln 709756f0 (no description set) Parent commit (@-) : qpvuntsm 65569ca7 (no description set) [EOF] "); insta::assert_snapshot!( std::fs::read_to_string(test_env.env_root().join("editor0")).unwrap(), @r#" JJ: Enter a description for the first commit. JJ: This commit contains the following changes: JJ: A file2 JJ: JJ: Lines starting with "JJ:" (like this one) will be removed. "#); assert!(!test_env.env_root().join("editor1").exists()); insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" @ zsuskulnrvyr false ○ qpvuntsmwlqt false ◆ zzzzzzzzzzzz true [EOF] "); // The author dates of the new commits should be inherited from the commit being // split. The committer dates should be newer. insta::assert_snapshot!(get_recorded_dates(&test_env, &repo_path,"@"), @r" Author date: 2001-02-03 04:05:08.000 +07:00 Committer date: 2001-02-03 04:05:10.000 +07:00[EOF] "); insta::assert_snapshot!(get_recorded_dates(&test_env, &repo_path,"@-"), @r" Author date: 2001-02-03 04:05:08.000 +07:00 Committer date: 2001-02-03 04:05:10.000 +07:00[EOF] "); let output = test_env.run_jj_in(&repo_path, ["diff", "-s", "-r", "@-"]); insta::assert_snapshot!(output, @r" A file2 [EOF] "); let output = test_env.run_jj_in(&repo_path, ["diff", "-s"]); insta::assert_snapshot!(output, @r" A file1 A file3 [EOF] "); // Insert an empty commit after @- with "split ." test_env.set_up_fake_editor(); let output = test_env.run_jj_in(&repo_path, ["split", "-r", "@-", "."]); insta::assert_snapshot!(output, @r" ------- stderr ------- Warning: All changes have been selected, so the second commit will be empty Rebased 1 descendant commits First part: qpvuntsm 9da0eea0 (no description set) Second part: znkkpsqq 5b5714a3 (empty) (no description set) Working copy (@) now at: zsuskuln 0c798ee7 (no description set) Parent commit (@-) : znkkpsqq 5b5714a3 (empty) (no description set) [EOF] "); insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" @ zsuskulnrvyr false ○ znkkpsqqskkl true ○ qpvuntsmwlqt false ◆ zzzzzzzzzzzz true [EOF] "); let output = test_env.run_jj_in(&repo_path, ["diff", "-s", "-r", "@--"]); insta::assert_snapshot!(output, @r" A file2 [EOF] "); // Remove newly created empty commit test_env.run_jj_in(&repo_path, ["abandon", "@-"]).success(); // Insert an empty commit before @- with "split nonexistent" test_env.set_up_fake_editor(); let output = test_env.run_jj_in(&repo_path, ["split", "-r", "@-", "nonexistent"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Warning: No changes have been selected, so the first commit will be empty Rebased 1 descendant commits First part: qpvuntsm bd42f95a (empty) (no description set) Second part: lylxulpl ed55c86b (no description set) Working copy (@) now at: zsuskuln 1e1ed741 (no description set) Parent commit (@-) : lylxulpl ed55c86b (no description set) [EOF] "); insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" @ zsuskulnrvyr false ○ lylxulplsnyw false ○ qpvuntsmwlqt true ◆ zzzzzzzzzzzz true [EOF] "); let output = test_env.run_jj_in(&repo_path, ["diff", "-s", "-r", "@-"]); insta::assert_snapshot!(output, @r" A file2 [EOF] "); } #[test] fn test_split_with_non_empty_description() { let mut test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#); let workspace_path = test_env.env_root().join("repo"); std::fs::write(workspace_path.join("file1"), "foo\n").unwrap(); std::fs::write(workspace_path.join("file2"), "bar\n").unwrap(); test_env .run_jj_in(&workspace_path, ["describe", "-m", "test"]) .success(); let edit_script = test_env.set_up_fake_editor(); std::fs::write( edit_script, [ "dump editor1", "write\npart 1", "next invocation\n", "dump editor2", "write\npart 2", ] .join("\0"), ) .unwrap(); let output = test_env.run_jj_in(&workspace_path, ["split", "file1"]); insta::assert_snapshot!(output, @r" ------- stderr ------- First part: qpvuntsm 231a3c00 part 1 Second part: kkmpptxz e96291aa part 2 Working copy (@) now at: kkmpptxz e96291aa part 2 Parent commit (@-) : qpvuntsm 231a3c00 part 1 [EOF] "); insta::assert_snapshot!( std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r#" JJ: Enter a description for the first commit. test JJ: This commit contains the following changes: JJ: A file1 JJ: JJ: Lines starting with "JJ:" (like this one) will be removed. "#); insta::assert_snapshot!( std::fs::read_to_string(test_env.env_root().join("editor2")).unwrap(), @r#" JJ: Enter a description for the second commit. test JJ: This commit contains the following changes: JJ: A file2 JJ: JJ: Lines starting with "JJ:" (like this one) will be removed. "#); insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r" @ kkmpptxzrspx false part 2 ○ qpvuntsmwlqt false part 1 ◆ zzzzzzzzzzzz true [EOF] "); } #[test] fn test_split_with_default_description() { let mut test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#); let workspace_path = test_env.env_root().join("repo"); std::fs::write(workspace_path.join("file1"), "foo\n").unwrap(); std::fs::write(workspace_path.join("file2"), "bar\n").unwrap(); let edit_script = test_env.set_up_fake_editor(); std::fs::write( edit_script, ["dump editor1", "next invocation\n", "dump editor2"].join("\0"), ) .unwrap(); let output = test_env.run_jj_in(&workspace_path, ["split", "file1"]); insta::assert_snapshot!(output, @r" ------- stderr ------- First part: qpvuntsm 02ee5d60 TESTED=TODO Second part: rlvkpnrz 33cd046b (no description set) Working copy (@) now at: rlvkpnrz 33cd046b (no description set) Parent commit (@-) : qpvuntsm 02ee5d60 TESTED=TODO [EOF] "); // Since the commit being split has no description, the user will only be // prompted to add a description to the first commit, which will use the // default value we set. The second commit will inherit the empty // description from the commit being split. insta::assert_snapshot!( std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r#" JJ: Enter a description for the first commit. TESTED=TODO JJ: This commit contains the following changes: JJ: A file1 JJ: JJ: Lines starting with "JJ:" (like this one) will be removed. "#); assert!(!test_env.env_root().join("editor2").exists()); insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r" @ rlvkpnrzqnoo false ○ qpvuntsmwlqt false TESTED=TODO ◆ zzzzzzzzzzzz true [EOF] "); } #[test] fn test_split_with_descendants() { // Configure the environment and make the initial commits. let mut test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); let workspace_path = test_env.env_root().join("repo"); // First commit. This is the one we will split later. std::fs::write(workspace_path.join("file1"), "foo\n").unwrap(); std::fs::write(workspace_path.join("file2"), "bar\n").unwrap(); test_env .run_jj_in(&workspace_path, ["commit", "-m", "Add file1 & file2"]) .success(); // Second commit. std::fs::write(workspace_path.join("file3"), "baz\n").unwrap(); test_env .run_jj_in(&workspace_path, ["commit", "-m", "Add file3"]) .success(); // Third commit. std::fs::write(workspace_path.join("file4"), "foobarbaz\n").unwrap(); test_env .run_jj_in(&workspace_path, ["describe", "-m", "Add file4"]) .success(); insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###" @ kkmpptxzrspx false Add file4 ○ rlvkpnrzqnoo false Add file3 ○ qpvuntsmwlqt false Add file1 & file2 ◆ zzzzzzzzzzzz true [EOF] "###); // Set up the editor and do the split. let edit_script = test_env.set_up_fake_editor(); std::fs::write( edit_script, [ "dump editor1", "write\nAdd file1", "next invocation\n", "dump editor2", "write\nAdd file2", ] .join("\0"), ) .unwrap(); let output = test_env.run_jj_in(&workspace_path, ["split", "file1", "-r", "qpvu"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Rebased 2 descendant commits First part: qpvuntsm 34dd141b Add file1 Second part: royxmykx 465e03d0 Add file2 Working copy (@) now at: kkmpptxz 2d5d641f Add file4 Parent commit (@-) : rlvkpnrz b3bd9eb7 Add file3 [EOF] "); insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###" @ kkmpptxzrspx false Add file4 ○ rlvkpnrzqnoo false Add file3 ○ royxmykxtrkr false Add file2 ○ qpvuntsmwlqt false Add file1 ◆ zzzzzzzzzzzz true [EOF] "###); // The commit we're splitting has a description, so the user will be // prompted to enter a description for each of the commits. insta::assert_snapshot!( std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r#" JJ: Enter a description for the first commit. Add file1 & file2 JJ: This commit contains the following changes: JJ: A file1 JJ: JJ: Lines starting with "JJ:" (like this one) will be removed. "#); insta::assert_snapshot!( std::fs::read_to_string(test_env.env_root().join("editor2")).unwrap(), @r#" JJ: Enter a description for the second commit. Add file1 & file2 JJ: This commit contains the following changes: JJ: A file2 JJ: JJ: Lines starting with "JJ:" (like this one) will be removed. "#); // Check the evolog for the first commit. It shows four entries: // - The initial empty commit. // - The rewritten commit from the snapshot after the files were added. // - The rewritten commit once the description is added during `jj commit`. // - The rewritten commit after the split. let evolog_1 = test_env.run_jj_in(&workspace_path, ["evolog", "-r", "qpvun"]); insta::assert_snapshot!(evolog_1, @r###" ○ qpvuntsm test.user@example.com 2001-02-03 08:05:12 34dd141b │ Add file1 ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 764d46f1 │ Add file1 & file2 ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 44af2155 │ (no description set) ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059 (empty) (no description set) [EOF] "###); // The evolog for the second commit is the same, except that the change id // changes after the split. let evolog_2 = test_env.run_jj_in(&workspace_path, ["evolog", "-r", "royxm"]); insta::assert_snapshot!(evolog_2, @r###" ○ royxmykx test.user@example.com 2001-02-03 08:05:12 465e03d0 │ Add file2 ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 764d46f1 │ Add file1 & file2 ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 44af2155 │ (no description set) ○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059 (empty) (no description set) [EOF] "###); } // This test makes sure that the children of the commit being split retain any // other parents which weren't involved in the split. #[test] fn test_split_with_merge_child() { let mut test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); let workspace_path = test_env.env_root().join("repo"); test_env .run_jj_in(&workspace_path, ["describe", "-m=1"]) .success(); test_env .run_jj_in(&workspace_path, ["new", "root()", "-m=a"]) .success(); std::fs::write(workspace_path.join("file1"), "foo\n").unwrap(); std::fs::write(workspace_path.join("file2"), "bar\n").unwrap(); test_env .run_jj_in( &workspace_path, ["new", "description(1)", "description(a)", "-m=2"], ) .success(); insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r" @ zsuskulnrvyr true 2 ├─╮ │ ○ kkmpptxzrspx false a ○ │ qpvuntsmwlqt true 1 ├─╯ ◆ zzzzzzzzzzzz true [EOF] "); // Set up the editor and do the split. let edit_script = test_env.set_up_fake_editor(); std::fs::write( edit_script, ["write\nAdd file1", "next invocation\n", "write\nAdd file2"].join("\0"), ) .unwrap(); let output = test_env.run_jj_in(&workspace_path, ["split", "-r", "description(a)", "file1"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Rebased 1 descendant commits First part: kkmpptxz e8006b47 Add file1 Second part: royxmykx 5e1b793d Add file2 Working copy (@) now at: zsuskuln 696935af (empty) 2 Parent commit (@-) : qpvuntsm 8b64ddff (empty) 1 Parent commit (@-) : royxmykx 5e1b793d Add file2 [EOF] "); insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r" @ zsuskulnrvyr true 2 ├─╮ │ ○ royxmykxtrkr false Add file2 │ ○ kkmpptxzrspx false Add file1 ○ │ qpvuntsmwlqt true 1 ├─╯ ◆ zzzzzzzzzzzz true [EOF] "); } #[test] // Split a commit with no descendants into siblings. Also tests that the default // description is set correctly on the first commit. fn test_split_parallel_no_descendants() { let mut test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#); let workspace_path = test_env.env_root().join("repo"); std::fs::write(workspace_path.join("file1"), "foo\n").unwrap(); std::fs::write(workspace_path.join("file2"), "bar\n").unwrap(); insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r" @ qpvuntsmwlqt false ◆ zzzzzzzzzzzz true [EOF] "); let edit_script = test_env.set_up_fake_editor(); std::fs::write( edit_script, ["dump editor1", "next invocation\n", "dump editor2"].join("\0"), ) .unwrap(); let output = test_env.run_jj_in(&workspace_path, ["split", "--parallel", "file1"]); insta::assert_snapshot!(output, @r" ------- stderr -------