cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-11 02:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: port test_restore_command.rs to TestWorkDir API

Browse Source
This commit is contained in:
Yuya Nishihara 2025-03-29 23:24:10 +09:00
parent 3ba2ea7ace
commit 4d4de68c91
1 changed files with 80 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

221
cli/tests/test_restore_command.rs
View File

@ -12,28 +12,27 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
use std::path::Path;
use crate::common::create_commit_with_files; use crate::common::create_commit_with_files;
use crate::common::CommandOutput; use crate::common::CommandOutput;
use crate::common::TestEnvironment; use crate::common::TestEnvironment;
use crate::common::TestWorkDir;
#[test] #[test]
fn test_restore() { fn test_restore() {
let test_env = TestEnvironment::default(); let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success(); test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let repo_path = test_env.env_root().join("repo"); let work_dir = test_env.work_dir("repo");
std::fs::write(repo_path.join("file1"), "a\n").unwrap(); work_dir.write_file("file1", "a\n");
test_env.run_jj_in(&repo_path, ["new"]).success(); work_dir.run_jj(["new"]).success();
std::fs::write(repo_path.join("file2"), "b\n").unwrap(); work_dir.write_file("file2", "b\n");
test_env.run_jj_in(&repo_path, ["new"]).success(); work_dir.run_jj(["new"]).success();
std::fs::remove_file(repo_path.join("file1")).unwrap(); work_dir.remove_file("file1");
std::fs::write(repo_path.join("file2"), "c\n").unwrap(); work_dir.write_file("file2", "c\n");
std::fs::write(repo_path.join("file3"), "c\n").unwrap(); work_dir.write_file("file3", "c\n");
// There is no `-r` argument // There is no `-r` argument
let output = test_env.run_jj_in(&repo_path, ["restore", "-r=@-"]); let output = work_dir.run_jj(["restore", "-r=@-"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Error: `jj restore` does not have a `--revision`/`-r` option. If you'd like to modify Error: `jj restore` does not have a `--revision`/`-r` option. If you'd like to modify
@ -44,7 +43,7 @@ fn test_restore() {
"); ");
// Restores from parent by default // Restores from parent by default
let output = test_env.run_jj_in(&repo_path, ["restore"]); let output = work_dir.run_jj(["restore"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created kkmpptxz 370d81ea (empty) (no description set) Created kkmpptxz 370d81ea (empty) (no description set)
@ -53,17 +52,17 @@ fn test_restore() {
Added 1 files, modified 1 files, removed 1 files Added 1 files, modified 1 files, removed 1 files
[EOF] [EOF]
"); ");
let output = test_env.run_jj_in(&repo_path, ["diff", "-s"]); let output = work_dir.run_jj(["diff", "-s"]);
insta::assert_snapshot!(output, @""); insta::assert_snapshot!(output, @"");
// Can restore another revision from its parents // Can restore another revision from its parents
test_env.run_jj_in(&repo_path, ["undo"]).success(); work_dir.run_jj(["undo"]).success();
let output = test_env.run_jj_in(&repo_path, ["diff", "-s", "-r=@-"]); let output = work_dir.run_jj(["diff", "-s", "-r=@-"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
A file2 A file2
[EOF] [EOF]
"); ");
let output = test_env.run_jj_in(&repo_path, ["restore", "-c=@-"]); let output = work_dir.run_jj(["restore", "-c=@-"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created rlvkpnrz b9b6011e (empty) (no description set) Created rlvkpnrz b9b6011e (empty) (no description set)
@ -82,12 +81,12 @@ fn test_restore() {
Then run `jj squash` to move the resolution into the conflicted commit. Then run `jj squash` to move the resolution into the conflicted commit.
[EOF] [EOF]
"); ");
let output = test_env.run_jj_in(&repo_path, ["diff", "-s", "-r=@-"]); let output = work_dir.run_jj(["diff", "-s", "-r=@-"]);
insta::assert_snapshot!(output, @""); insta::assert_snapshot!(output, @"");
// Can restore this revision from another revision // Can restore this revision from another revision
test_env.run_jj_in(&repo_path, ["undo"]).success(); work_dir.run_jj(["undo"]).success();
let output = test_env.run_jj_in(&repo_path, ["restore", "--from", "@--"]); let output = work_dir.run_jj(["restore", "--from", "@--"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created kkmpptxz 1154634b (no description set) Created kkmpptxz 1154634b (no description set)
@ -96,15 +95,15 @@ fn test_restore() {
Added 1 files, modified 0 files, removed 2 files Added 1 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
let output = test_env.run_jj_in(&repo_path, ["diff", "-s"]); let output = work_dir.run_jj(["diff", "-s"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
D file2 D file2
[EOF] [EOF]
"); ");
// Can restore into other revision // Can restore into other revision
test_env.run_jj_in(&repo_path, ["undo"]).success(); work_dir.run_jj(["undo"]).success();
let output = test_env.run_jj_in(&repo_path, ["restore", "--into", "@-"]); let output = work_dir.run_jj(["restore", "--into", "@-"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created rlvkpnrz ad805965 (no description set) Created rlvkpnrz ad805965 (no description set)
@ -113,9 +112,9 @@ fn test_restore() {
Parent commit (@-) : rlvkpnrz ad805965 (no description set) Parent commit (@-) : rlvkpnrz ad805965 (no description set)
[EOF] [EOF]
"); ");
let output = test_env.run_jj_in(&repo_path, ["diff", "-s"]); let output = work_dir.run_jj(["diff", "-s"]);
insta::assert_snapshot!(output, @""); insta::assert_snapshot!(output, @"");
let output = test_env.run_jj_in(&repo_path, ["diff", "-s", "-r", "@-"]); let output = work_dir.run_jj(["diff", "-s", "-r", "@-"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
D file1 D file1
A file2 A file2
@ -124,8 +123,8 @@ fn test_restore() {
"); ");
// Can combine `--from` and `--into` // Can combine `--from` and `--into`
test_env.run_jj_in(&repo_path, ["undo"]).success(); work_dir.run_jj(["undo"]).success();
let output = test_env.run_jj_in(&repo_path, ["restore", "--from", "@", "--into", "@-"]); let output = work_dir.run_jj(["restore", "--from", "@", "--into", "@-"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created rlvkpnrz f256040a (no description set) Created rlvkpnrz f256040a (no description set)
@ -134,9 +133,9 @@ fn test_restore() {
Parent commit (@-) : rlvkpnrz f256040a (no description set) Parent commit (@-) : rlvkpnrz f256040a (no description set)
[EOF] [EOF]
"); ");
let output = test_env.run_jj_in(&repo_path, ["diff", "-s"]); let output = work_dir.run_jj(["diff", "-s"]);
insta::assert_snapshot!(output, @""); insta::assert_snapshot!(output, @"");
let output = test_env.run_jj_in(&repo_path, ["diff", "-s", "-r", "@-"]); let output = work_dir.run_jj(["diff", "-s", "-r", "@-"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
D file1 D file1
A file2 A file2
@ -145,8 +144,8 @@ fn test_restore() {
"); ");
// Can restore only specified paths // Can restore only specified paths
test_env.run_jj_in(&repo_path, ["undo"]).success(); work_dir.run_jj(["undo"]).success();
let output = test_env.run_jj_in(&repo_path, ["restore", "file2", "file3"]); let output = work_dir.run_jj(["restore", "file2", "file3"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created kkmpptxz 4ad35a2f (no description set) Created kkmpptxz 4ad35a2f (no description set)
@ -155,7 +154,7 @@ fn test_restore() {
Added 0 files, modified 1 files, removed 1 files Added 0 files, modified 1 files, removed 1 files
[EOF] [EOF]
"); ");
let output = test_env.run_jj_in(&repo_path, ["diff", "-s"]); let output = work_dir.run_jj(["diff", "-s"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
D file1 D file1
[EOF] [EOF]
@ -167,29 +166,14 @@ fn test_restore() {
fn test_restore_conflicted_merge() { fn test_restore_conflicted_merge() {
let test_env = TestEnvironment::default(); let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success(); test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let repo_path = test_env.env_root().join("repo"); let work_dir = test_env.work_dir("repo");
create_commit_with_files( create_commit_with_files(&work_dir, "base", &[], &[("file", "base\n")]);
&test_env.work_dir(&repo_path), create_commit_with_files(&work_dir, "a", &["base"], &[("file", "a\n")]);
"base", create_commit_with_files(&work_dir, "b", &["base"], &[("file", "b\n")]);
&[], create_commit_with_files(&work_dir, "conflict", &["a", "b"], &[]);
&[("file", "base\n")],
);
create_commit_with_files(
&test_env.work_dir(&repo_path),
"a",
&["base"],
&[("file", "a\n")],
);
create_commit_with_files(
&test_env.work_dir(&repo_path),
"b",
&["base"],
&[("file", "b\n")],
);
create_commit_with_files(&test_env.work_dir(&repo_path), "conflict", &["a", "b"], &[]);
// Test the setup // Test the setup
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ conflict @ conflict
├─╮ ├─╮
│ ○ b │ ○ b
@ -199,9 +183,7 @@ fn test_restore_conflicted_merge() {
◆ ◆
[EOF] [EOF]
"); ");
insta::assert_snapshot!( insta::assert_snapshot!(work_dir.read_file("file"), @r"
std::fs::read_to_string(repo_path.join("file")).unwrap()
, @r"
<<<<<<< Conflict 1 of 1 <<<<<<< Conflict 1 of 1
%%%%%%% Changes from base to side #1 %%%%%%% Changes from base to side #1
-base -base
@ -212,8 +194,8 @@ fn test_restore_conflicted_merge() {
"); ");
// Overwrite the file... // Overwrite the file...
std::fs::write(repo_path.join("file"), "resolution").unwrap(); work_dir.write_file("file", "resolution");
insta::assert_snapshot!(test_env.run_jj_in(&repo_path, ["diff"]), @r" insta::assert_snapshot!(work_dir.run_jj(["diff"]), @r"
Resolved conflict in file: Resolved conflict in file:
1 : <<<<<<< Conflict 1 of 1 1 : <<<<<<< Conflict 1 of 1
2 : %%%%%%% Changes from base to side #1 2 : %%%%%%% Changes from base to side #1
@ -227,7 +209,7 @@ fn test_restore_conflicted_merge() {
"); ");
// ...and restore it back again. // ...and restore it back again.
let output = test_env.run_jj_in(&repo_path, ["restore", "file"]); let output = work_dir.run_jj(["restore", "file"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created vruxwmqv 25a37060 conflict | (conflict) (empty) conflict Created vruxwmqv 25a37060 conflict | (conflict) (empty) conflict
@ -239,9 +221,7 @@ fn test_restore_conflicted_merge() {
file 2-sided conflict file 2-sided conflict
[EOF] [EOF]
"); ");
insta::assert_snapshot!( insta::assert_snapshot!(work_dir.read_file("file"), @r"
std::fs::read_to_string(repo_path.join("file")).unwrap()
, @r"
<<<<<<< Conflict 1 of 1 <<<<<<< Conflict 1 of 1
%%%%%%% Changes from base to side #1 %%%%%%% Changes from base to side #1
-base -base
@ -250,12 +230,12 @@ fn test_restore_conflicted_merge() {
b b
>>>>>>> Conflict 1 of 1 ends >>>>>>> Conflict 1 of 1 ends
"); ");
let output = test_env.run_jj_in(&repo_path, ["diff"]); let output = work_dir.run_jj(["diff"]);
insta::assert_snapshot!(output, @""); insta::assert_snapshot!(output, @"");
// The same, but without the `file` argument. Overwrite the file... // The same, but without the `file` argument. Overwrite the file...
std::fs::write(repo_path.join("file"), "resolution").unwrap(); work_dir.write_file("file", "resolution");
insta::assert_snapshot!(test_env.run_jj_in(&repo_path, ["diff"]), @r" insta::assert_snapshot!(work_dir.run_jj(["diff"]), @r"
Resolved conflict in file: Resolved conflict in file:
1 : <<<<<<< Conflict 1 of 1 1 : <<<<<<< Conflict 1 of 1
2 : %%%%%%% Changes from base to side #1 2 : %%%%%%% Changes from base to side #1
@ -269,7 +249,7 @@ fn test_restore_conflicted_merge() {
"); ");
// ... and restore it back again. // ... and restore it back again.
let output = test_env.run_jj_in(&repo_path, ["restore"]); let output = work_dir.run_jj(["restore"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created vruxwmqv f2c82b9c conflict | (conflict) (empty) conflict Created vruxwmqv f2c82b9c conflict | (conflict) (empty) conflict
@ -281,9 +261,7 @@ fn test_restore_conflicted_merge() {
file 2-sided conflict file 2-sided conflict
[EOF] [EOF]
"); ");
insta::assert_snapshot!( insta::assert_snapshot!(work_dir.read_file("file"), @r"
std::fs::read_to_string(repo_path.join("file")).unwrap()
, @r"
<<<<<<< Conflict 1 of 1 <<<<<<< Conflict 1 of 1
%%%%%%% Changes from base to side #1 %%%%%%% Changes from base to side #1
-base -base
@ -298,34 +276,19 @@ fn test_restore_conflicted_merge() {
fn test_restore_restore_descendants() { fn test_restore_restore_descendants() {
let test_env = TestEnvironment::default(); let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success(); test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let repo_path = test_env.env_root().join("repo"); let work_dir = test_env.work_dir("repo");
create_commit_with_files(&work_dir, "base", &[], &[("file", "base\n")]);
create_commit_with_files(&work_dir, "a", &["base"], &[("file", "a\n")]);
create_commit_with_files( create_commit_with_files(
&test_env.work_dir(&repo_path), &work_dir,
"base",
&[],
&[("file", "base\n")],
);
create_commit_with_files(
&test_env.work_dir(&repo_path),
"a",
&["base"],
&[("file", "a\n")],
);
create_commit_with_files(
&test_env.work_dir(&repo_path),
"b", "b",
&["base"], &["base"],
&[("file", "b\n"), ("file2", "b\n")], &[("file", "b\n"), ("file2", "b\n")],
); );
create_commit_with_files( create_commit_with_files(&work_dir, "ab", &["a", "b"], &[("file", "ab\n")]);
&test_env.work_dir(&repo_path),
"ab",
&["a", "b"],
&[("file", "ab\n")],
);
// Test the setup // Test the setup
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ ab @ ab
├─╮ ├─╮
│ ○ b │ ○ b
@ -335,15 +298,11 @@ fn test_restore_restore_descendants() {
◆ ◆
[EOF] [EOF]
"); ");
insta::assert_snapshot!( insta::assert_snapshot!(work_dir.read_file("file"), @"ab");
std::fs::read_to_string(repo_path.join("file")).unwrap(), @"ab");
// Commit "b" was not supposed to modify "file", restore it from its parent // Commit "b" was not supposed to modify "file", restore it from its parent
// while preserving its child commit content. // while preserving its child commit content.
let output = test_env.run_jj_in( let output = work_dir.run_jj(["restore", "-c", "b", "file", "--restore-descendants"]);
&repo_path,
["restore", "-c", "b", "file", "--restore-descendants"],
);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created royxmykx 3fd5aa05 b | b Created royxmykx 3fd5aa05 b | b
@ -356,7 +315,7 @@ fn test_restore_restore_descendants() {
// Check that "a", "b", and "ab" have their expected content by diffing them. // Check that "a", "b", and "ab" have their expected content by diffing them.
// "ab" must have kept its content. // "ab" must have kept its content.
insta::assert_snapshot!(test_env.run_jj_in(&repo_path, ["diff", "--from=a", "--to=ab", "--git"]), @r" insta::assert_snapshot!(work_dir.run_jj(["diff", "--from=a", "--to=ab", "--git"]), @r"
diff --git a/file b/file diff --git a/file b/file
index 7898192261..81bf396956 100644 index 7898192261..81bf396956 100644
--- a/file --- a/file
@ -373,7 +332,7 @@ fn test_restore_restore_descendants() {
+b +b
[EOF] [EOF]
"); ");
insta::assert_snapshot!(test_env.run_jj_in(&repo_path, ["diff", "--from=b", "--to=ab", "--git"]), @r" insta::assert_snapshot!(work_dir.run_jj(["diff", "--from=b", "--to=ab", "--git"]), @r"
diff --git a/file b/file diff --git a/file b/file
index df967b96a5..81bf396956 100644 index df967b96a5..81bf396956 100644
--- a/file --- a/file
@ -390,21 +349,16 @@ fn test_restore_interactive() {
let mut test_env = TestEnvironment::default(); let mut test_env = TestEnvironment::default();
let diff_editor = test_env.set_up_fake_diff_editor(); let diff_editor = test_env.set_up_fake_diff_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success(); test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let repo_path = test_env.env_root().join("repo"); let work_dir = test_env.work_dir("repo");
create_commit_with_files(&work_dir, "a", &[], &[("file1", "a1\n"), ("file2", "a2\n")]);
create_commit_with_files( create_commit_with_files(
&test_env.work_dir(&repo_path), &work_dir,
"a",
&[],
&[("file1", "a1\n"), ("file2", "a2\n")],
);
create_commit_with_files(
&test_env.work_dir(&repo_path),
"b", "b",
&["a"], &["a"],
&[("file1", "b1\n"), ("file2", "b2\n"), ("file3", "b3\n")], &[("file1", "b1\n"), ("file2", "b2\n"), ("file3", "b3\n")],
); );
let output = test_env.run_jj_in(&repo_path, ["log", "--summary"]); let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:11 b c0745ce2 @ zsuskuln test.user@example.com 2001-02-03 08:05:11 b c0745ce2
│ b │ b
@ -429,7 +383,7 @@ fn test_restore_interactive() {
std::fs::write(diff_editor, diff_script).unwrap(); std::fs::write(diff_editor, diff_script).unwrap();
// Restore file1 and file3 // Restore file1 and file3
let output = test_env.run_jj_in(&repo_path, ["restore", "-i", "--from=@-"]); let output = work_dir.run_jj(["restore", "-i", "--from=@-"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created zsuskuln bccde490 b | b Created zsuskuln bccde490 b | b
@ -448,7 +402,7 @@ fn test_restore_interactive() {
shows the contents you want for the destination commit. shows the contents you want for the destination commit.
"); ");
let output = test_env.run_jj_in(&repo_path, ["log", "--summary"]); let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:13 b bccde490 @ zsuskuln test.user@example.com 2001-02-03 08:05:13 b bccde490
│ b │ b
@ -462,8 +416,8 @@ fn test_restore_interactive() {
"); ");
// Try again with --tool, which should imply --interactive // Try again with --tool, which should imply --interactive
test_env.run_jj_in(&repo_path, ["undo"]).success(); work_dir.run_jj(["undo"]).success();
let output = test_env.run_jj_in(&repo_path, ["restore", "--tool=fake-diff-editor"]); let output = work_dir.run_jj(["restore", "--tool=fake-diff-editor"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created zsuskuln 5921de19 b | b Created zsuskuln 5921de19 b | b
@ -473,7 +427,7 @@ fn test_restore_interactive() {
[EOF] [EOF]
"); ");
let output = test_env.run_jj_in(&repo_path, ["log", "--summary"]); let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:16 b 5921de19 @ zsuskuln test.user@example.com 2001-02-03 08:05:16 b 5921de19
│ b │ b
@ -492,27 +446,17 @@ fn test_restore_interactive_merge() {
let mut test_env = TestEnvironment::default(); let mut test_env = TestEnvironment::default();
let diff_editor = test_env.set_up_fake_diff_editor(); let diff_editor = test_env.set_up_fake_diff_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success(); test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let repo_path = test_env.env_root().join("repo"); let work_dir = test_env.work_dir("repo");
create_commit_with_files(&work_dir, "a", &[], &[("file1", "a1\n")]);
create_commit_with_files(&work_dir, "b", &[], &[("file2", "b1\n")]);
create_commit_with_files( create_commit_with_files(
&test_env.work_dir(&repo_path), &work_dir,
"a",
&[],
&[("file1", "a1\n")],
);
create_commit_with_files(
&test_env.work_dir(&repo_path),
"b",
&[],
&[("file2", "b1\n")],
);
create_commit_with_files(
&test_env.work_dir(&repo_path),
"c", "c",
&["a", "b"], &["a", "b"],
&[("file1", "c1\n"), ("file2", "c2\n"), ("file3", "c3\n")], &[("file1", "c1\n"), ("file2", "c2\n"), ("file3", "c3\n")],
); );
let output = test_env.run_jj_in(&repo_path, ["log", "--summary"]); let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
@ royxmykx test.user@example.com 2001-02-03 08:05:13 c 34042291 @ royxmykx test.user@example.com 2001-02-03 08:05:13 c 34042291
├─╮ c ├─╮ c
@ -539,7 +483,7 @@ fn test_restore_interactive_merge() {
std::fs::write(diff_editor, diff_script).unwrap(); std::fs::write(diff_editor, diff_script).unwrap();
// Restore file1 and file3 // Restore file1 and file3
let output = test_env.run_jj_in(&repo_path, ["restore", "-i"]); let output = work_dir.run_jj(["restore", "-i"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created royxmykx 72e0cbf4 c | c Created royxmykx 72e0cbf4 c | c
@ -560,7 +504,7 @@ fn test_restore_interactive_merge() {
shows the contents you want for the destination commit. shows the contents you want for the destination commit.
"); ");
let output = test_env.run_jj_in(&repo_path, ["log", "--summary"]); let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
@ royxmykx test.user@example.com 2001-02-03 08:05:15 c 72e0cbf4 @ royxmykx test.user@example.com 2001-02-03 08:05:15 c 72e0cbf4
├─╮ c ├─╮ c
@ -581,21 +525,16 @@ fn test_restore_interactive_with_paths() {
let mut test_env = TestEnvironment::default(); let mut test_env = TestEnvironment::default();
let diff_editor = test_env.set_up_fake_diff_editor(); let diff_editor = test_env.set_up_fake_diff_editor();
test_env.run_jj_in(".", ["git", "init", "repo"]).success(); test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let repo_path = test_env.env_root().join("repo"); let work_dir = test_env.work_dir("repo");
create_commit_with_files(&work_dir, "a", &[], &[("file1", "a1\n"), ("file2", "a2\n")]);
create_commit_with_files( create_commit_with_files(
&test_env.work_dir(&repo_path), &work_dir,
"a",
&[],
&[("file1", "a1\n"), ("file2", "a2\n")],
);
create_commit_with_files(
&test_env.work_dir(&repo_path),
"b", "b",
&["a"], &["a"],
&[("file1", "b1\n"), ("file2", "b2\n"), ("file3", "b3\n")], &[("file1", "b1\n"), ("file2", "b2\n"), ("file3", "b3\n")],
); );
let output = test_env.run_jj_in(&repo_path, ["log", "--summary"]); let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:11 b c0745ce2 @ zsuskuln test.user@example.com 2001-02-03 08:05:11 b c0745ce2
│ b │ b
@ -619,7 +558,7 @@ fn test_restore_interactive_with_paths() {
std::fs::write(diff_editor, diff_script).unwrap(); std::fs::write(diff_editor, diff_script).unwrap();
// Restore file1 (file2 is reset by interactive editor) // Restore file1 (file2 is reset by interactive editor)
let output = test_env.run_jj_in(&repo_path, ["restore", "-i", "file1", "file2"]); let output = work_dir.run_jj(["restore", "-i", "file1", "file2"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created zsuskuln 7187da33 b | b Created zsuskuln 7187da33 b | b
@ -629,7 +568,7 @@ fn test_restore_interactive_with_paths() {
[EOF] [EOF]
"); ");
let output = test_env.run_jj_in(&repo_path, ["log", "--summary"]); let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:13 b 7187da33 @ zsuskuln test.user@example.com 2001-02-03 08:05:13 b 7187da33
│ b │ b
@ -645,6 +584,6 @@ fn test_restore_interactive_with_paths() {
} }
#[must_use] #[must_use]
fn get_log_output(test_env: &TestEnvironment, repo_path: &Path) -> CommandOutput { fn get_log_output(work_dir: &TestWorkDir) -> CommandOutput {
test_env.run_jj_in(repo_path, ["log", "-T", "bookmarks"]) work_dir.run_jj(["log", "-T", "bookmarks"])
} }