github/jj-vcs-jj
1
0
Fork 0
mirror of https://github.com/jj-vcs/jj.git synced 2026-07-03 14:02:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
bd036daa128772fb4e1f9165cd6e33b3b4c684ca
jj-vcs-jj/cli/tests/test_immutable_commits.rs
Gaëtan Lehmann bd036daa12 change-id: update tests 
Note: we use longer short change-IDs in test_abandon_command to avoid
false codebook detection.
2026-06-27 15:29:00 +02:00

729 lines
29 KiB
Rust
Raw Blame History

// 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_rewrite_immutable_generic() {
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");
work_dir.run_jj(["describe", "-m=a"]).success();
work_dir.run_jj(["new", "-m=b"]).success();
work_dir.write_file("file", "b");
work_dir
.run_jj(["bookmark", "create", "-r@", "main"])
.success();
work_dir.run_jj(["new", "main-", "-m=c"]).success();
work_dir.write_file("file", "c");
let output = work_dir.run_jj(["log"]);
insta::assert_snapshot!(output, @"
@ pzvwutvl test.user@example.com 2001-02-03 08:05:12 eba3614a
│ c
│ ○ nkmpptxz test.user@example.com 2001-02-03 08:05:10 main f74ff8bc
├─╯ b
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 c8c8515a
│ a
◆ zzzzzzzz root() 00000000
[EOF]
");
// Cannot rewrite a commit in the configured set
test_env.add_config(r#"revset-aliases."immutable_heads()" = "main""#);
let output = work_dir.run_jj(["edit", "main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit f74ff8bc3414 is immutable
Hint: Could not modify commit: nkmpptxz f74ff8bc main | b
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// Cannot rewrite an ancestor of the configured set
let output = work_dir.run_jj(["edit", "main-"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit c8c8515af455 is immutable
Hint: Could not modify commit: qpvuntsm c8c8515a a
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 2 immutable commits.
[EOF]
[exit status: 1]
"#);
// Cannot rewrite the root commit even with an empty set of immutable commits
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
let output = work_dir.run_jj(["edit", "root()"]);
insta::assert_snapshot!(output, @"
------- stderr -------
Error: The root commit 000000000000 is immutable
[EOF]
[exit status: 1]
");
// Unresolvable immutable_heads()
test_env.add_config(r#"revset-aliases."immutable_heads()" = "bookmark_that_does_not_exist""#);
// Suppress warning in the commit summary template
test_env.add_config("template-aliases.'format_short_id(id)' = 'id.short(8)'");
let output = work_dir.run_jj(["edit", "main"]);
insta::assert_snapshot!(output, @"
------- stderr -------
Config error: Invalid `revset-aliases.immutable_heads()`
Caused by: Revision `bookmark_that_does_not_exist` doesn't exist
For help, see https://docs.jj-vcs.dev/latest/config/ or use `jj help -k config`.
[EOF]
[exit status: 1]
");
// Can use --ignore-immutable to override
test_env.add_config(r#"revset-aliases."immutable_heads()" = "main""#);
let output = work_dir.run_jj(["--ignore-immutable", "edit", "main"]);
insta::assert_snapshot!(output, @"
------- stderr -------
Working copy (@) now at: nkmpptxz f74ff8bc main | b
Parent commit (@-) : qpvuntsm c8c8515a a
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
// ... but not the root commit
let output = work_dir.run_jj(["--ignore-immutable", "edit", "root()"]);
insta::assert_snapshot!(output, @"
------- stderr -------
Error: The root commit 000000000000 is immutable
[EOF]
[exit status: 1]
");
// Mutating the repo works if ref is wrapped in present()
test_env.add_config(
r#"revset-aliases."immutable_heads()" = "present(bookmark_that_does_not_exist)""#,
);
let output = work_dir.run_jj(["new", "main"]);
insta::assert_snapshot!(output, @"
------- stderr -------
Working copy (@) now at: wqnwkozp c04df56f (empty) (no description set)
Parent commit (@-) : nkmpptxz f74ff8bc main | b
[EOF]
");
// immutable_heads() of different arity doesn't shadow the 0-ary one
test_env.add_config(r#"revset-aliases."immutable_heads(foo)" = "none()""#);
let output = work_dir.run_jj(["edit", "root()"]);
insta::assert_snapshot!(output, @"
------- stderr -------
Error: The root commit 000000000000 is immutable
[EOF]
[exit status: 1]
");
}
#[test]
fn test_new_wc_commit_when_wc_immutable() {
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(["bookmark", "create", "-r@", "main"])
.success();
test_env.add_config(r#"revset-aliases."immutable_heads()" = "main""#);
work_dir.run_jj(["new", "-m=a"]).success();
let output = work_dir.run_jj(["bookmark", "set", "main", "-r@"]);
insta::assert_snapshot!(output, @"
------- stderr -------
Moved 1 bookmarks to nkmpptxz 74d94dab main | (empty) a
[EOF]
");
work_dir.write_file("file", "a");
let output = work_dir.run_jj(["log", "-r.."]);
insta::assert_snapshot!(output, @"
@ mzvwutvl test.user@example.com 2001-02-03 08:05:11 c9fda3f5
│ (no description set)
◆ nkmpptxz test.user@example.com 2001-02-03 08:05:09 main 74d94dab
│ (empty) a
◆ qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
~
[EOF]
------- stderr -------
Warning: The working-copy commit is immutable; a new commit has been created on top of it.
[EOF]
");
}
#[test]
fn test_immutable_heads_set_to_working_copy() {
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(["bookmark", "create", "-r@", "main"])
.success();
test_env.add_config(r#"revset-aliases."immutable_heads()" = "@""#);
let output = work_dir.run_jj(["new", "-m=a"]);
insta::assert_snapshot!(output, @"
------- stderr -------
Working copy (@) now at: nkmpptxz 74d94dab (empty) a
Parent commit (@-) : qpvuntsm e8849ae1 main | (empty) (no description set)
[EOF]
");
work_dir.write_file("file", "a");
let output = work_dir.run_jj(["log", "-r.."]);
insta::assert_snapshot!(output, @"
@ zsuskuln test.user@example.com 2001-02-03 08:05:10 f5414d57
│ (no description set)
◆ nkmpptxz test.user@example.com 2001-02-03 08:05:09 74d94dab
│ (empty) a
◆ qpvuntsm test.user@example.com 2001-02-03 08:05:07 main e8849ae1
│ (empty) (no description set)
~
[EOF]
------- stderr -------
Warning: The working-copy commit is immutable; a new commit has been created on top of it.
[EOF]
");
}
#[test]
fn test_new_wc_commit_when_wc_immutable_multi_workspace() {
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(["bookmark", "create", "-r@", "main"])
.success();
test_env.add_config(r#"revset-aliases."immutable_heads()" = "main""#);
work_dir.run_jj(["new", "-m=a"]).success();
work_dir
.run_jj(["workspace", "add", "../workspace1"])
.success();
let workspace1_dir = test_env.work_dir("workspace1");
workspace1_dir.run_jj(["edit", "default@"]).success();
let output = work_dir.run_jj(["bookmark", "set", "main", "-r@"]);
insta::assert_snapshot!(output, @"
------- stderr -------
Moved 1 bookmarks to nkmpptxz 74d94dab main | (empty) a
[EOF]
");
work_dir.write_file("file", "a");
let output = work_dir.run_jj(["log", "-r.."]);
insta::assert_snapshot!(output, @"
@ yqosqzyt test.user@example.com 2001-02-03 08:05:13 default@ facdee7d
│ (no description set)
◆ nkmpptxz test.user@example.com 2001-02-03 08:05:09 main workspace1@ 74d94dab
│ (empty) a
◆ qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
~
[EOF]
------- stderr -------
Warning: The working-copy commit is immutable; a new commit has been created on top of it.
[EOF]
");
workspace1_dir.write_file("file", "a");
let output = workspace1_dir.run_jj(["log", "-r.."]);
insta::assert_snapshot!(output, @"
@ vruxwmqv test.user@example.com 2001-02-03 08:05:14 workspace1@ 43478bb7
│ (no description set)
│ ○ yqosqzyt test.user@example.com 2001-02-03 08:05:13 default@ facdee7d
├─╯ (no description set)
◆ nkmpptxz test.user@example.com 2001-02-03 08:05:09 main 74d94dab
│ (empty) a
◆ qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
~
[EOF]
------- stderr -------
Warning: The working-copy commit is immutable; a new commit has been created on top of it.
[EOF]
");
}
#[test]
fn test_new_wc_commit_when_wc_immutable_multi_workspace_already_immutable() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// Consider other working copies immutable
test_env.add_config(r#"revset-aliases."immutable_heads()" = "working_copies() ~ @""#);
work_dir.run_jj(["new", "-m=a"]).success();
let output = work_dir
.run_jj(["workspace", "add", "../workspace1"])
.success();
// The current workspace is immutable from the new workspace's perspective,
// but we should not create a new commit for it.
insta::assert_snapshot!(output, @r#"
------- stderr -------
Created workspace in "../workspace1"
Working copy (@) now at: pmmvwywv 1cd27236 (empty) (no description set)
Parent commit (@-) : qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
"#);
let output = work_dir.run_jj(["log", "-r=::"]);
insta::assert_snapshot!(output, @"
@ ylvkpnrz test.user@example.com 2001-02-03 08:05:08 default@ f8fe431e
│ (empty) a
│ ◆ pmmvwywv test.user@example.com 2001-02-03 08:05:09 workspace1@ 1cd27236
├─╯ (empty) (no description set)
◆ qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
◆ zzzzzzzz root() 00000000
[EOF]
");
// The other workspace was already immutable from the current workspace's
// perspective, so we don't create a new commit for it.
let output = work_dir.run_jj(["new"]);
insta::assert_snapshot!(output, @"
------- stderr -------
Working copy (@) now at: ozvwutvl a3a2f368 (empty) (no description set)
Parent commit (@-) : ylvkpnrz f8fe431e (empty) a
[EOF]
");
}
#[test]
fn test_rewrite_immutable_commands() {
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");
work_dir.run_jj(["describe", "-m=a"]).success();
work_dir.run_jj(["new", "-m=b"]).success();
work_dir.write_file("file", "b");
work_dir.run_jj(["new", "@-", "-m=c"]).success();
work_dir.write_file("file", "c");
work_dir
.run_jj(["new", "visible_heads()", "-m=merge"])
.success();
// Create another file to make sure the merge commit isn't empty (to satisfy `jj
// split`) and still has a conflict (to satisfy `jj resolve`).
work_dir.write_file("file2", "merged");
work_dir
.run_jj(["bookmark", "create", "-r@", "main"])
.success();
work_dir.run_jj(["new", "subject(b)"]).success();
work_dir.write_file("file", "w");
test_env.add_config(r#"revset-aliases."immutable_heads()" = "main""#);
test_env.add_config(r#"revset-aliases."trunk()" = "main""#);
// Log shows mutable commits, their parents, and trunk() by default
let output = work_dir.run_jj(["log"]);
insta::assert_snapshot!(output, @"
@ oqosqzyt test.user@example.com 2001-02-03 08:05:14 d9893cbe
│ (no description set)
│ ◆ rzvwutvl test.user@example.com 2001-02-03 08:05:12 main 050a0608 (conflict)
╭─┤ merge
│ │
│ ~
│
◆ nkmpptxz test.user@example.com 2001-02-03 08:05:10 f74ff8bc
│ b
~
[EOF]
");
// abandon
let output = work_dir.run_jj(["abandon", "main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// absorb
let output = work_dir.run_jj(["absorb", "--into=::@-"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit f74ff8bc3414 is immutable
Hint: Could not modify commit: nkmpptxz f74ff8bc b
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 2 immutable commits.
[EOF]
[exit status: 1]
"#);
// arrange
let output = work_dir.run_jj(["arrange", "-r=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// chmod
let output = work_dir.run_jj(["file", "chmod", "-r=main", "x", "file"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// describe
let output = work_dir.run_jj(["describe", "main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// diffedit
let output = work_dir.run_jj(["diffedit", "-r=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// edit
let output = work_dir.run_jj(["edit", "main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// metaedit
let output = work_dir.run_jj(["metaedit", "-r=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// new --insert-before
let output = work_dir.run_jj(["new", "--insert-before", "main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// new --insert-after parent_of_main
let output = work_dir.run_jj(["new", "--insert-after", "subject(b)"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// parallelize
let output = work_dir.run_jj(["parallelize", "subject(b)", "main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// rebase -s
let output = work_dir.run_jj(["rebase", "-s=main", "-d=@"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// rebase -b
let output = work_dir.run_jj(["rebase", "-b=main", "-d=@"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit da5638f8d7d0 is immutable
Hint: Could not modify commit: psuskuln da5638f8 c
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 2 immutable commits.
[EOF]
[exit status: 1]
"#);
// rebase -r
let output = work_dir.run_jj(["rebase", "-r=main", "-d=@"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// resolve
let output = work_dir.run_jj(["resolve", "-r=subject(merge)", "file"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// restore -c
let output = work_dir.run_jj(["restore", "-c=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// restore --into
let output = work_dir.run_jj(["restore", "--into=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// split
let output = work_dir.run_jj(["split", "-r=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// split -B
let output = work_dir.run_jj(["split", "-B=main", "-m", "will fail", "file"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// squash -r
let output = work_dir.run_jj(["squash", "-r=subject(b)"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit f74ff8bc3414 is immutable
Hint: Could not modify commit: nkmpptxz f74ff8bc b
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 4 immutable commits.
[EOF]
[exit status: 1]
"#);
// squash --from
let output = work_dir.run_jj(["squash", "--from=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// squash --into
let output = work_dir.run_jj(["squash", "--into=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// squash --after
let output = work_dir.run_jj(["squash", "--after=main-"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// squash --before
let output = work_dir.run_jj(["squash", "--before=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// sign
let output = work_dir.run_jj(["sign", "-r=main", "--config=signing.backend=test"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
// unsign
let output = work_dir.run_jj(["unsign", "-r=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 050a0608f6f5 is immutable
Hint: Could not modify commit: rzvwutvl 050a0608 main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
- `jj help -k config`, "Set of immutable commits"
Hint: This operation would rewrite 1 immutable commits.
[EOF]
[exit status: 1]
"#);
}
#[test]
fn test_immutable_log() {
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(["new"]).success();
test_env.add_config(r#"revset-aliases."immutable_heads()" = "@-""#);
// The immutable commits should be indicated in the graph even with
// `--ignore-immutable`
let output = work_dir.run_jj(["log", "--ignore-immutable"]);
insta::assert_snapshot!(output, @"
@ ylvkpnrz test.user@example.com 2001-02-03 08:05:08 e521ae80
│ (empty) (no description set)
◆ qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
◆ zzzzzzzz root() 00000000
[EOF]
");
}
Reference in New Issue View Git Blame Copy Permalink