2022-11-26 23:57:50 +00:00
|
|
|
// Copyright 2022 The Jujutsu Authors
|
2022-04-02 17:43:25 +00:00
|
|
|
//
|
|
|
|
// 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::TestEnvironment;
|
|
|
|
|
|
|
|
pub mod common;
|
|
|
|
|
|
|
|
#[test]
|
2022-12-18 03:56:21 +00:00
|
|
|
fn test_diffedit() {
|
2022-04-02 17:43:25 +00:00
|
|
|
let mut test_env = TestEnvironment::default();
|
|
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
std::fs::write(repo_path.join("file1"), "a\n").unwrap();
|
2022-12-08 06:01:58 +00:00
|
|
|
test_env.jj_cmd_success(&repo_path, &["new"]);
|
2022-04-02 17:43:25 +00:00
|
|
|
std::fs::write(repo_path.join("file2"), "a\n").unwrap();
|
|
|
|
std::fs::write(repo_path.join("file3"), "a\n").unwrap();
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["new"]);
|
|
|
|
std::fs::remove_file(repo_path.join("file1")).unwrap();
|
|
|
|
std::fs::write(repo_path.join("file2"), "b\n").unwrap();
|
|
|
|
|
|
|
|
let edit_script = test_env.set_up_fake_diff_editor();
|
|
|
|
|
|
|
|
// Nothing happens if we make no changes
|
2022-04-03 05:22:33 +00:00
|
|
|
std::fs::write(
|
|
|
|
&edit_script,
|
|
|
|
"files-before file1 file2\0files-after JJ-INSTRUCTIONS file2",
|
|
|
|
)
|
|
|
|
.unwrap();
|
2022-12-18 03:56:21 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diffedit"]);
|
2022-04-28 23:32:18 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
Nothing changed.
|
|
|
|
"###);
|
2022-04-02 17:43:25 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
R file1
|
|
|
|
M file2
|
|
|
|
"###);
|
|
|
|
|
|
|
|
// Nothing happens if the diff-editor exits with an error
|
|
|
|
std::fs::write(&edit_script, "rm file2\0fail").unwrap();
|
2023-01-11 08:23:21 +00:00
|
|
|
insta::assert_snapshot!(&test_env.jj_cmd_failure(&repo_path, &["diffedit"]), @r###"
|
|
|
|
Error: Failed to edit diff: Tool exited with a non-zero code (run with --verbose to see the exact invocation). Exit code: 1.
|
2022-04-28 23:32:18 +00:00
|
|
|
"###);
|
2022-04-02 17:43:25 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
R file1
|
|
|
|
M file2
|
|
|
|
"###);
|
|
|
|
|
|
|
|
// Can edit changes to individual files
|
|
|
|
std::fs::write(&edit_script, "reset file2").unwrap();
|
2022-12-18 03:56:21 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diffedit"]);
|
2022-04-02 17:43:25 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2022-12-08 06:01:58 +00:00
|
|
|
Created 1930da4a57e9 (no description set)
|
|
|
|
Working copy now at: 1930da4a57e9 (no description set)
|
2022-04-02 17:43:25 +00:00
|
|
|
Added 0 files, modified 1 files, removed 0 files
|
|
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
2022-04-28 23:32:18 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
R file1
|
|
|
|
"###);
|
2022-04-02 17:43:25 +00:00
|
|
|
|
|
|
|
// Changes to a commit are propagated to descendants
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["undo"]);
|
|
|
|
std::fs::write(&edit_script, "write file3\nmodified\n").unwrap();
|
2022-12-18 03:56:21 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diffedit", "-r", "@-"]);
|
2022-04-02 17:43:25 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2022-12-08 06:01:58 +00:00
|
|
|
Created c03ae96780b6 (no description set)
|
2022-04-02 17:43:25 +00:00
|
|
|
Rebased 1 descendant commits
|
2022-12-08 06:01:58 +00:00
|
|
|
Working copy now at: 2a4dc204a6ab (no description set)
|
2022-04-02 17:43:25 +00:00
|
|
|
Added 0 files, modified 1 files, removed 0 files
|
|
|
|
"###);
|
|
|
|
let contents = String::from_utf8(std::fs::read(repo_path.join("file3")).unwrap()).unwrap();
|
2022-04-28 23:32:18 +00:00
|
|
|
insta::assert_snapshot!(contents, @r###"
|
|
|
|
modified
|
|
|
|
"###);
|
2022-12-08 06:01:58 +00:00
|
|
|
|
2022-12-18 03:56:21 +00:00
|
|
|
// Test diffedit --from @--
|
2022-12-08 06:01:58 +00:00
|
|
|
test_env.jj_cmd_success(&repo_path, &["undo"]);
|
|
|
|
std::fs::write(
|
|
|
|
&edit_script,
|
|
|
|
"files-before file1\0files-after JJ-INSTRUCTIONS file2 file3\0reset file2",
|
|
|
|
)
|
|
|
|
.unwrap();
|
2022-12-18 03:56:21 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diffedit", "--from", "@--"]);
|
2022-12-08 06:01:58 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
Created 15f2c966d508 (no description set)
|
|
|
|
Working copy now at: 15f2c966d508 (no description set)
|
|
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
R file1
|
|
|
|
R file2
|
|
|
|
"###);
|
2022-04-02 17:43:25 +00:00
|
|
|
}
|
2022-04-02 20:51:58 +00:00
|
|
|
|
|
|
|
#[test]
|
2022-12-18 03:56:21 +00:00
|
|
|
fn test_diffedit_merge() {
|
2022-04-02 20:51:58 +00:00
|
|
|
let mut test_env = TestEnvironment::default();
|
|
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
std::fs::write(repo_path.join("file1"), "a\n").unwrap();
|
|
|
|
std::fs::write(repo_path.join("file2"), "a\n").unwrap();
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["new"]);
|
2022-06-06 03:23:01 +00:00
|
|
|
test_env.jj_cmd_success(&repo_path, &["branch", "create", "b"]);
|
2022-04-02 20:51:58 +00:00
|
|
|
std::fs::write(repo_path.join("file1"), "b\n").unwrap();
|
|
|
|
std::fs::write(repo_path.join("file2"), "b\n").unwrap();
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["co", "@-"]);
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["new"]);
|
|
|
|
std::fs::write(repo_path.join("file1"), "c\n").unwrap();
|
|
|
|
std::fs::write(repo_path.join("file2"), "c\n").unwrap();
|
2022-08-31 05:39:32 +00:00
|
|
|
test_env.jj_cmd_success(&repo_path, &["new", "@", "b", "-m", "merge"]);
|
|
|
|
// Resolve the conflict in file1, but leave the conflict in file2
|
2022-04-02 20:51:58 +00:00
|
|
|
std::fs::write(repo_path.join("file1"), "d\n").unwrap();
|
|
|
|
std::fs::write(repo_path.join("file3"), "d\n").unwrap();
|
2022-08-31 05:39:32 +00:00
|
|
|
test_env.jj_cmd_success(&repo_path, &["new"]);
|
2022-04-02 20:51:58 +00:00
|
|
|
// Test the setup
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-r", "@-", "-s"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
M file1
|
|
|
|
A file3
|
|
|
|
"###);
|
|
|
|
|
|
|
|
let edit_script = test_env.set_up_fake_diff_editor();
|
|
|
|
|
|
|
|
// Remove file1. The conflict remains in the working copy on top of the merge.
|
|
|
|
std::fs::write(
|
2022-11-04 04:14:41 +00:00
|
|
|
edit_script,
|
2022-04-02 20:51:58 +00:00
|
|
|
"files-before file1\0files-after JJ-INSTRUCTIONS file1 file3\0rm file1",
|
|
|
|
)
|
|
|
|
.unwrap();
|
2022-12-18 03:56:21 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diffedit", "-r", "@-"]);
|
2022-04-02 20:51:58 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2022-12-21 04:47:10 +00:00
|
|
|
Created a70eded7af9e merge
|
2022-04-02 20:51:58 +00:00
|
|
|
Rebased 1 descendant commits
|
2022-12-21 04:47:10 +00:00
|
|
|
Working copy now at: a5f1ce845f74 (no description set)
|
2022-04-02 20:51:58 +00:00
|
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s", "-r", "@-"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
R file1
|
|
|
|
A file3
|
|
|
|
"###);
|
|
|
|
assert!(!repo_path.join("file1").exists());
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
<<<<<<<
|
2022-09-20 03:31:20 +00:00
|
|
|
%%%%%%%
|
2022-04-02 20:51:58 +00:00
|
|
|
-a
|
|
|
|
+c
|
|
|
|
+++++++
|
|
|
|
b
|
|
|
|
>>>>>>>
|
|
|
|
"###);
|
|
|
|
}
|
2022-12-21 01:36:51 +00:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_diffedit_old_restore_interactive_tests() {
|
|
|
|
let mut test_env = TestEnvironment::default();
|
|
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
std::fs::write(repo_path.join("file1"), "a\n").unwrap();
|
|
|
|
std::fs::write(repo_path.join("file2"), "a\n").unwrap();
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["new"]);
|
|
|
|
std::fs::remove_file(repo_path.join("file1")).unwrap();
|
|
|
|
std::fs::write(repo_path.join("file2"), "b\n").unwrap();
|
|
|
|
std::fs::write(repo_path.join("file3"), "b\n").unwrap();
|
|
|
|
|
|
|
|
let edit_script = test_env.set_up_fake_diff_editor();
|
|
|
|
|
|
|
|
// Nothing happens if we make no changes
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diffedit", "--from", "@-"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
Nothing changed.
|
|
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
R file1
|
|
|
|
M file2
|
|
|
|
A file3
|
|
|
|
"###);
|
|
|
|
|
|
|
|
// Nothing happens if the diff-editor exits with an error
|
|
|
|
std::fs::write(&edit_script, "rm file2\0fail").unwrap();
|
2023-01-11 08:23:21 +00:00
|
|
|
insta::assert_snapshot!(&test_env.jj_cmd_failure(&repo_path, &["diffedit", "--from", "@-"]), @r###"
|
|
|
|
Error: Failed to edit diff: Tool exited with a non-zero code (run with --verbose to see the exact invocation). Exit code: 1.
|
2022-12-21 01:36:51 +00:00
|
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
R file1
|
|
|
|
M file2
|
|
|
|
A file3
|
|
|
|
"###);
|
|
|
|
|
|
|
|
// Can restore changes to individual files
|
|
|
|
std::fs::write(&edit_script, "reset file2\0reset file3").unwrap();
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diffedit", "--from", "@-"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
Created abdbf6271a1c (no description set)
|
|
|
|
Working copy now at: abdbf6271a1c (no description set)
|
|
|
|
Added 0 files, modified 1 files, removed 1 files
|
|
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
R file1
|
|
|
|
"###);
|
|
|
|
|
|
|
|
// Can make unrelated edits
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["undo"]);
|
|
|
|
std::fs::write(&edit_script, "write file3\nunrelated\n").unwrap();
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diffedit", "--from", "@-"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
Created e31f7f33ad07 (no description set)
|
|
|
|
Working copy now at: e31f7f33ad07 (no description set)
|
|
|
|
Added 0 files, modified 1 files, removed 0 files
|
|
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "--git"]);
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
diff --git a/file1 b/file1
|
|
|
|
deleted file mode 100644
|
|
|
|
index 7898192261..0000000000
|
|
|
|
--- a/file1
|
|
|
|
+++ /dev/null
|
|
|
|
@@ -1,1 +1,0 @@
|
|
|
|
-a
|
|
|
|
diff --git a/file2 b/file2
|
|
|
|
index 7898192261...6178079822 100644
|
|
|
|
--- a/file2
|
|
|
|
+++ b/file2
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-a
|
|
|
|
+b
|
|
|
|
diff --git a/file3 b/file3
|
|
|
|
new file mode 100644
|
|
|
|
index 0000000000..c21c9352f7
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/file3
|
|
|
|
@@ -1,0 +1,1 @@
|
|
|
|
+unrelated
|
|
|
|
"###);
|
|
|
|
}
|