// 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 crate::common::TestEnvironment; #[test]fn test_restore() { 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"), "a\n").unwrap(); test_env.jj_cmd_ok(&repo_path, &["new"]); std::fs::write(repo_path.join("file2"), "b\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"), "c\n").unwrap(); std::fs::write(repo_path.join("file3"), "c\n").unwrap(); // There is no `-r` argument let stderr = test_env.jj_cmd_failure(&repo_path, &["restore", "-r=@-"]); insta::assert_snapshot!(stderr, @r###" Error: `jj restore` does not have a `--revision`/`-r` option. If you'd like to modify the *current* revision, use `--from`. If you'd like to modify a *different* revision, use `--to` or `--changes-in`. "###); // Restores from parent by default let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Created kkmpptxz 370d81ea (empty) (no description set) Working copy now at: kkmpptxz 370d81ea (empty) (no description set) Parent commit : rlvkpnrz ef160660 (no description set) Added 1 files, modified 1 files, removed 1 files "###); let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]); insta::assert_snapshot!(stdout, @""); // Can restore another revision from its parents test_env.jj_cmd_ok(&repo_path, &["undo"]); let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s", "-r=@-"]); insta::assert_snapshot!(stdout, @r###" A file2 "###); let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore", "-c=@-"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Created rlvkpnrz b9b6011e (empty) (no description set) Rebased 1 descendant commits Working copy now at: kkmpptxz d05c4d2a (conflict) (no description set) Parent commit : rlvkpnrz b9b6011e (empty) (no description set) Added 0 files, modified 1 files, removed 0 files There are unresolved conflicts at these paths: file2 2-sided conflict including 1 deletion New conflicts appeared in these commits: kkmpptxz d05c4d2a (conflict) (no description set) To resolve the conflicts, start by updating to it: jj new kkmpptxz Then use `jj resolve`, or edit the conflict markers in the file directly. Once the conflicts are resolved, you may want to inspect the result with `jj diff`. Then run `jj squash` to move the resolution into the conflicted commit. "###); let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s", "-r=@-"]); insta::assert_snapshot!(stdout, @""); // Can restore this revision from another revision test_env.jj_cmd_ok(&repo_path, &["undo"]); let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore", "--from", "@--"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Created kkmpptxz 1154634b (no description set) Working copy now at: kkmpptxz 1154634b (no description set) Parent commit : rlvkpnrz ef160660 (no description set) Added 1 files, modified 0 files, removed 2 files "###); let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]); insta::assert_snapshot!(stdout, @r###" D file2 "###); // Can restore into other revision test_env.jj_cmd_ok(&repo_path, &["undo"]); let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore", "--to", "@-"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Created rlvkpnrz ad805965 (no description set) Rebased 1 descendant commits Working copy now at: kkmpptxz 3fcdcbf2 (empty) (no description set) Parent commit : rlvkpnrz ad805965 (no description set) "###); let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]); insta::assert_snapshot!(stdout, @""); let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s", "-r", "@-"]); insta::assert_snapshot!(stdout, @r###" D file1 A file2 A file3 "###); // Can combine `--from` and `--to` test_env.jj_cmd_ok(&repo_path, &["undo"]); let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore", "--from", "@", "--to", "@-"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Created rlvkpnrz f256040a (no description set) Rebased 1 descendant commits Working copy now at: kkmpptxz 9c6f2083 (empty) (no description set) Parent commit : rlvkpnrz f256040a (no description set) "###); let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]); insta::assert_snapshot!(stdout, @""); let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s", "-r", "@-"]); insta::assert_snapshot!(stdout, @r###" D file1 A file2 A file3 "###); // Can restore only specified paths test_env.jj_cmd_ok(&repo_path, &["undo"]); let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore", "file2", "file3"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Created kkmpptxz 4ad35a2f (no description set) Working copy now at: kkmpptxz 4ad35a2f (no description set) Parent commit : rlvkpnrz ef160660 (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 "###);} // Much of this test is copied from test_resolve_command#[test]fn test_restore_conflicted_merge() { 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"); create_commit(&test_env, &repo_path, "base", &[], &[("file", "base\n")]); create_commit(&test_env, &repo_path, "a", &["base"], &[("file", "a\n")]); create_commit(&test_env, &repo_path, "b", &["base"], &[("file", "b\n")]); create_commit(&test_env, &repo_path, "conflict", &["a", "b"], &[]); // Test the setup insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###" @ conflict ├─╮ │ ○ b ○ │ a ├─╯ ○ base ◆ "###); insta::assert_snapshot!( std::fs::read_to_string(repo_path.join("file")).unwrap() , @r###" <<<<<<< Conflict 1 of 1 %%%%%%% Changes from base to side #1 -base +a +++++++ Contents of side #2 b >>>>>>> Conflict 1 of 1 ends "###); // Overwrite the file... std::fs::write(repo_path.join("file"), "resolution").unwrap(); insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["diff"]), @r###" Resolved conflict in file: 1 : <<<<<<< Conflict 1 of 1 2 : %%%%%%% Changes from base to side #1 3 : -base 4 : +a 5 : +++++++ Contents of side #2 6 : b 7 : >>>>>>> Conflict 1 of 1 ends 1: resolution "###); // ...and restore it back again. let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore", "file"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Created vruxwmqv 126facb5 conflict | (conflict) (empty) conflict Working copy now at: vruxwmqv 126facb5 conflict | (conflict) (empty) conflict Parent commit : zsuskuln aa493daf a | a Parent commit : royxmykx db6a4daf b | b Added 0 files, modified 1 files, removed 0 files There are unresolved conflicts at these paths: file 2-sided conflict "###); insta::assert_snapshot!( std::fs::read_to_string(repo_path.join("file")).unwrap() , @r###" <<<<<<< Conflict 1 of 1 %%%%%%% Changes from base to side #1 -base +a +++++++ Contents of side #2 b >>>>>>> Conflict 1 of 1 ends "###); let stdout = test_env.jj_cmd_success(&repo_path, &["diff"]); insta::assert_snapshot!(stdout, @""); // The same, but without the `file` argument. Overwrite the file... std::fs::write(repo_path.join("file"), "resolution").unwrap(); insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["diff"]), @r###" Resolved conflict in file: 1 : <<<<<<< Conflict 1 of 1 2 : %%%%%%% Changes from base to side #1 3 : -base 4 : +a 5 : +++++++ Contents of side #2 6 : b 7 : >>>>>>> Conflict 1 of 1 ends 1: resolution "###); // ... and restore it back again. let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Created vruxwmqv b553ebcf conflict | (conflict) (empty) conflict Working copy now at: vruxwmqv b553ebcf conflict | (conflict) (empty) conflict Parent commit : zsuskuln aa493daf a | a Parent commit : royxmykx db6a4daf b | b Added 0 files, modified 1 files, removed 0 files There are unresolved conflicts at these paths: file 2-sided conflict "###); insta::assert_snapshot!( std::fs::read_to_string(repo_path.join("file")).unwrap() , @r###" <<<<<<< Conflict 1 of 1 %%%%%%% Changes from base to side #1 -base +a +++++++ Contents of side #2 b >>>>>>> Conflict 1 of 1 ends "###);} #[test]fn test_restore_restore_descendants() { 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"); create_commit(&test_env, &repo_path, "base", &[], &[("file", "base\n")]); create_commit(&test_env, &repo_path, "a", &["base"], &[("file", "a\n")]); create_commit( &test_env, &repo_path, "b", &["base"], &[("file", "b\n"), ("file2", "b\n")], ); create_commit( &test_env, &repo_path, "ab", &["a", "b"], &[("file", "ab\n")], ); // Test the setup insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r#" @ ab ├─╮ │ ○ b ○ │ a ├─╯ ○ base ◆ "#); insta::assert_snapshot!( std::fs::read_to_string(repo_path.join("file")).unwrap(), @r#" ab "#); // Commit "b" was not supposed to modify "file", restore it from its parent // while preserving its child commit content. let (stdout, stderr) = test_env.jj_cmd_ok( &repo_path, &["restore", "-c", "b", "file", "--restore-descendants"], ); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r#" Created royxmykx 3fd5aa05 b | b Rebased 1 descendant commits (while preserving their content) Working copy now at: vruxwmqv bf5491a0 ab | ab Parent commit : zsuskuln aa493daf a | a Parent commit : royxmykx 3fd5aa05 b | b "#); // Check that "a", "b", and "ab" have their expected content by diffing them. // "ab" must have kept its content. insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["diff", "--from=a", "--to=ab", "--git"]), @r#" diff --git a/file b/file index 7898192261..81bf396956 100644 --- a/file +++ b/file @@ -1,1 +1,1 @@ -a +ab diff --git a/file2 b/file2 new file mode 100644 index 0000000000..6178079822 --- /dev/null +++ b/file2 @@ -1,0 +1,1 @@ +b "#); insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["diff", "--from=b", "--to=ab", "--git"]), @r#" diff --git a/file b/file index df967b96a5..81bf396956 100644 --- a/file +++ b/file @@ -1,1 +1,1 @@ -base +ab "#);} fn create_commit( test_env: &TestEnvironment, repo_path: &Path, name: &str, parents: &[&str], files: &[(&str, &str)],) { if parents.is_empty() { test_env.jj_cmd_ok(repo_path, &["new", "root()", "-m", name]); } else { let mut args = vec!["new", "-m", name]; args.extend(parents); test_env.jj_cmd_ok(repo_path, &args); } for (name, content) in files { std::fs::write(repo_path.join(name), content).unwrap(); } test_env.jj_cmd_ok(repo_path, &["bookmark", "create", name]);} fn get_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String { test_env.jj_cmd_success(repo_path, &["log", "-T", "bookmarks"])}
// 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 crate::common::TestEnvironment;
#[test]
fn test_restore() {
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"), "a\n").unwrap();
test_env.jj_cmd_ok(&repo_path, &["new"]);
std::fs::write(repo_path.join("file2"), "b\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"), "c\n").unwrap();
std::fs::write(repo_path.join("file3"), "c\n").unwrap();
// There is no `-r` argument
let stderr = test_env.jj_cmd_failure(&repo_path, &["restore", "-r=@-"]);
insta::assert_snapshot!(stderr, @r###"
Error: `jj restore` does not have a `--revision`/`-r` option. If you'd like to modify
the *current* revision, use `--from`. If you'd like to modify a *different* revision,
use `--to` or `--changes-in`.
"###);
// Restores from parent by default
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore"]);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Created kkmpptxz 370d81ea (empty) (no description set)
Working copy now at: kkmpptxz 370d81ea (empty) (no description set)
Parent commit : rlvkpnrz ef160660 (no description set)
Added 1 files, modified 1 files, removed 1 files
"###);
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
insta::assert_snapshot!(stdout, @"");
// Can restore another revision from its parents
test_env.jj_cmd_ok(&repo_path, &["undo"]);
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s", "-r=@-"]);
insta::assert_snapshot!(stdout, @r###"
A file2
"###);
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore", "-c=@-"]);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Created rlvkpnrz b9b6011e (empty) (no description set)
Rebased 1 descendant commits
Working copy now at: kkmpptxz d05c4d2a (conflict) (no description set)
Parent commit : rlvkpnrz b9b6011e (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files
There are unresolved conflicts at these paths:
file2 2-sided conflict including 1 deletion
New conflicts appeared in these commits:
kkmpptxz d05c4d2a (conflict) (no description set)
To resolve the conflicts, start by updating to it:
jj new kkmpptxz
Then use `jj resolve`, or edit the conflict markers in the file directly.
Once the conflicts are resolved, you may want to inspect the result with `jj diff`.
Then run `jj squash` to move the resolution into the conflicted commit.
"###);
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s", "-r=@-"]);
insta::assert_snapshot!(stdout, @"");
// Can restore this revision from another revision
test_env.jj_cmd_ok(&repo_path, &["undo"]);
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore", "--from", "@--"]);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Created kkmpptxz 1154634b (no description set)
Working copy now at: kkmpptxz 1154634b (no description set)
Parent commit : rlvkpnrz ef160660 (no description set)
Added 1 files, modified 0 files, removed 2 files
"###);
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
insta::assert_snapshot!(stdout, @r###"
D file2
"###);
// Can restore into other revision
test_env.jj_cmd_ok(&repo_path, &["undo"]);
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore", "--to", "@-"]);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Created rlvkpnrz ad805965 (no description set)
Rebased 1 descendant commits
Working copy now at: kkmpptxz 3fcdcbf2 (empty) (no description set)
Parent commit : rlvkpnrz ad805965 (no description set)
"###);
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
insta::assert_snapshot!(stdout, @"");
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s", "-r", "@-"]);
insta::assert_snapshot!(stdout, @r###"
D file1
A file2
A file3
"###);
// Can combine `--from` and `--to`
test_env.jj_cmd_ok(&repo_path, &["undo"]);
let (stdout, stderr) =
test_env.jj_cmd_ok(&repo_path, &["restore", "--from", "@", "--to", "@-"]);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Created rlvkpnrz f256040a (no description set)
Rebased 1 descendant commits
Working copy now at: kkmpptxz 9c6f2083 (empty) (no description set)
Parent commit : rlvkpnrz f256040a (no description set)
"###);
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
insta::assert_snapshot!(stdout, @"");
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s", "-r", "@-"]);
insta::assert_snapshot!(stdout, @r###"
D file1
A file2
A file3
"###);
// Can restore only specified paths
test_env.jj_cmd_ok(&repo_path, &["undo"]);
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore", "file2", "file3"]);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Created kkmpptxz 4ad35a2f (no description set)
Working copy now at: kkmpptxz 4ad35a2f (no description set)
Parent commit : rlvkpnrz ef160660 (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
"###);
}
// Much of this test is copied from test_resolve_command
#[test]
fn test_restore_conflicted_merge() {
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");
create_commit(&test_env, &repo_path, "base", &[], &[("file", "base\n")]);
create_commit(&test_env, &repo_path, "a", &["base"], &[("file", "a\n")]);
create_commit(&test_env, &repo_path, "b", &["base"], &[("file", "b\n")]);
create_commit(&test_env, &repo_path, "conflict", &["a", "b"], &[]);
// Test the setup
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
@ conflict
├─╮
│ ○ b
○ │ a
├─╯
○ base
◆
"###);
insta::assert_snapshot!(
std::fs::read_to_string(repo_path.join("file")).unwrap()
, @r###"
<<<<<<< Conflict 1 of 1
%%%%%%% Changes from base to side #1
-base
+a
+++++++ Contents of side #2
b
>>>>>>> Conflict 1 of 1 ends
"###);
// Overwrite the file...
std::fs::write(repo_path.join("file"), "resolution").unwrap();
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["diff"]),
@r###"
Resolved conflict in file:
1 : <<<<<<< Conflict 1 of 1
2 : %%%%%%% Changes from base to side #1
3 : -base
4 : +a
5 : +++++++ Contents of side #2
6 : b
7 : >>>>>>> Conflict 1 of 1 ends
1: resolution
"###);
// ...and restore it back again.
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore", "file"]);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Created vruxwmqv 126facb5 conflict | (conflict) (empty) conflict
Working copy now at: vruxwmqv 126facb5 conflict | (conflict) (empty) conflict
Parent commit : zsuskuln aa493daf a | a
Parent commit : royxmykx db6a4daf b | b
Added 0 files, modified 1 files, removed 0 files
There are unresolved conflicts at these paths:
file 2-sided conflict
"###);
insta::assert_snapshot!(
std::fs::read_to_string(repo_path.join("file")).unwrap()
, @r###"
<<<<<<< Conflict 1 of 1
%%%%%%% Changes from base to side #1
-base
+a
+++++++ Contents of side #2
b
>>>>>>> Conflict 1 of 1 ends
"###);
let stdout = test_env.jj_cmd_success(&repo_path, &["diff"]);
insta::assert_snapshot!(stdout, @"");
// The same, but without the `file` argument. Overwrite the file...
std::fs::write(repo_path.join("file"), "resolution").unwrap();
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["diff"]),
@r###"
Resolved conflict in file:
1 : <<<<<<< Conflict 1 of 1
2 : %%%%%%% Changes from base to side #1
3 : -base
4 : +a
5 : +++++++ Contents of side #2
6 : b
7 : >>>>>>> Conflict 1 of 1 ends
1: resolution
"###);
// ... and restore it back again.
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["restore"]);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Created vruxwmqv b553ebcf conflict | (conflict) (empty) conflict
Working copy now at: vruxwmqv b553ebcf conflict | (conflict) (empty) conflict
Parent commit : zsuskuln aa493daf a | a
Parent commit : royxmykx db6a4daf b | b
Added 0 files, modified 1 files, removed 0 files
There are unresolved conflicts at these paths:
file 2-sided conflict
"###);
insta::assert_snapshot!(
std::fs::read_to_string(repo_path.join("file")).unwrap()
, @r###"
<<<<<<< Conflict 1 of 1
%%%%%%% Changes from base to side #1
-base
+a
+++++++ Contents of side #2
b
>>>>>>> Conflict 1 of 1 ends
"###);
}
#[test]
fn test_restore_restore_descendants() {
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");
create_commit(&test_env, &repo_path, "base", &[], &[("file", "base\n")]);
create_commit(&test_env, &repo_path, "a", &["base"], &[("file", "a\n")]);
create_commit(
&test_env,
&repo_path,
"b",
&["base"],
&[("file", "b\n"), ("file2", "b\n")],
);
create_commit(
&test_env,
&repo_path,
"ab",
&["a", "b"],
&[("file", "ab\n")],
);
// Test the setup
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r#"
@ ab
├─╮
│ ○ b
○ │ a
├─╯
○ base
◆
"#);
insta::assert_snapshot!(
std::fs::read_to_string(repo_path.join("file")).unwrap(), @r#"
ab
"#);
// Commit "b" was not supposed to modify "file", restore it from its parent
// while preserving its child commit content.
let (stdout, stderr) = test_env.jj_cmd_ok(
&repo_path,
&["restore", "-c", "b", "file", "--restore-descendants"],
);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r#"
Created royxmykx 3fd5aa05 b | b
Rebased 1 descendant commits (while preserving their content)
Working copy now at: vruxwmqv bf5491a0 ab | ab
Parent commit : zsuskuln aa493daf a | a
Parent commit : royxmykx 3fd5aa05 b | b
"#);
// Check that "a", "b", and "ab" have their expected content by diffing them.
// "ab" must have kept its content.
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["diff", "--from=a", "--to=ab", "--git"]), @r#"
diff --git a/file b/file
index 7898192261..81bf396956 100644
--- a/file
+++ b/file
@@ -1,1 +1,1 @@
-a
+ab
diff --git a/file2 b/file2
new file mode 100644
index 0000000000..6178079822
--- /dev/null
+++ b/file2
@@ -1,0 +1,1 @@
+b
"#);
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["diff", "--from=b", "--to=ab", "--git"]), @r#"
diff --git a/file b/file
index df967b96a5..81bf396956 100644
--- a/file
+++ b/file
@@ -1,1 +1,1 @@
-base
+ab
"#);
}
fn create_commit(
test_env: &TestEnvironment,
repo_path: &Path,
name: &str,
parents: &[&str],
files: &[(&str, &str)],
) {
if parents.is_empty() {
test_env.jj_cmd_ok(repo_path, &["new", "root()", "-m", name]);
} else {
let mut args = vec!["new", "-m", name];
args.extend(parents);
test_env.jj_cmd_ok(repo_path, &args);
}
for (name, content) in files {
std::fs::write(repo_path.join(name), content).unwrap();
}
test_env.jj_cmd_ok(repo_path, &["bookmark", "create", name]);
}
fn get_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String {
test_env.jj_cmd_success(repo_path, &["log", "-T", "bookmarks"])
}