mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-28 15:34:22 +00:00
4d42604913
We haven't used custom Git commit headers for two main reasons: 1. I don't want commits created by jj to be different from any other commits. I don't want Git projects to get annoyed by such commit and reject them. 2. I've been concerned that tools don't know how to handle such headers, perhaps even resulting in crashes. The first argument doesn't apply to commits with conflicts because such commits would never be accepted by a project whether or not they use custom commit headers. The second argument is less relevant for conflicted commits because most tools will be confused by such commits anyway. Storing conflict information in commit headers means that we can transfer them via the regular Git wire protocol. We already include the tree objects nested inside the root-level tree, so they will also be transferred. So, let's start by writing the information redundantly to the commit header and to the existing storage. That way we can roll it back if we realize there's a problem with using commit headers.
280 lines
10 KiB
Rust
280 lines
10 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 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(), &["init", "repo", "--git"]);
|
|
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 ed1678e3 (empty) (no description set)
|
|
Working copy now at: kkmpptxz ed1678e3 (empty) (no description set)
|
|
Parent commit : rlvkpnrz 1a986a27 (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 e25100af (empty) (no description set)
|
|
Rebased 1 descendant commits
|
|
New conflicts appeared in these commits:
|
|
kkmpptxz 761deaef (conflict) (no description set)
|
|
To resolve the conflicts, start by updating to it:
|
|
jj new kkmpptxzrspx
|
|
Then use `jj resolve`, or edit the conflict markers in the file directly.
|
|
Once the conflicts are resolved, you may want inspect the result with `jj diff`.
|
|
Then run `jj squash` to move the resolution into the conflicted commit.
|
|
Working copy now at: kkmpptxz 761deaef (conflict) (no description set)
|
|
Parent commit : rlvkpnrz e25100af (empty) (no description set)
|
|
Added 0 files, modified 1 files, removed 0 files
|
|
"###);
|
|
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 1dd6eb63 (no description set)
|
|
Working copy now at: kkmpptxz 1dd6eb63 (no description set)
|
|
Parent commit : rlvkpnrz 1a986a27 (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 ec9d5b59 (no description set)
|
|
Rebased 1 descendant commits
|
|
Working copy now at: kkmpptxz d6f3c681 (empty) (no description set)
|
|
Parent commit : rlvkpnrz ec9d5b59 (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 5f6eb3d5 (no description set)
|
|
Rebased 1 descendant commits
|
|
Working copy now at: kkmpptxz 525afd5d (empty) (no description set)
|
|
Parent commit : rlvkpnrz 5f6eb3d5 (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 569ce73d (no description set)
|
|
Working copy now at: kkmpptxz 569ce73d (no description set)
|
|
Parent commit : rlvkpnrz 1a986a27 (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(), &["init", "repo", "--git"]);
|
|
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###"
|
|
<<<<<<<
|
|
%%%%%%%
|
|
-base
|
|
+a
|
|
+++++++
|
|
b
|
|
>>>>>>>
|
|
"###);
|
|
|
|
// 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 : <<<<<<<
|
|
2 : %%%%%%%
|
|
3 : -base
|
|
4 : +a
|
|
5 : +++++++
|
|
6 : b
|
|
7 : >>>>>>>
|
|
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 0817af7e conflict | (conflict) (empty) conflict
|
|
Working copy now at: vruxwmqv 0817af7e 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
|
|
"###);
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(repo_path.join("file")).unwrap()
|
|
, @r###"
|
|
<<<<<<<
|
|
%%%%%%%
|
|
-base
|
|
+a
|
|
+++++++
|
|
b
|
|
>>>>>>>
|
|
"###);
|
|
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 : <<<<<<<
|
|
2 : %%%%%%%
|
|
3 : -base
|
|
4 : +a
|
|
5 : +++++++
|
|
6 : b
|
|
7 : >>>>>>>
|
|
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 da925083 conflict | (conflict) (empty) conflict
|
|
Working copy now at: vruxwmqv da925083 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
|
|
"###);
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(repo_path.join("file")).unwrap()
|
|
, @r###"
|
|
<<<<<<<
|
|
%%%%%%%
|
|
-base
|
|
+a
|
|
+++++++
|
|
b
|
|
>>>>>>>
|
|
"###);
|
|
}
|
|
|
|
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, &["branch", "create", name]);
|
|
}
|
|
|
|
fn get_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String {
|
|
test_env.jj_cmd_success(repo_path, &["log", "-T", "branches"])
|
|
}
|