forked from mirrors/jj
22abbbea9b
Note that one of the new tests panics; this is a newly discovered bug. In Git, a commit's direct parent is allowed to also be an indirect ancestor at the same time. `jj` currently tries to prevent this situation, but does allow it. The correctness of `rebase -r A -d descendant_of_A` currently depends on this jj-specific behavior; we should change that. Cc #2600
892 lines
30 KiB
Rust
892 lines
30 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;
|
|
|
|
pub mod common;
|
|
|
|
fn create_commit(test_env: &TestEnvironment, repo_path: &Path, name: &str, parents: &[&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);
|
|
}
|
|
std::fs::write(repo_path.join(name), format!("{name}\n")).unwrap();
|
|
test_env.jj_cmd_ok(repo_path, &["branch", "create", name]);
|
|
}
|
|
|
|
#[test]
|
|
fn test_rebase_invalid() {
|
|
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, "a", &[]);
|
|
create_commit(&test_env, &repo_path, "b", &["a"]);
|
|
|
|
// Missing destination
|
|
let stderr = test_env.jj_cmd_cli_error(&repo_path, &["rebase"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
error: the following required arguments were not provided:
|
|
--destination <DESTINATION>
|
|
|
|
Usage: jj rebase --destination <DESTINATION>
|
|
|
|
For more information, try '--help'.
|
|
"###);
|
|
|
|
// Both -r and -s
|
|
let stderr =
|
|
test_env.jj_cmd_cli_error(&repo_path, &["rebase", "-r", "a", "-s", "a", "-d", "b"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
error: the argument '--revision <REVISION>' cannot be used with '--source <SOURCE>'
|
|
|
|
Usage: jj rebase --destination <DESTINATION> --revision <REVISION>
|
|
|
|
For more information, try '--help'.
|
|
"###);
|
|
|
|
// Both -b and -s
|
|
let stderr =
|
|
test_env.jj_cmd_cli_error(&repo_path, &["rebase", "-b", "a", "-s", "a", "-d", "b"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
error: the argument '--branch <BRANCH>' cannot be used with '--source <SOURCE>'
|
|
|
|
Usage: jj rebase --destination <DESTINATION> --branch <BRANCH>
|
|
|
|
For more information, try '--help'.
|
|
"###);
|
|
|
|
// Both -r and --skip-empty
|
|
let stderr = test_env.jj_cmd_cli_error(
|
|
&repo_path,
|
|
&["rebase", "-r", "a", "-d", "b", "--skip-empty"],
|
|
);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
error: the argument '--revision <REVISION>' cannot be used with '--skip-empty'
|
|
|
|
Usage: jj rebase --destination <DESTINATION> --revision <REVISION>
|
|
|
|
For more information, try '--help'.
|
|
"###);
|
|
|
|
// Rebase onto self with -r
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["rebase", "-r", "a", "-d", "a"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Cannot rebase 2443ea76b0b1 onto itself
|
|
"###);
|
|
|
|
// Rebase root with -r
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["rebase", "-r", "root()", "-d", "a"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: The root commit 000000000000 is immutable
|
|
"###);
|
|
|
|
// Rebase onto descendant with -s
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["rebase", "-s", "a", "-d", "b"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Cannot rebase 2443ea76b0b1 onto descendant 1394f625cbbd
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_rebase_branch() {
|
|
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, "a", &[]);
|
|
create_commit(&test_env, &repo_path, "b", &["a"]);
|
|
create_commit(&test_env, &repo_path, "c", &["b"]);
|
|
create_commit(&test_env, &repo_path, "d", &["b"]);
|
|
create_commit(&test_env, &repo_path, "e", &["a"]);
|
|
// Test the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ e
|
|
│ ◉ d
|
|
│ │ ◉ c
|
|
│ ├─╯
|
|
│ ◉ b
|
|
├─╯
|
|
◉ a
|
|
◉
|
|
"###);
|
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-b", "c", "-d", "e"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Rebased 3 commits
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ d
|
|
│ ◉ c
|
|
├─╯
|
|
◉ b
|
|
@ e
|
|
◉ a
|
|
◉
|
|
"###);
|
|
|
|
// Test rebasing multiple branches at once
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-b=e", "-b=d", "-d=b"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Rebased 2 commits
|
|
Working copy now at: znkkpsqq 9ca2a154 e | e
|
|
Parent commit : zsuskuln 1394f625 b | b
|
|
Added 1 files, modified 0 files, removed 0 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ d
|
|
│ @ e
|
|
├─╯
|
|
│ ◉ c
|
|
├─╯
|
|
◉ b
|
|
◉ a
|
|
◉
|
|
"###);
|
|
|
|
// Same test but with more than one revision per argument
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["rebase", "-b=e|d", "-d=b"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Revset "e|d" resolved to more than one revision
|
|
Hint: The revset "e|d" resolved to these revisions:
|
|
znkkpsqq e52756c8 e | e
|
|
vruxwmqv 514fa6b2 d | d
|
|
Prefix the expression with 'all' to allow any number of revisions (i.e. 'all:e|d').
|
|
"###);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-b=all:e|d", "-d=b"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Rebased 2 commits
|
|
Working copy now at: znkkpsqq 817e3fb0 e | e
|
|
Parent commit : zsuskuln 1394f625 b | b
|
|
Added 1 files, modified 0 files, removed 0 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ d
|
|
│ @ e
|
|
├─╯
|
|
│ ◉ c
|
|
├─╯
|
|
◉ b
|
|
◉ a
|
|
◉
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_rebase_branch_with_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, "a", &[]);
|
|
create_commit(&test_env, &repo_path, "b", &["a"]);
|
|
create_commit(&test_env, &repo_path, "c", &[]);
|
|
create_commit(&test_env, &repo_path, "d", &["c"]);
|
|
create_commit(&test_env, &repo_path, "e", &["a", "d"]);
|
|
// Test the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ e
|
|
├─╮
|
|
│ ◉ d
|
|
│ ◉ c
|
|
│ │ ◉ b
|
|
├───╯
|
|
◉ │ a
|
|
├─╯
|
|
◉
|
|
"###);
|
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-b", "d", "-d", "b"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Rebased 3 commits
|
|
Working copy now at: znkkpsqq 391c91a7 e | e
|
|
Parent commit : vruxwmqv 1677f795 d | d
|
|
Added 1 files, modified 0 files, removed 0 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ e
|
|
◉ d
|
|
◉ c
|
|
◉ b
|
|
◉ a
|
|
◉
|
|
"###);
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-d", "b"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Rebased 3 commits
|
|
Working copy now at: znkkpsqq 040ae3a6 e | e
|
|
Parent commit : vruxwmqv 3d0f3644 d | d
|
|
Added 1 files, modified 0 files, removed 0 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ e
|
|
◉ d
|
|
◉ c
|
|
◉ b
|
|
◉ a
|
|
◉
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_rebase_single_revision() {
|
|
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, "a", &[]);
|
|
create_commit(&test_env, &repo_path, "b", &[]);
|
|
create_commit(&test_env, &repo_path, "c", &["a", "b"]);
|
|
create_commit(&test_env, &repo_path, "d", &["c"]);
|
|
// Test the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ d
|
|
◉ c
|
|
├─╮
|
|
│ ◉ b
|
|
◉ │ a
|
|
├─╯
|
|
◉
|
|
"###);
|
|
|
|
// Descendants of the rebased commit "b" should be rebased onto parents. First
|
|
// we test with a non-merge commit. Normally, the descendant "c" would still
|
|
// have 2 parents afterwards: the parent of "b" -- the root commit -- and
|
|
// "a". However, since the root commit is an ancestor of "a", we don't
|
|
// actually want both to be parents of the same commit. So, only "a" becomes
|
|
// a parent.
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "b", "-d", "a"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Also rebased 2 descendant commits onto parent of rebased commit
|
|
Working copy now at: vruxwmqv 7e15b97a d | d
|
|
Parent commit : royxmykx 934236c8 c | c
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ b
|
|
│ @ d
|
|
│ ◉ c
|
|
├─╯
|
|
◉ a
|
|
◉
|
|
"###);
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
|
|
// Now, let's try moving the merge commit. After, both parents of "c" ("a" and
|
|
// "b") should become parents of "d".
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "c", "-d", "root()"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Also rebased 1 descendant commits onto parent of rebased commit
|
|
Working copy now at: vruxwmqv bf87078f d | d
|
|
Parent commit : zsuskuln d370aee1 b | b
|
|
Parent commit : rlvkpnrz 2443ea76 a | a
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ c
|
|
│ @ d
|
|
│ ├─╮
|
|
│ │ ◉ a
|
|
├───╯
|
|
│ ◉ b
|
|
├─╯
|
|
◉
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_rebase_single_revision_merge_parent() {
|
|
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, "a", &[]);
|
|
create_commit(&test_env, &repo_path, "b", &[]);
|
|
create_commit(&test_env, &repo_path, "c", &["b"]);
|
|
create_commit(&test_env, &repo_path, "d", &["a", "c"]);
|
|
// Test the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ d
|
|
├─╮
|
|
│ ◉ c
|
|
│ ◉ b
|
|
◉ │ a
|
|
├─╯
|
|
◉
|
|
"###);
|
|
|
|
// Descendants of the rebased commit should be rebased onto parents, and if
|
|
// the descendant is a merge commit, it shouldn't forget its other parents.
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "c", "-d", "a"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Also rebased 1 descendant commits onto parent of rebased commit
|
|
Working copy now at: vruxwmqv c62d0789 d | d
|
|
Parent commit : zsuskuln d370aee1 b | b
|
|
Parent commit : rlvkpnrz 2443ea76 a | a
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ c
|
|
│ @ d
|
|
╭─┤
|
|
◉ │ a
|
|
│ ◉ b
|
|
├─╯
|
|
◉
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_rebase_revision_onto_descendant() {
|
|
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", &[]);
|
|
create_commit(&test_env, &repo_path, "a", &["base"]);
|
|
create_commit(&test_env, &repo_path, "b", &["base"]);
|
|
create_commit(&test_env, &repo_path, "merge", &["b", "a"]);
|
|
// Test the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ merge
|
|
├─╮
|
|
│ ◉ a
|
|
◉ │ b
|
|
├─╯
|
|
◉ base
|
|
◉
|
|
"###);
|
|
let setup_opid = test_env.current_operation_id(&repo_path);
|
|
|
|
// Simpler example
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "base", "-d", "a"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Also rebased 3 descendant commits onto parent of rebased commit
|
|
Working copy now at: vruxwmqv bff4a4eb merge | merge
|
|
Parent commit : royxmykx c84e900d b | b
|
|
Parent commit : zsuskuln d57db87b a | a
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ base
|
|
│ @ merge
|
|
╭─┤
|
|
◉ │ a
|
|
│ ◉ b
|
|
├─╯
|
|
◉
|
|
"###);
|
|
|
|
// Now, let's rebase onto the descendant merge
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["op", "restore", &setup_opid]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Working copy now at: vruxwmqv b05964d1 merge | merge
|
|
Parent commit : royxmykx cea87a87 b | b
|
|
Parent commit : zsuskuln 2c5b7858 a | a
|
|
Added 1 files, modified 0 files, removed 0 files
|
|
"###);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "base", "-d", "merge"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Also rebased 3 descendant commits onto parent of rebased commit
|
|
Working copy now at: vruxwmqv 986b7a49 merge | merge
|
|
Parent commit : royxmykx c07c677c b | b
|
|
Parent commit : zsuskuln abc90087 a | a
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ base
|
|
@ merge
|
|
├─╮
|
|
│ ◉ a
|
|
◉ │ b
|
|
├─╯
|
|
◉
|
|
"###);
|
|
|
|
// TODO(ilyagr): These will be good tests for `jj rebase --insert-after` and
|
|
// `--insert-before`, once those are implemented.
|
|
}
|
|
|
|
#[test]
|
|
fn test_rebase_multiple_destinations() {
|
|
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, "a", &[]);
|
|
create_commit(&test_env, &repo_path, "b", &[]);
|
|
create_commit(&test_env, &repo_path, "c", &[]);
|
|
// Test the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ c
|
|
│ ◉ b
|
|
├─╯
|
|
│ ◉ a
|
|
├─╯
|
|
◉
|
|
"###);
|
|
|
|
let (stdout, stderr) =
|
|
test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "a", "-d", "b", "-d", "c"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @"");
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ a
|
|
├─╮
|
|
│ @ c
|
|
◉ │ b
|
|
├─╯
|
|
◉
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["rebase", "-r", "a", "-d", "b|c"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Revset "b|c" resolved to more than one revision
|
|
Hint: The revset "b|c" resolved to these revisions:
|
|
royxmykx fe2e8e8b c | c
|
|
zsuskuln d370aee1 b | b
|
|
Prefix the expression with 'all' to allow any number of revisions (i.e. 'all:b|c').
|
|
"###);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "a", "-d", "all:b|c"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @"");
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ a
|
|
├─╮
|
|
│ ◉ b
|
|
@ │ c
|
|
├─╯
|
|
◉
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["rebase", "-r", "a", "-d", "b", "-d", "b"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: More than one revset resolved to revision d370aee184ba
|
|
"###);
|
|
|
|
// Same error with 'all:' if there is overlap.
|
|
let stderr = test_env.jj_cmd_failure(
|
|
&repo_path,
|
|
&["rebase", "-r", "a", "-d", "all:b|c", "-d", "b"],
|
|
);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: More than one revset resolved to revision d370aee184ba
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(
|
|
&repo_path,
|
|
&["rebase", "-r", "a", "-d", "b", "-d", "root()"],
|
|
);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Cannot merge with root revision
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_rebase_with_descendants() {
|
|
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, "a", &[]);
|
|
create_commit(&test_env, &repo_path, "b", &[]);
|
|
create_commit(&test_env, &repo_path, "c", &["a", "b"]);
|
|
create_commit(&test_env, &repo_path, "d", &["c"]);
|
|
// Test the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ d
|
|
◉ c
|
|
├─╮
|
|
│ ◉ b
|
|
◉ │ a
|
|
├─╯
|
|
◉
|
|
"###);
|
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-s", "b", "-d", "a"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Rebased 3 commits
|
|
Working copy now at: vruxwmqv 309336ff d | d
|
|
Parent commit : royxmykx 244fa794 c | c
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ d
|
|
◉ c
|
|
◉ b
|
|
◉ a
|
|
◉
|
|
"###);
|
|
|
|
// Rebase several subtrees at once.
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-s=c", "-s=d", "-d=a"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Rebased 2 commits
|
|
Working copy now at: vruxwmqv 92c2bc9a d | d
|
|
Parent commit : rlvkpnrz 2443ea76 a | a
|
|
Added 0 files, modified 0 files, removed 2 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ d
|
|
│ ◉ c
|
|
├─╯
|
|
◉ a
|
|
│ ◉ b
|
|
├─╯
|
|
◉
|
|
"###);
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
// Reminder of the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ d
|
|
◉ c
|
|
├─╮
|
|
│ ◉ b
|
|
◉ │ a
|
|
├─╯
|
|
◉
|
|
"###);
|
|
|
|
// `d` was a descendant of `b`, and both are moved to be direct descendants of
|
|
// `a`. `c` remains a descendant of `b`.
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-s=b", "-s=d", "-d=a"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Rebased 3 commits
|
|
Working copy now at: vruxwmqv f1e71cb7 d | d
|
|
Parent commit : rlvkpnrz 2443ea76 a | a
|
|
Added 0 files, modified 0 files, removed 2 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ c
|
|
◉ b
|
|
│ @ d
|
|
├─╯
|
|
◉ a
|
|
◉
|
|
"###);
|
|
|
|
// Same test as above, but with multiple commits per argument
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["rebase", "-s=b|d", "-d=a"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Revset "b|d" resolved to more than one revision
|
|
Hint: The revset "b|d" resolved to these revisions:
|
|
vruxwmqv df54a9fd d | d
|
|
zsuskuln d370aee1 b | b
|
|
Prefix the expression with 'all' to allow any number of revisions (i.e. 'all:b|d').
|
|
"###);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-s=all:b|d", "-d=a"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Rebased 3 commits
|
|
Working copy now at: vruxwmqv d17539f7 d | d
|
|
Parent commit : rlvkpnrz 2443ea76 a | a
|
|
Added 0 files, modified 0 files, removed 2 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ c
|
|
◉ b
|
|
│ @ d
|
|
├─╯
|
|
◉ a
|
|
◉
|
|
"###);
|
|
}
|
|
|
|
fn get_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String {
|
|
test_env.jj_cmd_success(repo_path, &["log", "-T", "branches"])
|
|
}
|
|
|
|
// This behavior illustrates https://github.com/martinvonz/jj/issues/2600
|
|
// The behavior of `rebase -r A -d descendant_of_A` can also be affected or
|
|
// broken depending on how #2600 is fixed, so we test that as well.
|
|
#[test]
|
|
fn test_rebase_with_child_and_descendant_bug_2600() {
|
|
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", &[]);
|
|
create_commit(&test_env, &repo_path, "a", &["base"]);
|
|
create_commit(&test_env, &repo_path, "b", &["base", "a"]);
|
|
create_commit(&test_env, &repo_path, "c", &["b"]);
|
|
let setup_opid = test_env.current_operation_id(&repo_path);
|
|
|
|
// Test the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ c
|
|
◉ b
|
|
├─╮
|
|
│ ◉ a
|
|
├─╯
|
|
◉ base
|
|
◉
|
|
"###);
|
|
|
|
let (stdout, stderr) =
|
|
test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "base", "-d", "root()"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Also rebased 4 descendant commits onto parent of rebased commit
|
|
Working copy now at: vruxwmqv 1fdab507 c | c
|
|
Parent commit : royxmykx 4d413a39 b | b
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
// The user would expect unsimplified ancestry here.
|
|
// ◉ base
|
|
// │ @ c
|
|
// │ ◉ b
|
|
// │ ├─╮
|
|
// │ │ ◉ a
|
|
// │ ├─╯
|
|
// ├─╯
|
|
// ◉
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ base
|
|
│ @ c
|
|
│ ◉ b
|
|
│ ◉ a
|
|
├─╯
|
|
◉
|
|
"###);
|
|
|
|
// TODO(#2650) !!!!! The panic here is a BUG !!!
|
|
// This tests the algorithm for rebasing onto descendants. The result should be
|
|
// simplified if and only if it's simplified in the above case.
|
|
test_env.jj_cmd_ok(&repo_path, &["op", "restore", &setup_opid]);
|
|
let stderr = test_env.jj_cmd_panic(&repo_path, &["rebase", "-r", "base", "-d", "b"]);
|
|
assert!(stderr.contains("graph has cycle"));
|
|
// // At time of writing:
|
|
// insta::assert_snapshot!(stderr, @r###"
|
|
// thread 'main' panicked at lib/src/dag_walk.rs:113:13:
|
|
// graph has cycle
|
|
// stack backtrace:
|
|
// 0: rust_begin_unwind
|
|
// at
|
|
// /rustc/6cf088810f66fff15d05bf7135c5f5888b7c93b4/library/std/src/panicking.rs:
|
|
// 645:5 1: core::panicking::panic_fmt
|
|
// at
|
|
// /rustc/6cf088810f66fff15d05bf7135c5f5888b7c93b4/library/core/src/panicking.
|
|
// rs:72:14 2: jj_lib::dag_walk::topo_order_forward_ok
|
|
// at
|
|
// /usr/local/google/home/ilyagr/dev/jj/lib/src/dag_walk.rs:113:13
|
|
// 3: jj_lib::dag_walk::topo_order_reverse_ok
|
|
// at
|
|
// /usr/local/google/home/ilyagr/dev/jj/lib/src/dag_walk.rs:160:22
|
|
// 4: jj_lib::dag_walk::topo_order_reverse
|
|
// at
|
|
// /usr/local/google/home/ilyagr/dev/jj/lib/src/dag_walk.rs:142:5
|
|
// 5: jj_lib::rewrite::DescendantRebaser::new
|
|
// at
|
|
// /usr/local/google/home/ilyagr/dev/jj/lib/src/rewrite.rs:306:24
|
|
// 6: jj_lib::repo::MutableRepo::create_descendant_rebaser
|
|
// at /usr/local/google/home/ilyagr/dev/jj/lib/src/repo.rs:844:9
|
|
// 7: jj_lib::repo::MutableRepo::rebase_descendants_return_rebaser
|
|
// at /usr/local/google/home/ilyagr/dev/jj/lib/src/repo.rs:861:27
|
|
// 8: jj_lib::repo::MutableRepo::rebase_descendants_with_options
|
|
// at /usr/local/google/home/ilyagr/dev/jj/lib/src/repo.rs:872:12
|
|
// 9: jj_lib::repo::MutableRepo::rebase_descendants
|
|
// at /usr/local/google/home/ilyagr/dev/jj/lib/src/repo.rs:878:9
|
|
// 10: jj_cli::commands::rebase::rebase_revision
|
|
// at
|
|
// /usr/local/google/home/ilyagr/dev/jj/cli/src/commands/rebase.rs:420:22
|
|
// 11: jj_cli::commands::rebase::cmd_rebase
|
|
// at
|
|
// /usr/local/google/home/ilyagr/dev/jj/cli/src/commands/rebase.rs:197:9
|
|
// 12: jj_cli::commands::run_command
|
|
// at
|
|
// /usr/local/google/home/ilyagr/dev/jj/cli/src/commands/mod.rs:187:39 13:
|
|
// core::ops::function::FnOnce::call_once at
|
|
// /rustc/6cf088810f66fff15d05bf7135c5f5888b7c93b4/library/core/src/ops/
|
|
// function.rs:250:5 14: core::ops::function::FnOnce::call_once{{vtable.
|
|
// shim}} at
|
|
// /rustc/6cf088810f66fff15d05bf7135c5f5888b7c93b4/library/core/src/ops/
|
|
// function.rs:250:5 15: <alloc::boxed::Box<F,A> as
|
|
// core::ops::function::FnOnce<Args>>::call_once at
|
|
// /rustc/6cf088810f66fff15d05bf7135c5f5888b7c93b4/library/alloc/src/boxed.rs:
|
|
// 2007:9 16: jj_cli::cli_util::CliRunner::run_internal
|
|
// at
|
|
// /usr/local/google/home/ilyagr/dev/jj/cli/src/cli_util.rs:2867:9
|
|
// 17: jj_cli::cli_util::CliRunner::run
|
|
// at
|
|
// /usr/local/google/home/ilyagr/dev/jj/cli/src/cli_util.rs:2884:22
|
|
// 18: jj::main
|
|
// at /usr/local/google/home/ilyagr/dev/jj/cli/src/main.rs:18:5
|
|
// 19: core::ops::function::FnOnce::call_once
|
|
// at
|
|
// /rustc/6cf088810f66fff15d05bf7135c5f5888b7c93b4/library/core/src/ops/
|
|
// function.rs:250:5 note: Some details are omitted, run with
|
|
// `RUST_BACKTRACE=full` for a verbose backtrace. "###);
|
|
//
|
|
// Unsimlified ancestry would look like
|
|
// @ c
|
|
// │ ◉ base
|
|
// ├─╯
|
|
// ◉ b
|
|
// ├─╮
|
|
// │ ◉ a
|
|
// ├─╯
|
|
// ◉
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ c
|
|
◉ b
|
|
├─╮
|
|
│ ◉ a
|
|
├─╯
|
|
◉ base
|
|
◉
|
|
"###);
|
|
|
|
// This tests the algorithm for rebasing onto descendants. The result should be
|
|
// simplified if and only if it's simplified in the above case.
|
|
test_env.jj_cmd_ok(&repo_path, &["op", "restore", &setup_opid]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "base", "-d", "a"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Also rebased 4 descendant commits onto parent of rebased commit
|
|
Working copy now at: vruxwmqv ea69166f c | c
|
|
Parent commit : royxmykx ee9e59c1 b | b
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ base
|
|
│ @ c
|
|
│ ◉ b
|
|
├─╯
|
|
◉ a
|
|
◉
|
|
"###);
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["op", "restore", &setup_opid]);
|
|
// ====== Reminder of the setup =========
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ c
|
|
◉ b
|
|
├─╮
|
|
│ ◉ a
|
|
├─╯
|
|
◉ base
|
|
◉
|
|
"###);
|
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "a", "-d", "root()"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Also rebased 2 descendant commits onto parent of rebased commit
|
|
Working copy now at: vruxwmqv 3f36363f c | c
|
|
Parent commit : royxmykx a969d119 b | b
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
// In this case, it is unclear whether the user would always prefer unsimplified
|
|
// ancestry (whether `b` should also be a direct child of the root commit).
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ a
|
|
│ @ c
|
|
│ ◉ b
|
|
│ ◉ base
|
|
├─╯
|
|
◉
|
|
"###);
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["op", "restore", &setup_opid]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "b", "-d", "root()"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Also rebased 1 descendant commits onto parent of rebased commit
|
|
Working copy now at: vruxwmqv 28f17d8e c | c
|
|
Parent commit : zsuskuln 2c5b7858 a | a
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
// The user would expect unsimplified ancestry here.
|
|
// ◉ b
|
|
// │ @ c
|
|
// │ ├─╮
|
|
// │ │ ◉ a
|
|
// │ ├─╯
|
|
// │ ◉ base
|
|
// ├─╯
|
|
// ◉
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ b
|
|
│ @ c
|
|
│ ◉ a
|
|
│ ◉ base
|
|
├─╯
|
|
◉
|
|
"###);
|
|
|
|
// This tests the algorithm for rebasing onto descendants. The result should be
|
|
// simplified if and only if it's simplified in the above case.
|
|
test_env.jj_cmd_ok(&repo_path, &["op", "restore", &setup_opid]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "b", "-d", "c"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Also rebased 1 descendant commits onto parent of rebased commit
|
|
Working copy now at: vruxwmqv ee203f6d c | c
|
|
Parent commit : zsuskuln 2c5b7858 a | a
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ b
|
|
@ c
|
|
◉ a
|
|
◉ base
|
|
◉
|
|
"###);
|
|
|
|
// In this test, the commit with weird ancestry is not rebased (neither directly
|
|
// nor indirectly).
|
|
test_env.jj_cmd_ok(&repo_path, &["op", "restore", &setup_opid]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "c", "-d", "a"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Working copy now at: vruxwmqv 5e5eea65 c | c
|
|
Parent commit : zsuskuln 2c5b7858 a | a
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ c
|
|
│ ◉ b
|
|
╭─┤
|
|
◉ │ a
|
|
├─╯
|
|
◉ base
|
|
◉
|
|
"###);
|
|
}
|