// 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; 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 5f8a3db2 e | e    Parent commit      : rlvkpnrz 2443ea76 a | a    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 a331ac11 e | e    Parent commit      : rlvkpnrz 2443ea76 a | a    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    "###);

Lines 1–500 of 1083. Load more