mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-15 08:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

tests: add test for moving conflicting branch to one of descendants

Browse source
This commit is contained in:
Yuya Nishihara 2023-11-10 14:40:49 +09:00
parent 0d21578846
commit 27751b0142
1 changed files with 59 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
cli/tests/test_branch_command.rs
View file

@ -130,6 +130,65 @@ fn test_branch_move() {
insta::assert_snapshot!(stderr, @"");
}
#[test]
fn test_branch_move_conflicting() {
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");
let get_log = || {
let template = r#"separate(" ", description.first_line(), branches)"#;
let (stdout, _stderr) = test_env.jj_cmd_ok(&repo_path, &["log", "-T", template]);
stdout
};
test_env.jj_cmd_ok(&repo_path, &["new", "root()", "-mA0"]);
test_env.jj_cmd_ok(&repo_path, &["new", "root()", "-mB0"]);
test_env.jj_cmd_ok(&repo_path, &["new", "root()", "-mC0"]);
test_env.jj_cmd_ok(&repo_path, &["new", "description(A0)", "-mA1"]);
// Set up conflicting branch.
test_env.jj_cmd_ok(
&repo_path,
&["branch", "create", "-rdescription(A0)", "foo"],
);
test_env.jj_cmd_ok(
&repo_path,
&["branch", "create", "--at-op=@-", "-rdescription(B0)", "foo"],
);
insta::assert_snapshot!(get_log(), @r###"
@ A1
◉ A0 foo??
│ ◉ C0
├─╯
│ ◉ B0 foo??
├─╯
◉
"###);
// Can't move the branch to C0 since it's sibling.
let stderr =
test_env.jj_cmd_failure(&repo_path, &["branch", "set", "-rdescription(C0)", "foo"]);
insta::assert_snapshot!(stderr, @r###"
Error: Refusing to move branch backwards or sideways.
Hint: Use --allow-backwards to allow it.
"###);
// Can move the branch to A1 since it's descendant of A0. It's not
// descendant of B0, though.
let (_stdout, stderr) =
test_env.jj_cmd_ok(&repo_path, &["branch", "set", "-rdescription(A1)", "foo"]);
insta::assert_snapshot!(stderr, @"");
insta::assert_snapshot!(get_log(), @r###"
@ A1 foo
◉ A0
│ ◉ C0
├─╯
│ ◉ B0
├─╯
◉
"###);
}
#[test]
fn test_branch_forget_glob() {
let test_env = TestEnvironment::default();