forked from mirrors/jj
555 lines
20 KiB
Rust
555 lines
20 KiB
Rust
// 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::escaped_fake_diff_editor_path;
|
|
use crate::common::TestEnvironment;
|
|
|
|
#[test]
|
|
fn test_diffedit() {
|
|
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");
|
|
|
|
std::fs::write(repo_path.join("file1"), "a\n").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["new"]);
|
|
std::fs::write(repo_path.join("file2"), "a\n").unwrap();
|
|
std::fs::write(repo_path.join("file3"), "a\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"), "b\n").unwrap();
|
|
|
|
let edit_script = test_env.set_up_fake_diff_editor();
|
|
|
|
// Test the setup; nothing happens if we make no changes
|
|
std::fs::write(
|
|
&edit_script,
|
|
[
|
|
"files-before file1 file2",
|
|
"files-after JJ-INSTRUCTIONS file2",
|
|
"dump JJ-INSTRUCTIONS instrs",
|
|
]
|
|
.join("\0"),
|
|
)
|
|
.unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["diffedit"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Nothing changed.
|
|
"###);
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(test_env.env_root().join("instrs")).unwrap(), @r###"
|
|
You are editing changes in: kkmpptxz 3d4cce89 (no description set)
|
|
|
|
The diff initially shows the commit's changes.
|
|
|
|
Adjust the right side until it shows the contents you want. If you
|
|
don't make any changes, then the operation will be aborted.
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
D file1
|
|
M file2
|
|
"###);
|
|
|
|
// Try again with ui.diff-instructions=false
|
|
std::fs::write(&edit_script, "files-before file1 file2\0files-after file2").unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&["diffedit", "--config-toml=ui.diff-instructions=false"],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Nothing changed.
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
D file1
|
|
M file2
|
|
"###);
|
|
|
|
// Try again with --tool=<name>
|
|
std::fs::write(
|
|
&edit_script,
|
|
"files-before file1 file2\0files-after JJ-INSTRUCTIONS file2",
|
|
)
|
|
.unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&[
|
|
"diffedit",
|
|
"--config-toml=ui.diff-editor='false'",
|
|
"--tool=fake-diff-editor",
|
|
],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Nothing changed.
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
D file1
|
|
M file2
|
|
"###);
|
|
|
|
// Nothing happens if the diff-editor exits with an error
|
|
std::fs::write(&edit_script, "rm file2\0fail").unwrap();
|
|
let stderr = &test_env.jj_cmd_failure(&repo_path, &["diffedit"]);
|
|
insta::assert_snapshot!(stderr.replace("exit code:", "exit status:"), @r###"
|
|
Error: Failed to edit diff
|
|
Caused by: Tool exited with exit status: 1 (run with --debug to see the exact invocation)
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
D file1
|
|
M file2
|
|
"###);
|
|
|
|
// Can edit changes to individual files
|
|
std::fs::write(&edit_script, "reset file2").unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["diffedit"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Created kkmpptxz cbc7a725 (no description set)
|
|
Working copy now at: kkmpptxz cbc7a725 (no description set)
|
|
Parent commit : rlvkpnrz a72506cd (no description set)
|
|
Added 0 files, modified 1 files, removed 0 files
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
D file1
|
|
"###);
|
|
|
|
// Changes to a commit are propagated to descendants
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
std::fs::write(&edit_script, "write file3\nmodified\n").unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["diffedit", "-r", "@-"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Created rlvkpnrz d4eef3fc (no description set)
|
|
Rebased 1 descendant commits
|
|
Working copy now at: kkmpptxz 59ef1b95 (no description set)
|
|
Parent commit : rlvkpnrz d4eef3fc (no description set)
|
|
Added 0 files, modified 1 files, removed 0 files
|
|
"###);
|
|
let contents = String::from_utf8(std::fs::read(repo_path.join("file3")).unwrap()).unwrap();
|
|
insta::assert_snapshot!(contents, @r###"
|
|
modified
|
|
"###);
|
|
|
|
// Test diffedit --from @--
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
std::fs::write(
|
|
&edit_script,
|
|
"files-before file1\0files-after JJ-INSTRUCTIONS file2 file3\0reset file2",
|
|
)
|
|
.unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["diffedit", "--from", "@--"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Created kkmpptxz 5b585bd1 (no description set)
|
|
Working copy now at: kkmpptxz 5b585bd1 (no description set)
|
|
Parent commit : rlvkpnrz a72506cd (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###"
|
|
D file1
|
|
D file2
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_diffedit_new_file() {
|
|
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");
|
|
|
|
std::fs::write(repo_path.join("file1"), "a\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"), "b\n").unwrap();
|
|
|
|
let edit_script = test_env.set_up_fake_diff_editor();
|
|
|
|
// Test the setup; nothing happens if we make no changes
|
|
std::fs::write(
|
|
&edit_script,
|
|
"files-before file1\0files-after JJ-INSTRUCTIONS file2",
|
|
)
|
|
.unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["diffedit"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Nothing changed.
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
D file1
|
|
A file2
|
|
"###);
|
|
|
|
// Creating `file1` on the right side is noticed by `jj diffedit`
|
|
std::fs::write(&edit_script, "write file1\nmodified\n").unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["diffedit"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Created rlvkpnrz b0376e2b (no description set)
|
|
Working copy now at: rlvkpnrz b0376e2b (no description set)
|
|
Parent commit : qpvuntsm b739eb46 (no description set)
|
|
Added 1 files, modified 0 files, removed 0 files
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
M file1
|
|
A file2
|
|
"###);
|
|
|
|
// Creating a file that wasn't on either side is ignored by diffedit.
|
|
// TODO(ilyagr) We should decide whether we like this behavior.
|
|
//
|
|
// On one hand, it is unexpected and potentially a minor BUG. On the other
|
|
// hand, this prevents `jj` from loading any backup files the merge tool
|
|
// generates.
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
std::fs::write(&edit_script, "write new_file\nnew file\n").unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["diffedit"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Nothing changed.
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
D file1
|
|
A file2
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_diffedit_3pane() {
|
|
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");
|
|
|
|
std::fs::write(repo_path.join("file1"), "a\n").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["new"]);
|
|
std::fs::write(repo_path.join("file2"), "a\n").unwrap();
|
|
std::fs::write(repo_path.join("file3"), "a\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"), "b\n").unwrap();
|
|
|
|
// 2 configs for a 3-pane setup. In the first, "$right" is passed to what the
|
|
// fake diff editor considers the "after" state.
|
|
let config_with_right_as_after = format!(
|
|
r#"ui.diff-editor=["{}", "$left", "$right", "--ignore=$output"]"#,
|
|
escaped_fake_diff_editor_path()
|
|
);
|
|
let config_with_output_as_after = format!(
|
|
r#"ui.diff-editor=["{}", "$left", "$output", "--ignore=$right"]"#,
|
|
escaped_fake_diff_editor_path()
|
|
);
|
|
let edit_script = test_env.env_root().join("diff_edit_script");
|
|
std::fs::write(&edit_script, "").unwrap();
|
|
test_env.add_env_var("DIFF_EDIT_SCRIPT", edit_script.to_str().unwrap());
|
|
|
|
// Nothing happens if we make no changes
|
|
std::fs::write(
|
|
&edit_script,
|
|
"files-before file1 file2\0files-after JJ-INSTRUCTIONS file2",
|
|
)
|
|
.unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&["diffedit", "--config-toml", &config_with_output_as_after],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Nothing changed.
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
D file1
|
|
M file2
|
|
"###);
|
|
// Nothing happens if we make no changes, `config_with_right_as_after` version
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&["diffedit", "--config-toml", &config_with_right_as_after],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Nothing changed.
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
D file1
|
|
M file2
|
|
"###);
|
|
|
|
// Can edit changes to individual files
|
|
std::fs::write(&edit_script, "reset file2").unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&["diffedit", "--config-toml", &config_with_output_as_after],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Created kkmpptxz ed8aada3 (no description set)
|
|
Working copy now at: kkmpptxz ed8aada3 (no description set)
|
|
Parent commit : rlvkpnrz a72506cd (no description set)
|
|
Added 0 files, modified 1 files, removed 0 files
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
D file1
|
|
"###);
|
|
|
|
// Can write something new to `file1`
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
std::fs::write(&edit_script, "write file1\nnew content").unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&["diffedit", "--config-toml", &config_with_output_as_after],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Created kkmpptxz 7c19e689 (no description set)
|
|
Working copy now at: kkmpptxz 7c19e689 (no description set)
|
|
Parent commit : rlvkpnrz a72506cd (no description set)
|
|
Added 1 files, modified 0 files, removed 0 files
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
M file1
|
|
M file2
|
|
"###);
|
|
|
|
// But nothing happens if we modify the right side
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
std::fs::write(&edit_script, "write file1\nnew content").unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&["diffedit", "--config-toml", &config_with_right_as_after],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Nothing changed.
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
D file1
|
|
M file2
|
|
"###);
|
|
|
|
// TODO: test with edit_script of "reset file2". This fails on right side
|
|
// since the file is readonly.
|
|
}
|
|
|
|
#[test]
|
|
fn test_diffedit_merge() {
|
|
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");
|
|
|
|
std::fs::write(repo_path.join("file1"), "a\n").unwrap();
|
|
std::fs::write(repo_path.join("file2"), "a\n").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["new"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "b"]);
|
|
std::fs::write(repo_path.join("file1"), "b\n").unwrap();
|
|
std::fs::write(repo_path.join("file2"), "b\n").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["new", "@-"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["new"]);
|
|
std::fs::write(repo_path.join("file1"), "c\n").unwrap();
|
|
std::fs::write(repo_path.join("file2"), "c\n").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["new", "@", "b", "-m", "merge"]);
|
|
// Resolve the conflict in file1, but leave the conflict in file2
|
|
std::fs::write(repo_path.join("file1"), "d\n").unwrap();
|
|
std::fs::write(repo_path.join("file3"), "d\n").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["new"]);
|
|
// 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(
|
|
edit_script,
|
|
"files-before file1\0files-after JJ-INSTRUCTIONS file1 file3\0rm file1",
|
|
)
|
|
.unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["diffedit", "-r", "@-"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Created royxmykx 263b3c63 (conflict) merge
|
|
Rebased 1 descendant commits
|
|
Working copy now at: yqosqzyt 5771c919 (conflict) (empty) (no description set)
|
|
Parent commit : royxmykx 263b3c63 (conflict) merge
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
There are unresolved conflicts at these paths:
|
|
file2 2-sided conflict
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s", "-r", "@-"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
D file1
|
|
A file3
|
|
"###);
|
|
assert!(!repo_path.join("file1").exists());
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["file", "show", "file2"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
<<<<<<< Conflict 1 of 1
|
|
%%%%%%% Changes from base to side #1
|
|
-a
|
|
+c
|
|
+++++++ Contents of side #2
|
|
b
|
|
>>>>>>> Conflict 1 of 1 ends
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_diffedit_old_restore_interactive_tests() {
|
|
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");
|
|
|
|
std::fs::write(repo_path.join("file1"), "a\n").unwrap();
|
|
std::fs::write(repo_path.join("file2"), "a\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"), "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, stderr) = test_env.jj_cmd_ok(&repo_path, &["diffedit", "--from", "@-"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Nothing changed.
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
D file1
|
|
M file2
|
|
C {file2 => file3}
|
|
"###);
|
|
|
|
// Nothing happens if the diff-editor exits with an error
|
|
std::fs::write(&edit_script, "rm file2\0fail").unwrap();
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["diffedit", "--from", "@-"]);
|
|
insta::assert_snapshot!(stderr.replace("exit code:", "exit status:"), @r###"
|
|
Error: Failed to edit diff
|
|
Caused by: Tool exited with exit status: 1 (run with --debug to see the exact invocation)
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
D file1
|
|
M file2
|
|
C {file2 => file3}
|
|
"###);
|
|
|
|
// Can restore changes to individual files
|
|
std::fs::write(&edit_script, "reset file2\0reset file3").unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["diffedit", "--from", "@-"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Created rlvkpnrz 69811eda (no description set)
|
|
Working copy now at: rlvkpnrz 69811eda (no description set)
|
|
Parent commit : qpvuntsm fc687cb8 (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###"
|
|
D file1
|
|
"###);
|
|
|
|
// Can make unrelated edits
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
std::fs::write(&edit_script, "write file3\nunrelated\n").unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["diffedit", "--from", "@-"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Created rlvkpnrz 2b76a42e (no description set)
|
|
Working copy now at: rlvkpnrz 2b76a42e (no description set)
|
|
Parent commit : qpvuntsm fc687cb8 (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
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_diffedit_restore_descendants() {
|
|
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");
|
|
|
|
std::fs::write(repo_path.join("file"), "println!(\"foo\")\n").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["new"]);
|
|
std::fs::write(repo_path.join("file"), "println!(\"bar\")\n").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["new"]);
|
|
std::fs::write(repo_path.join("file"), "println!(\"baz\");\n").unwrap();
|
|
|
|
let edit_script = test_env.set_up_fake_diff_editor();
|
|
|
|
// Add a ";" after the line with "bar". There should be no conflict.
|
|
std::fs::write(edit_script, "write file\nprintln!(\"bar\");\n").unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&repo_path,
|
|
&["diffedit", "-r", "@-", "--restore-descendants"],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r#"
|
|
Created rlvkpnrz 62b8c2ce (no description set)
|
|
Rebased 1 descendant commits (while preserving their content)
|
|
Working copy now at: kkmpptxz 321d1cd1 (no description set)
|
|
Parent commit : rlvkpnrz 62b8c2ce (no description set)
|
|
"#);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "--git"]);
|
|
insta::assert_snapshot!(stdout, @r#"
|
|
diff --git a/file b/file
|
|
index 1a598a8fc9..7b6a85ab5a 100644
|
|
--- a/file
|
|
+++ b/file
|
|
@@ -1,1 +1,1 @@
|
|
-println!("bar");
|
|
+println!("baz");
|
|
"#);
|
|
}
|