// Copyright 2023 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 crate::common::TestEnvironment; #[test] fn test_report_conflicts() { let test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); let work_dir = test_env.work_dir("repo"); work_dir.write_file("file", "A\n"); work_dir.run_jj(["commit", "-m=A"]).success(); work_dir.write_file("file", "B\n"); work_dir.run_jj(["commit", "-m=B"]).success(); work_dir.write_file("file", "C\n"); work_dir.run_jj(["commit", "-m=C"]).success(); let output = work_dir.run_jj(["rebase", "-s=description(B)", "-d=root()"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Rebased 3 commits onto destination Working copy (@) now at: zsuskuln f8a2c4e0 (conflict) (empty) (no description set) Parent commit (@-) : kkmpptxz 2271a49e (conflict) C Added 0 files, modified 1 files, removed 0 files Warning: There are unresolved conflicts at these paths: file 2-sided conflict including 1 deletion New conflicts appeared in 2 commits: kkmpptxz 2271a49e (conflict) C rlvkpnrz b7d83633 (conflict) B Hint: To resolve the conflicts, start by updating to the first one: jj new rlvkpnrz Then use `jj resolve`, or edit the conflict markers in the file directly. Once the conflicts are resolved, you may want to inspect the result with `jj diff`. Then run `jj squash` to move the resolution into the conflicted commit. [EOF] "); let output = work_dir.run_jj(["rebase", "-d=description(A)"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Rebased 3 commits onto destination Working copy (@) now at: zsuskuln d70c003d (empty) (no description set) Parent commit (@-) : kkmpptxz 43e94449 C Added 0 files, modified 1 files, removed 0 files Existing conflicts were resolved or abandoned from 2 commits. [EOF] "); // Can get hint about multiple root commits let output = work_dir.run_jj(["rebase", "-r=description(B)", "-d=root()"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Rebased 1 commits onto destination Rebased 2 descendant commits Working copy (@) now at: zsuskuln 588bd15c (conflict) (empty) (no description set) Parent commit (@-) : kkmpptxz 331a2fce (conflict) C Added 0 files, modified 1 files, removed 0 files Warning: There are unresolved conflicts at these paths: file 2-sided conflict New conflicts appeared in 2 commits: kkmpptxz 331a2fce (conflict) C rlvkpnrz b42f84eb (conflict) B Hint: To resolve the conflicts, start by updating to one of the first ones: jj new kkmpptxz jj new rlvkpnrz Then use `jj resolve`, or edit the conflict markers in the file directly. Once the conflicts are resolved, you may want to inspect the result with `jj diff`. Then run `jj squash` to move the resolution into the conflicted commit. [EOF] "); // Resolve one of the conflicts by (mostly) following the instructions let output = work_dir.run_jj(["new", "rlvkpnrzqnoo"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Working copy (@) now at: vruxwmqv 0485e30f (conflict) (empty) (no description set) Parent commit (@-) : rlvkpnrz b42f84eb (conflict) B Added 0 files, modified 1 files, removed 0 files Warning: There are unresolved conflicts at these paths: file 2-sided conflict including 1 deletion [EOF] "); work_dir.write_file("file", "resolved\n"); let output = work_dir.run_jj(["squash"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Working copy (@) now at: yostqsxw f5a0cf8c (empty) (no description set) Parent commit (@-) : rlvkpnrz 87370844 B Existing conflicts were resolved or abandoned from 1 commits. [EOF] "); } #[test] fn test_report_conflicts_with_divergent_commits() { let test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); let work_dir = test_env.work_dir("repo"); work_dir.run_jj(["describe", "-m=A"]).success(); work_dir.write_file("file", "A\n"); work_dir.run_jj(["new", "-m=B"]).success(); work_dir.write_file("file", "B\n"); work_dir.run_jj(["new", "-m=C"]).success(); work_dir.write_file("file", "C\n"); work_dir.run_jj(["describe", "-m=C2"]).success(); work_dir .run_jj(["describe", "-m=C3", "--at-op=@-"]) .success(); let output = work_dir.run_jj(["rebase", "-s=description(B)", "-d=root()"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Concurrent modification detected, resolving automatically. Rebased 3 commits onto destination Working copy (@) now at: zsuskuln?? 4ca807ad (conflict) C2 Parent commit (@-) : kkmpptxz b42f84eb (conflict) B Added 0 files, modified 1 files, removed 0 files Warning: There are unresolved conflicts at these paths: file 2-sided conflict including 1 deletion New conflicts appeared in 3 commits: zsuskuln?? 1db43f23 (conflict) C3 zsuskuln?? 4ca807ad (conflict) C2 kkmpptxz b42f84eb (conflict) B Hint: To resolve the conflicts, start by updating to the first one: jj new kkmpptxz Then use `jj resolve`, or edit the conflict markers in the file directly. Once the conflicts are resolved, you may want to inspect the result with `jj diff`. Then run `jj squash` to move the resolution into the conflicted commit. [EOF] "); let output = work_dir.run_jj(["rebase", "-d=description(A)"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Rebased 3 commits onto destination Working copy (@) now at: zsuskuln?? f2d7a228 C2 Parent commit (@-) : kkmpptxz db069a22 B Added 0 files, modified 1 files, removed 0 files Existing conflicts were resolved or abandoned from 3 commits. [EOF] "); // Same thing when rebasing the divergent commits one at a time let output = work_dir.run_jj(["rebase", "-s=description(C2)", "-d=root()"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Rebased 1 commits onto destination Working copy (@) now at: zsuskuln?? 3c36afc9 (conflict) C2 Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set) Added 0 files, modified 1 files, removed 0 files Warning: There are unresolved conflicts at these paths: file 2-sided conflict including 1 deletion New conflicts appeared in 1 commits: zsuskuln?? 3c36afc9 (conflict) C2 Hint: To resolve the conflicts, start by updating to it: jj new zsuskuln Then use `jj resolve`, or edit the conflict markers in the file directly. Once the conflicts are resolved, you may want to inspect the result with `jj diff`. Then run `jj squash` to move the resolution into the conflicted commit. [EOF] "); let output = work_dir.run_jj(["rebase", "-s=description(C3)", "-d=root()"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Rebased 1 commits onto destination New conflicts appeared in 1 commits: zsuskuln?? e3ff827e (conflict) C3 Hint: To resolve the conflicts, start by updating to it: jj new zsuskuln Then use `jj resolve`, or edit the conflict markers in the file directly. Once the conflicts are resolved, you may want to inspect the result with `jj diff`. Then run `jj squash` to move the resolution into the conflicted commit. [EOF] "); let output = work_dir.run_jj(["rebase", "-s=description(C2)", "-d=description(B)"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Rebased 1 commits onto destination Working copy (@) now at: zsuskuln?? 1f9680bd C2 Parent commit (@-) : kkmpptxz db069a22 B Added 0 files, modified 1 files, removed 0 files Existing conflicts were resolved or abandoned from 1 commits. [EOF] "); let output = work_dir.run_jj(["rebase", "-s=description(C3)", "-d=description(B)"]); insta::assert_snapshot!(output, @r" ------- stderr ------- Rebased 1 commits onto destination Existing conflicts were resolved or abandoned from 1 commits. [EOF] "); } #[test] fn test_report_conflicts_with_resolving_conflicts_hint_disabled() { let test_env = TestEnvironment::default(); test_env.run_jj_in(".", ["git", "init", "repo"]).success(); let work_dir = test_env.work_dir("repo"); work_dir.write_file("file", "A\n"); work_dir.run_jj(["commit", "-m=A"]).success(); work_dir.write_file("file", "B\n"); work_dir.run_jj(["commit", "-m=B"]).success(); work_dir.write_file("file", "C\n"); work_dir.run_jj(["commit", "-m=C"]).success(); let output = work_dir.run_jj([ "rebase", "-s=description(B)", "-d=root()", "--config=hints.resolving-conflicts=false", ]); insta::assert_snapshot!(output, @r" ------- stderr ------- Rebased 3 commits onto destination Working copy (@) now at: zsuskuln f8a2c4e0 (conflict) (empty) (no description set) Parent commit (@-) : kkmpptxz 2271a49e (conflict) C Added 0 files, modified 1 files, removed 0 files Warning: There are unresolved conflicts at these paths: file 2-sided conflict including 1 deletion New conflicts appeared in 2 commits: kkmpptxz 2271a49e (conflict) C rlvkpnrz b7d83633 (conflict) B [EOF] "); }