forked from mirrors/jj
d6e97883df
This implements a building block of "signed-off-by line" #1399 and "commit --verbose" #1946. We'll probably need an easy way to customize the diff part, but I'm not sure if it can be as simple as a template alias function. User might want to embed diffs without "JJ: " prefixes? Perhaps, we can deprecate "ui.default-description", but it's not addressed in this patch. It could be replaced with "default_description" template alias, but we might want to configure default per command. Suppose we add a default "backout_description" template, it would have to be rendered against the source commit, not the newly-created backout commit. The template key is named as "draft_commit_description" because it is the template to generate an editor template. "templates.commit_description_template" sounds a bit odd. There's one minor behavior change: the default description is now terminated by "\n". Closes #1354
606 lines
23 KiB
Rust
606 lines
23 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, PathBuf};
|
|
|
|
use crate::common::TestEnvironment;
|
|
|
|
fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> String {
|
|
let template = r#"separate(" ", change_id.short(), empty, description, local_branches)"#;
|
|
test_env.jj_cmd_success(cwd, &["log", "-T", template])
|
|
}
|
|
|
|
fn get_recorded_dates(test_env: &TestEnvironment, cwd: &Path, revset: &str) -> String {
|
|
let template = r#"separate("\n", "Author date: " ++ author.timestamp(), "Committer date: " ++ committer.timestamp())"#;
|
|
test_env.jj_cmd_success(cwd, &["log", "--no-graph", "-T", template, "-r", revset])
|
|
}
|
|
|
|
#[test]
|
|
fn test_split_by_paths() {
|
|
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"), "foo").unwrap();
|
|
std::fs::write(repo_path.join("file2"), "foo").unwrap();
|
|
std::fs::write(repo_path.join("file3"), "foo").unwrap();
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ qpvuntsmwlqt false
|
|
◆ zzzzzzzzzzzz true
|
|
"###);
|
|
insta::assert_snapshot!(get_recorded_dates(&test_env, &repo_path,"@"), @r###"
|
|
Author date: 2001-02-03 04:05:08.000 +07:00
|
|
Committer date: 2001-02-03 04:05:08.000 +07:00
|
|
"###);
|
|
|
|
let edit_script = test_env.set_up_fake_editor();
|
|
std::fs::write(
|
|
edit_script,
|
|
["dump editor0", "next invocation\n", "dump editor1"].join("\0"),
|
|
)
|
|
.unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["split", "file2"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
First part: qpvuntsm 65569ca7 (no description set)
|
|
Second part: zsuskuln 709756f0 (no description set)
|
|
Working copy now at: zsuskuln 709756f0 (no description set)
|
|
Parent commit : qpvuntsm 65569ca7 (no description set)
|
|
"###);
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(test_env.env_root().join("editor0")).unwrap(), @r###"
|
|
JJ: Enter a description for the first commit.
|
|
|
|
JJ: This commit contains the following changes:
|
|
JJ: A file2
|
|
|
|
JJ: Lines starting with "JJ: " (like this one) will be removed.
|
|
"###);
|
|
assert!(!test_env.env_root().join("editor1").exists());
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ zsuskulnrvyr false
|
|
○ qpvuntsmwlqt false
|
|
◆ zzzzzzzzzzzz true
|
|
"###);
|
|
|
|
// The author dates of the new commits should be inherited from the commit being
|
|
// split. The committer dates should be newer.
|
|
insta::assert_snapshot!(get_recorded_dates(&test_env, &repo_path,"@"), @r###"
|
|
Author date: 2001-02-03 04:05:08.000 +07:00
|
|
Committer date: 2001-02-03 04:05:10.000 +07:00
|
|
"###);
|
|
insta::assert_snapshot!(get_recorded_dates(&test_env, &repo_path,"@-"), @r###"
|
|
Author date: 2001-02-03 04:05:08.000 +07:00
|
|
Committer date: 2001-02-03 04:05:10.000 +07:00
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s", "-r", "@-"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
A file2
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
A file1
|
|
A file3
|
|
"###);
|
|
|
|
// Insert an empty commit after @- with "split ."
|
|
test_env.set_up_fake_editor();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["split", "-r", "@-", "."]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Rebased 1 descendant commits
|
|
First part: qpvuntsm 9da0eea0 (no description set)
|
|
Second part: znkkpsqq 5b5714a3 (empty) (no description set)
|
|
Working copy now at: zsuskuln 0c798ee7 (no description set)
|
|
Parent commit : znkkpsqq 5b5714a3 (empty) (no description set)
|
|
"###);
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ zsuskulnrvyr false
|
|
○ znkkpsqqskkl true
|
|
○ qpvuntsmwlqt false
|
|
◆ zzzzzzzzzzzz true
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s", "-r", "@--"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
A file2
|
|
"###);
|
|
|
|
// Remove newly created empty commit
|
|
test_env.jj_cmd_ok(&repo_path, &["abandon", "@-"]);
|
|
|
|
// Insert an empty commit before @- with "split nonexistent"
|
|
test_env.set_up_fake_editor();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["split", "-r", "@-", "nonexistent"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Warning: The given paths do not match any file: nonexistent
|
|
Rebased 1 descendant commits
|
|
First part: qpvuntsm bd42f95a (empty) (no description set)
|
|
Second part: lylxulpl ed55c86b (no description set)
|
|
Working copy now at: zsuskuln 1e1ed741 (no description set)
|
|
Parent commit : lylxulpl ed55c86b (no description set)
|
|
"###);
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ zsuskulnrvyr false
|
|
○ lylxulplsnyw false
|
|
○ qpvuntsmwlqt true
|
|
◆ zzzzzzzzzzzz true
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["diff", "-s", "-r", "@-"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
A file2
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_split_with_non_empty_description() {
|
|
let mut test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
|
|
std::fs::write(workspace_path.join("file1"), "foo\n").unwrap();
|
|
std::fs::write(workspace_path.join("file2"), "bar\n").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_path, &["describe", "-m", "test"]);
|
|
let edit_script = test_env.set_up_fake_editor();
|
|
std::fs::write(
|
|
edit_script,
|
|
[
|
|
"dump editor1",
|
|
"write\npart 1",
|
|
"next invocation\n",
|
|
"dump editor2",
|
|
"write\npart 2",
|
|
]
|
|
.join("\0"),
|
|
)
|
|
.unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_path, &["split", "file1"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
First part: qpvuntsm 231a3c00 part 1
|
|
Second part: kkmpptxz e96291aa part 2
|
|
Working copy now at: kkmpptxz e96291aa part 2
|
|
Parent commit : qpvuntsm 231a3c00 part 1
|
|
"###);
|
|
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r###"
|
|
JJ: Enter a description for the first commit.
|
|
test
|
|
|
|
JJ: This commit contains the following changes:
|
|
JJ: A file1
|
|
|
|
JJ: Lines starting with "JJ: " (like this one) will be removed.
|
|
"###);
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(test_env.env_root().join("editor2")).unwrap(), @r###"
|
|
JJ: Enter a description for the second commit.
|
|
test
|
|
|
|
JJ: This commit contains the following changes:
|
|
JJ: A file2
|
|
|
|
JJ: Lines starting with "JJ: " (like this one) will be removed.
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###"
|
|
@ kkmpptxzrspx false part 2
|
|
○ qpvuntsmwlqt false part 1
|
|
◆ zzzzzzzzzzzz true
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_split_with_default_description() {
|
|
let mut test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
|
|
std::fs::write(workspace_path.join("file1"), "foo\n").unwrap();
|
|
std::fs::write(workspace_path.join("file2"), "bar\n").unwrap();
|
|
|
|
// Create a branch pointing to the commit. It will be moved to the second
|
|
// commit after the split.
|
|
test_env.jj_cmd_ok(&workspace_path, &["branch", "create", "test_branch"]);
|
|
|
|
let edit_script = test_env.set_up_fake_editor();
|
|
std::fs::write(
|
|
edit_script,
|
|
["dump editor1", "next invocation\n", "dump editor2"].join("\0"),
|
|
)
|
|
.unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_path, &["split", "file1"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
First part: qpvuntsm 48018df6 TESTED=TODO
|
|
Second part: kkmpptxz 350b4c13 test_branch | (no description set)
|
|
Working copy now at: kkmpptxz 350b4c13 test_branch | (no description set)
|
|
Parent commit : qpvuntsm 48018df6 TESTED=TODO
|
|
"###);
|
|
|
|
// Since the commit being split has no description, the user will only be
|
|
// prompted to add a description to the first commit, which will use the
|
|
// default value we set. The second commit will inherit the empty
|
|
// description from the commit being split.
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r###"
|
|
JJ: Enter a description for the first commit.
|
|
|
|
|
|
TESTED=TODO
|
|
|
|
JJ: This commit contains the following changes:
|
|
JJ: A file1
|
|
|
|
JJ: Lines starting with "JJ: " (like this one) will be removed.
|
|
"###);
|
|
assert!(!test_env.env_root().join("editor2").exists());
|
|
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###"
|
|
@ kkmpptxzrspx false test_branch
|
|
○ qpvuntsmwlqt false TESTED=TODO
|
|
◆ zzzzzzzzzzzz true
|
|
"###);
|
|
}
|
|
|
|
// This test makes sure that the children of the commit being split retain any
|
|
// other parents which weren't involved in the split.
|
|
#[test]
|
|
fn test_split_with_merge_child() {
|
|
let mut test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
test_env.jj_cmd_ok(&workspace_path, &["describe", "-m=1"]);
|
|
test_env.jj_cmd_ok(&workspace_path, &["new", "root()", "-m=a"]);
|
|
std::fs::write(workspace_path.join("file1"), "foo\n").unwrap();
|
|
std::fs::write(workspace_path.join("file2"), "bar\n").unwrap();
|
|
test_env.jj_cmd_ok(
|
|
&workspace_path,
|
|
&["new", "description(1)", "description(a)", "-m=2"],
|
|
);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###"
|
|
@ zsuskulnrvyr true 2
|
|
├─╮
|
|
│ ○ kkmpptxzrspx false a
|
|
○ │ qpvuntsmwlqt true 1
|
|
├─╯
|
|
◆ zzzzzzzzzzzz true
|
|
"###);
|
|
|
|
// Set up the editor and do the split.
|
|
let edit_script = test_env.set_up_fake_editor();
|
|
std::fs::write(
|
|
edit_script,
|
|
["write\nAdd file1", "next invocation\n", "write\nAdd file2"].join("\0"),
|
|
)
|
|
.unwrap();
|
|
let (stdout, stderr) =
|
|
test_env.jj_cmd_ok(&workspace_path, &["split", "-r", "description(a)", "file1"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Rebased 1 descendant commits
|
|
First part: kkmpptxz e8006b47 Add file1
|
|
Second part: royxmykx 5e1b793d Add file2
|
|
Working copy now at: zsuskuln 696935af (empty) 2
|
|
Parent commit : qpvuntsm 8b64ddff (empty) 1
|
|
Parent commit : royxmykx 5e1b793d Add file2
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###"
|
|
@ zsuskulnrvyr true 2
|
|
├─╮
|
|
│ ○ royxmykxtrkr false Add file2
|
|
│ ○ kkmpptxzrspx false Add file1
|
|
○ │ qpvuntsmwlqt true 1
|
|
├─╯
|
|
◆ zzzzzzzzzzzz true
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
// Split a commit with no descendants into siblings. Also tests that the default
|
|
// description is set correctly on the first commit.
|
|
fn test_split_siblings_no_descendants() {
|
|
let mut test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
|
|
std::fs::write(workspace_path.join("file1"), "foo\n").unwrap();
|
|
std::fs::write(workspace_path.join("file2"), "bar\n").unwrap();
|
|
|
|
// Create a branch pointing to the commit. It will be moved to the second
|
|
// commit after the split.
|
|
test_env.jj_cmd_ok(&workspace_path, &["branch", "create", "test_branch"]);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###"
|
|
@ qpvuntsmwlqt false test_branch
|
|
◆ zzzzzzzzzzzz true
|
|
"###);
|
|
|
|
let edit_script = test_env.set_up_fake_editor();
|
|
std::fs::write(
|
|
edit_script,
|
|
["dump editor1", "next invocation\n", "dump editor2"].join("\0"),
|
|
)
|
|
.unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_path, &["split", "--parallel", "file1"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
First part: qpvuntsm 0dced07a TESTED=TODO
|
|
Second part: zsuskuln 0473f014 test_branch | (no description set)
|
|
Working copy now at: zsuskuln 0473f014 test_branch | (no description set)
|
|
Parent commit : zzzzzzzz 00000000 (empty) (no description set)
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###"
|
|
@ zsuskulnrvyr false test_branch
|
|
│ ○ qpvuntsmwlqt false TESTED=TODO
|
|
├─╯
|
|
◆ zzzzzzzzzzzz true
|
|
"###);
|
|
|
|
// Since the commit being split has no description, the user will only be
|
|
// prompted to add a description to the first commit, which will use the
|
|
// default value we set. The second commit will inherit the empty
|
|
// description from the commit being split.
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r###"
|
|
JJ: Enter a description for the first commit.
|
|
|
|
|
|
TESTED=TODO
|
|
|
|
JJ: This commit contains the following changes:
|
|
JJ: A file1
|
|
|
|
JJ: Lines starting with "JJ: " (like this one) will be removed.
|
|
"###);
|
|
assert!(!test_env.env_root().join("editor2").exists());
|
|
}
|
|
|
|
#[test]
|
|
fn test_split_siblings_with_descendants() {
|
|
// Configure the environment and make the initial commits.
|
|
let mut test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
// test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
|
|
// First commit. This is the one we will split later.
|
|
std::fs::write(workspace_path.join("file1"), "foo\n").unwrap();
|
|
std::fs::write(workspace_path.join("file2"), "bar\n").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_path, &["commit", "-m", "Add file1 & file2"]);
|
|
// Second commit. This will be the child of the sibling commits after the split.
|
|
std::fs::write(workspace_path.join("file3"), "baz\n").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_path, &["commit", "-m", "Add file3"]);
|
|
// Third commit.
|
|
std::fs::write(workspace_path.join("file4"), "foobarbaz\n").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_path, &["describe", "-m", "Add file4"]);
|
|
// Move back to the previous commit so that we don't have to pass a revision
|
|
// to the split command.
|
|
test_env.jj_cmd_ok(&workspace_path, &["prev", "--edit"]);
|
|
test_env.jj_cmd_ok(&workspace_path, &["prev", "--edit"]);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###"
|
|
○ kkmpptxzrspx false Add file4
|
|
○ rlvkpnrzqnoo false Add file3
|
|
@ qpvuntsmwlqt false Add file1 & file2
|
|
◆ zzzzzzzzzzzz true
|
|
"###);
|
|
|
|
// Set up the editor and do the split.
|
|
let edit_script = test_env.set_up_fake_editor();
|
|
std::fs::write(
|
|
edit_script,
|
|
[
|
|
"dump editor1",
|
|
"write\nAdd file1",
|
|
"next invocation\n",
|
|
"dump editor2",
|
|
"write\nAdd file2",
|
|
]
|
|
.join("\0"),
|
|
)
|
|
.unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_path, &["split", "--parallel", "file1"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Rebased 2 descendant commits
|
|
First part: qpvuntsm 84df941d Add file1
|
|
Second part: vruxwmqv 94753be3 Add file2
|
|
Working copy now at: vruxwmqv 94753be3 Add file2
|
|
Parent commit : zzzzzzzz 00000000 (empty) (no description set)
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###"
|
|
○ kkmpptxzrspx false Add file4
|
|
○ rlvkpnrzqnoo false Add file3
|
|
├─╮
|
|
│ @ vruxwmqvtpmx false Add file2
|
|
○ │ qpvuntsmwlqt false Add file1
|
|
├─╯
|
|
◆ zzzzzzzzzzzz true
|
|
"###);
|
|
|
|
// The commit we're splitting has a description, so the user will be
|
|
// prompted to enter a description for each of the sibling commits.
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r###"
|
|
JJ: Enter a description for the first commit.
|
|
Add file1 & file2
|
|
|
|
JJ: This commit contains the following changes:
|
|
JJ: A file1
|
|
|
|
JJ: Lines starting with "JJ: " (like this one) will be removed.
|
|
"###);
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(test_env.env_root().join("editor2")).unwrap(), @r###"
|
|
JJ: Enter a description for the second commit.
|
|
Add file1 & file2
|
|
|
|
JJ: This commit contains the following changes:
|
|
JJ: A file2
|
|
|
|
JJ: Lines starting with "JJ: " (like this one) will be removed.
|
|
"###);
|
|
}
|
|
|
|
// This test makes sure that the children of the commit being split retain any
|
|
// other parents which weren't involved in the split.
|
|
#[test]
|
|
fn test_split_siblings_with_merge_child() {
|
|
let mut test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
test_env.jj_cmd_ok(&workspace_path, &["describe", "-m=1"]);
|
|
test_env.jj_cmd_ok(&workspace_path, &["new", "root()", "-m=a"]);
|
|
std::fs::write(workspace_path.join("file1"), "foo\n").unwrap();
|
|
std::fs::write(workspace_path.join("file2"), "bar\n").unwrap();
|
|
test_env.jj_cmd_ok(
|
|
&workspace_path,
|
|
&["new", "description(1)", "description(a)", "-m=2"],
|
|
);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###"
|
|
@ zsuskulnrvyr true 2
|
|
├─╮
|
|
│ ○ kkmpptxzrspx false a
|
|
○ │ qpvuntsmwlqt true 1
|
|
├─╯
|
|
◆ zzzzzzzzzzzz true
|
|
"###);
|
|
|
|
// Set up the editor and do the split.
|
|
let edit_script = test_env.set_up_fake_editor();
|
|
std::fs::write(
|
|
edit_script,
|
|
["write\nAdd file1", "next invocation\n", "write\nAdd file2"].join("\0"),
|
|
)
|
|
.unwrap();
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(
|
|
&workspace_path,
|
|
&["split", "-r", "description(a)", "--parallel", "file1"],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Rebased 1 descendant commits
|
|
First part: kkmpptxz e8006b47 Add file1
|
|
Second part: royxmykx 2cc60f3d Add file2
|
|
Working copy now at: zsuskuln 35b5d7eb (empty) 2
|
|
Parent commit : qpvuntsm 8b64ddff (empty) 1
|
|
Parent commit : kkmpptxz e8006b47 Add file1
|
|
Parent commit : royxmykx 2cc60f3d Add file2
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###"
|
|
@ zsuskulnrvyr true 2
|
|
├─┬─╮
|
|
│ │ ○ royxmykxtrkr false Add file2
|
|
│ ○ │ kkmpptxzrspx false Add file1
|
|
│ ├─╯
|
|
○ │ qpvuntsmwlqt true 1
|
|
├─╯
|
|
◆ zzzzzzzzzzzz true
|
|
"###);
|
|
}
|
|
|
|
// Make sure `jj split` would refuse to split an empty commit.
|
|
#[test]
|
|
fn test_split_empty() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
test_env.jj_cmd_ok(&workspace_path, &["describe", "--message", "abc"]);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&workspace_path, &["split"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Refusing to split empty commit 2ab033062e9fdf7fad2ded8e89c1f145e3698190.
|
|
Hint: Use `jj new` if you want to create another empty commit.
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_split_message_editor_avoids_unc() {
|
|
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"), "foo").unwrap();
|
|
std::fs::write(repo_path.join("file2"), "foo").unwrap();
|
|
|
|
let edit_script = test_env.set_up_fake_editor();
|
|
std::fs::write(edit_script, "dump-path path").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["split", "file2"]);
|
|
|
|
let edited_path =
|
|
PathBuf::from(std::fs::read_to_string(test_env.env_root().join("path")).unwrap());
|
|
// While `assert!(!edited_path.starts_with("//?/"))` could work here in most
|
|
// cases, it fails when it is not safe to strip the prefix, such as paths
|
|
// over 260 chars.
|
|
assert_eq!(edited_path, dunce::simplified(&edited_path));
|
|
}
|
|
|
|
#[test]
|
|
fn test_split_interactive() {
|
|
let mut test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
|
|
std::fs::write(workspace_path.join("file1"), "foo\n").unwrap();
|
|
std::fs::write(workspace_path.join("file2"), "bar\n").unwrap();
|
|
let edit_script = test_env.set_up_fake_editor();
|
|
std::fs::write(edit_script, ["dump editor"].join("\0")).unwrap();
|
|
|
|
let diff_editor = test_env.set_up_fake_diff_editor();
|
|
let diff_script = ["rm file2", "dump JJ-INSTRUCTIONS instrs"].join("\0");
|
|
std::fs::write(diff_editor, diff_script).unwrap();
|
|
|
|
// Split the working commit interactively and select only file1
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_path, &["split"]);
|
|
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(test_env.env_root().join("instrs")).unwrap(), @r###"
|
|
You are splitting a commit into two: qpvuntsm 44af2155 (no description set)
|
|
|
|
The diff initially shows the changes in the commit you're splitting.
|
|
|
|
Adjust the right side until it shows the contents you want for the first commit.
|
|
The remainder will be in the second commit. If you don't make any changes, then
|
|
the operation will be aborted.
|
|
"###);
|
|
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(test_env.env_root().join("editor")).unwrap(), @r###"
|
|
JJ: Enter a description for the first commit.
|
|
|
|
JJ: This commit contains the following changes:
|
|
JJ: A file1
|
|
|
|
JJ: Lines starting with "JJ: " (like this one) will be removed.
|
|
"###);
|
|
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
First part: qpvuntsm 0e15949e (no description set)
|
|
Second part: rlvkpnrz 9ed12e4c (no description set)
|
|
Working copy now at: rlvkpnrz 9ed12e4c (no description set)
|
|
Parent commit : qpvuntsm 0e15949e (no description set)
|
|
"###);
|
|
}
|