mirror of
https://github.com/jj-vcs/jj.git
synced 2025-12-23 06:01:01 +00:00
33ad38bfed
It would be good to include the word "divergent" in the log when a change is divergent, since users are often unsure what's happening when they see a divergent change, and giving them a term to search for would be helpful. However, I don't think it looks good to put this label next to the change ID itself if both are the same color, since it ends up being hard to distinguish from the change offset at a glance. Also, putting the label next to the change ID also messes up the alignment of fields in the log. Therefore, I think it looks better to put the "divergent" label at the end of the line. Since divergence and hidden commits are similar, it makes sense for both labels to be in the same place, so I also moved the hidden label to the end for consistency. One downside is that the labels are less obviously connected with the change ID itself due to them being farther apart. I think this could be fine, since they are still visually connected by being the same color.
631 lines
26 KiB
Rust
631 lines
26 KiB
Rust
// 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, @r"
|
|
@ mzvwutvl test.user@example.com 2001-02-03 08:05:12 a6923629
|
|
│ c
|
|
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 main 9d190342
|
|
├─╯ 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 9d190342454d is immutable
|
|
Hint: Could not modify commit: kkmpptxz 9d190342 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, @r"
|
|
------- stderr -------
|
|
Error: The root commit 000000000000 is immutable
|
|
[EOF]
|
|
[exit status: 1]
|
|
");
|
|
|
|
// Error mutating the repo if immutable_heads() uses a ref that can't be
|
|
// resolved
|
|
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(["new", "main"]);
|
|
insta::assert_snapshot!(output, @r"
|
|
------- 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, @r"
|
|
------- stderr -------
|
|
Working copy (@) now at: kkmpptxz 9d190342 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, @r"
|
|
------- 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, @r"
|
|
------- stderr -------
|
|
Working copy (@) now at: wqnwkozp 8fc35e6e (empty) (no description set)
|
|
Parent commit (@-) : kkmpptxz 9d190342 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, @r"
|
|
------- 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, @r"
|
|
------- stderr -------
|
|
Moved 1 bookmarks to kkmpptxz e1cb4cf3 main | (empty) a
|
|
Warning: The working-copy commit in workspace 'default' became immutable, so a new commit has been created on top of it.
|
|
Working copy (@) now at: zsuskuln 19a353fe (empty) (no description set)
|
|
Parent commit (@-) : kkmpptxz e1cb4cf3 main | (empty) a
|
|
[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, @r"
|
|
------- stderr -------
|
|
Warning: The working-copy commit in workspace 'default' became immutable, so a new commit has been created on top of it.
|
|
Working copy (@) now at: pmmvwywv 08e27304 (empty) (no description set)
|
|
Parent commit (@-) : kkmpptxz e1cb4cf3 (empty) a
|
|
[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, @r"
|
|
------- stderr -------
|
|
Moved 1 bookmarks to kkmpptxz e1cb4cf3 main | (empty) a
|
|
Warning: The working-copy commit in workspace 'default' became immutable, so a new commit has been created on top of it.
|
|
Warning: The working-copy commit in workspace 'workspace1' became immutable, so a new commit has been created on top of it.
|
|
Working copy (@) now at: royxmykx cec19492 (empty) (no description set)
|
|
Parent commit (@-) : kkmpptxz e1cb4cf3 main | (empty) a
|
|
[EOF]
|
|
");
|
|
workspace1_dir
|
|
.run_jj(["workspace", "update-stale"])
|
|
.success();
|
|
let output = workspace1_dir.run_jj(["log", "--no-graph"]);
|
|
insta::assert_snapshot!(output, @r"
|
|
nppvrztz test.user@example.com 2001-02-03 08:05:12 workspace1@ e89ed162
|
|
(empty) (no description set)
|
|
royxmykx test.user@example.com 2001-02-03 08:05:12 default@ cec19492
|
|
(empty) (no description set)
|
|
kkmpptxz test.user@example.com 2001-02-03 08:05:09 main e1cb4cf3
|
|
(empty) a
|
|
zzzzzzzz root() 00000000
|
|
[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, @r"
|
|
@ yqosqzyt test.user@example.com 2001-02-03 08:05:14 55c97dc7
|
|
│ (no description set)
|
|
│ ◆ mzvwutvl test.user@example.com 2001-02-03 08:05:12 main 7065a923 (conflict)
|
|
╭─┤ merge
|
|
│ │
|
|
│ ~
|
|
│
|
|
◆ kkmpptxz test.user@example.com 2001-02-03 08:05:10 9d190342
|
|
│ b
|
|
~
|
|
[EOF]
|
|
");
|
|
|
|
// abandon
|
|
let output = work_dir.run_jj(["abandon", "main"]);
|
|
insta::assert_snapshot!(output, @r#"
|
|
------- stderr -------
|
|
Error: Commit 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 9d190342454d is immutable
|
|
Hint: Could not modify commit: kkmpptxz 9d190342 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]
|
|
"#);
|
|
// chmod
|
|
let output = work_dir.run_jj(["file", "chmod", "-r=main", "x", "file"]);
|
|
insta::assert_snapshot!(output, @r#"
|
|
------- stderr -------
|
|
Error: Commit 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 dfa21421ac56 is immutable
|
|
Hint: Could not modify commit: zsuskuln dfa21421 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 9d190342454d is immutable
|
|
Hint: Could not modify commit: kkmpptxz 9d190342 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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 7065a9233f35 is immutable
|
|
Hint: Could not modify commit: mzvwutvl 7065a923 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, @r"
|
|
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:08 43444d88
|
|
│ (empty) (no description set)
|
|
◆ qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
|
|
│ (empty) (no description set)
|
|
◆ zzzzzzzz root() 00000000
|
|
[EOF]
|
|
");
|
|
}
|