mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-26 14:00:51 +00:00
9d7ed54f8e
When you use e.g. `git switch` to check out a conflicted commit, you're going to end up with the `.jjconflicts-*` directories in your working copy. It's probably not obvious what those mean. This patch adds a README file to the root tree to try to explain to users what's going on and how to recover. The authoritative information about conflicts is stored in the `jj:trees` commit header. The contents of conflicted commits is only used for preventing GC. We can therefore add contents to the tree without much consequence.
247 lines
12 KiB
Rust
247 lines
12 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.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
std::fs::write(repo_path.join("file"), "a").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m=a"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["new", "-m=b"]);
|
|
std::fs::write(repo_path.join("file"), "b").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["branch", "create", "main"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["new", "main-", "-m=c"]);
|
|
std::fs::write(repo_path.join("file"), "c").unwrap();
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
@ mzvwutvl test.user@example.com 2001-02-03 08:05:12 78ebd449
|
|
│ c
|
|
│ ◉ kkmpptxz test.user@example.com 2001-02-03 08:05:10 main c8d4c7ca
|
|
├─╯ b
|
|
◉ qpvuntsm test.user@example.com 2001-02-03 08:05:08 46a8dc51
|
|
│ a
|
|
◉ zzzzzzzz root() 00000000
|
|
"###);
|
|
|
|
// Cannot rewrite a commit in the configured set
|
|
test_env.add_config(r#"revset-aliases."immutable_heads()" = "main""#);
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["edit", "main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit c8d4c7ca95d0 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// Cannot rewrite an ancestor of the configured set
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["edit", "main-"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 46a8dc5175be is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// Cannot rewrite the root commit even with an empty set of immutable commits
|
|
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["edit", "root()"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: The root commit 000000000000 is immutable
|
|
"###);
|
|
|
|
// Error mutating the repo if immutable_heads() uses a ref that can't be
|
|
// resolved
|
|
test_env.add_config(r#"revset-aliases."immutable_heads()" = "branch_that_does_not_exist""#);
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["new", "main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Config error: Invalid `revset-aliases.immutable_heads()`
|
|
Caused by: Revision "branch_that_does_not_exist" doesn't exist
|
|
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
|
"###);
|
|
|
|
// Mutating the repo works if ref is wrapped in present()
|
|
test_env.add_config(
|
|
r#"revset-aliases."immutable_heads()" = "present(branch_that_does_not_exist)""#,
|
|
);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["new", "main"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
"###);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Working copy now at: kpqxywon dbce15b4 (empty) (no description set)
|
|
Parent commit : kkmpptxz c8d4c7ca main | b
|
|
Added 0 files, modified 1 files, removed 0 files
|
|
"###);
|
|
|
|
// Error if we redefine immutable_heads() with an argument
|
|
test_env.add_config(r#"revset-aliases."immutable_heads(foo)" = "none()""#);
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["edit", "root()"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: The `revset-aliases.immutable_heads()` function must be declared without arguments
|
|
"###);
|
|
// ... even if we also update the built-in call sites
|
|
test_env.add_config(r#"revsets.short-prefixes = "immutable_heads(root())""#);
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["edit", "root()"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: The `revset-aliases.immutable_heads()` function must be declared without arguments
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_rewrite_immutable_commands() {
|
|
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");
|
|
std::fs::write(repo_path.join("file"), "a").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m=a"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["new", "-m=b"]);
|
|
std::fs::write(repo_path.join("file"), "b").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["new", "@-", "-m=c"]);
|
|
std::fs::write(repo_path.join("file"), "c").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["new", "all:visible_heads()", "-m=merge"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["branch", "create", "main"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["new", "description(b)"]);
|
|
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 stdout = test_env.jj_cmd_success(&repo_path, &["log"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
@ yqosqzyt test.user@example.com 2001-02-03 08:05:13 3f89addf
|
|
│ (empty) (no description set)
|
|
│ ◉ mzvwutvl test.user@example.com 2001-02-03 08:05:11 main 406c181c conflict
|
|
╭─┤ (empty) merge
|
|
│ │
|
|
│ ~
|
|
│
|
|
◉ kkmpptxz test.user@example.com 2001-02-03 08:05:10 c8d4c7ca
|
|
│ b
|
|
~
|
|
"###);
|
|
|
|
// abandon
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["abandon", "main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// chmod
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["chmod", "-r=main", "x", "file"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// describe
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["describe", "main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// diffedit
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["diffedit", "-r=main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// edit
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["edit", "main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// move --from
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["move", "--from=main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Warning: `jj move` is deprecated; use `jj squash` instead, which is equivalent
|
|
Warning: `jj move` will be removed in a future version, and this will be a hard error
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// move --to
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["move", "--to=main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Warning: `jj move` is deprecated; use `jj squash` instead, which is equivalent
|
|
Warning: `jj move` will be removed in a future version, and this will be a hard error
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// new --insert-before
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["new", "--insert-before", "main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// new --insert-after parent_of_main
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["new", "--insert-after", "description(b)"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// parallelize
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["parallelize", "description(b)", "main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// rebase -s
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["rebase", "-s=main", "-d=@"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// rebase -b
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["rebase", "-b=main", "-d=@"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 6e11f430f297 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// rebase -r
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["rebase", "-r=main", "-d=@"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// resolve
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["resolve", "-r=description(merge)", "file"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// restore -c
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["restore", "-c=main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// restore --to
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["restore", "--to=main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// split
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["split", "-r=main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// squash
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["squash", "-r=description(b)"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit c8d4c7ca95d0 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
// unsquash
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["unsquash", "-r=main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Commit 406c181c04d8 is immutable
|
|
Hint: Configure the set of immutable commits via `revset-aliases.immutable_heads()`.
|
|
"###);
|
|
}
|