cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-05 15:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
jj/cli/tests/test_abandon_command.rs
Caleb White 3efb59426f abandon: convert deleted bookmark warning to hint 
Bookmarks are no longer deleted on the next `jj git push` command, so
this updates the language and downgrades the warning to a hint.
2025-04-11 01:35:07 +00:00

531 lines
16 KiB
Rust
Raw Permalink 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::create_commit;
use crate::common::CommandOutput;
use crate::common::TestEnvironment;
use crate::common::TestWorkDir;
#[test]
fn test_basics() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
create_commit(&work_dir, "a", &[]);
create_commit(&work_dir, "b", &["a"]);
create_commit(&work_dir, "c", &[]);
create_commit(&work_dir, "d", &["c"]);
create_commit(&work_dir, "e", &["a", "d"]);
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ [znk] e
├─╮
│ ○ [vru] d
│ ○ [roy] c
│ │ ○ [zsu] b
├───╯
○ │ [rlv] a
├─╯
◆ [zzz]
[EOF]
");
let output = work_dir.run_jj(["abandon", "--retain-bookmarks", "d"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
vruxwmqv b7c62f28 d | d
Rebased 1 descendant commits onto parents of abandoned commits
Working copy (@) now at: znkkpsqq 11a2e10e e | e
Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Parent commit (@-) : royxmykx fe2e8e8b c d | c
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ [znk] e
├─╮
│ ○ [roy] c d
│ │ ○ [zsu] b
├───╯
○ │ [rlv] a
├─╯
◆ [zzz]
[EOF]
");
work_dir.run_jj(["undo"]).success();
let output = work_dir.run_jj(["abandon", "--retain-bookmarks"]); // abandons `e`
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
znkkpsqq 5557ece3 e | e
Working copy (@) now at: nkmrtpmo d4f8ea73 (empty) (no description set)
Parent commit (@-) : rlvkpnrz 2443ea76 a e?? | a
Parent commit (@-) : vruxwmqv b7c62f28 d e?? | d
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ [nkm]
├─╮
│ ○ [vru] d e??
│ ○ [roy] c
│ │ ○ [zsu] b
├───╯
○ │ [rlv] a e??
├─╯
◆ [zzz]
[EOF]
");
work_dir.run_jj(["undo"]).success();
let output = work_dir.run_jj(["abandon", "descendants(d)"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 2 commits:
znkkpsqq 5557ece3 e | e
vruxwmqv b7c62f28 d | d
Deleted bookmarks: d, e
Working copy (@) now at: xtnwkqum fa4ee8e6 (empty) (no description set)
Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Parent commit (@-) : royxmykx fe2e8e8b c | c
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ [xtn]
├─╮
│ ○ [roy] c
│ │ ○ [zsu] b
├───╯
○ │ [rlv] a
├─╯
◆ [zzz]
[EOF]
");
// Test abandoning the same commit twice directly
work_dir.run_jj(["undo"]).success();
let output = work_dir.run_jj(["abandon", "-rb", "b"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
zsuskuln 1394f625 b | b
Deleted bookmarks: b
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ [znk] e
├─╮
│ ○ [vru] d
│ ○ [roy] c
○ │ [rlv] a
├─╯
◆ [zzz]
[EOF]
");
// Test abandoning the same commit twice indirectly
work_dir.run_jj(["undo"]).success();
let output = work_dir.run_jj(["abandon", "d::", "e"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 2 commits:
znkkpsqq 5557ece3 e | e
vruxwmqv b7c62f28 d | d
Deleted bookmarks: d, e
Working copy (@) now at: xlzxqlsl 14991aec (empty) (no description set)
Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Parent commit (@-) : royxmykx fe2e8e8b c | c
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ [xlz]
├─╮
│ ○ [roy] c
│ │ ○ [zsu] b
├───╯
○ │ [rlv] a
├─╯
◆ [zzz]
[EOF]
");
let output = work_dir.run_jj(["abandon", "none()"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
No revisions to abandon.
[EOF]
");
}
#[test]
fn test_abandon_many() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
for i in 0..10 {
work_dir.run_jj(["new", &format!("-mcommit{i}")]).success();
}
// The list of commits should be elided.
let output = work_dir.run_jj(["abandon", ".."]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 11 commits:
kpqxywon 0b998aa3 (empty) commit9
znkkpsqq c37abefb (empty) commit8
yostqsxw 6256698f (empty) commit7
vruxwmqv 9350f605 (empty) commit6
yqosqzyt 196bd23d (empty) commit5
royxmykx bb676781 (empty) commit4
mzvwutvl 6f1e55a6 (empty) commit3
zsuskuln baf1311c (empty) commit2
kkmpptxz 5fc5f374 (empty) commit1
rlvkpnrz 9451b4ea (empty) commit0
...
Working copy (@) now at: kmkuslsw 822a2cf5 (empty) (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
}
// This behavior illustrates https://github.com/jj-vcs/jj/issues/2600.
// See also the corresponding test in `test_rebase_command`
#[test]
fn test_bug_2600() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// We will not touch "nottherootcommit". See the
// `test_bug_2600_rootcommit_special_case` for the one case where base being the
// child of the root commit changes the expected behavior.
create_commit(&work_dir, "nottherootcommit", &[]);
create_commit(&work_dir, "base", &["nottherootcommit"]);
create_commit(&work_dir, "a", &["base"]);
create_commit(&work_dir, "b", &["base", "a"]);
create_commit(&work_dir, "c", &["b"]);
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ [znk] c
○ [vru] b
├─╮
│ ○ [roy] a
├─╯
○ [zsu] base
○ [rlv] nottherootcommit
◆ [zzz]
[EOF]
");
let setup_opid = work_dir.current_operation_id();
work_dir.run_jj(["op", "restore", &setup_opid]).success();
let output = work_dir.run_jj(["abandon", "base"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
zsuskuln 73c929fc base | base
Deleted bookmarks: base
Rebased 3 descendant commits onto parents of abandoned commits
Working copy (@) now at: znkkpsqq 86e31bec c | c
Parent commit (@-) : vruxwmqv fd6eb121 b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
// Commits "a" and "b" should both have "nottherootcommit" as parent, and "b"
// should keep "a" as second parent.
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ [znk] c
○ [vru] b
├─╮
│ ○ [roy] a
├─╯
○ [rlv] nottherootcommit
◆ [zzz]
[EOF]
");
work_dir.run_jj(["op", "restore", &setup_opid]).success();
let output = work_dir.run_jj(["abandon", "a"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
royxmykx 98f3b9ba a | a
Deleted bookmarks: a
Rebased 2 descendant commits onto parents of abandoned commits
Working copy (@) now at: znkkpsqq 683b9435 c | c
Parent commit (@-) : vruxwmqv c10cb7b4 b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
// Commit "b" should have "base" as parent. It should not have two parent
// pointers to that commit even though it was a merge commit before we abandoned
// "a".
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ [znk] c
○ [vru] b
○ [zsu] base
○ [rlv] nottherootcommit
◆ [zzz]
[EOF]
");
work_dir.run_jj(["op", "restore", &setup_opid]).success();
let output = work_dir.run_jj(["abandon", "b"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
vruxwmqv 8c0dced0 b | b
Deleted bookmarks: b
Rebased 1 descendant commits onto parents of abandoned commits
Working copy (@) now at: znkkpsqq 33a94991 c | c
Parent commit (@-) : zsuskuln 73c929fc base | base
Parent commit (@-) : royxmykx 98f3b9ba a | a
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
// Commit "c" should inherit the parents from the abndoned commit "b".
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ [znk] c
├─╮
│ ○ [roy] a
├─╯
○ [zsu] base
○ [rlv] nottherootcommit
◆ [zzz]
[EOF]
");
work_dir.run_jj(["op", "restore", &setup_opid]).success();
// ========= Reminder of the setup ===========
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ [znk] c
○ [vru] b
├─╮
│ ○ [roy] a
├─╯
○ [zsu] base
○ [rlv] nottherootcommit
◆ [zzz]
[EOF]
");
let output = work_dir.run_jj(["abandon", "--retain-bookmarks", "a", "b"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 2 commits:
vruxwmqv 8c0dced0 b | b
royxmykx 98f3b9ba a | a
Rebased 1 descendant commits onto parents of abandoned commits
Working copy (@) now at: znkkpsqq 84fac1f8 c | c
Parent commit (@-) : zsuskuln 73c929fc a b base | base
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
// Commit "c" should have "base" as parent. As when we abandoned "a", it should
// not have two parent pointers to the same commit.
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ [znk] c
○ [zsu] a b base
○ [rlv] nottherootcommit
◆ [zzz]
[EOF]
");
let output = work_dir.run_jj(["bookmark", "list", "b"]);
insta::assert_snapshot!(output, @r"
b: zsuskuln 73c929fc base
[EOF]
");
}
#[test]
fn test_bug_2600_rootcommit_special_case() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
// Set up like `test_bug_2600`, but without the `nottherootcommit` commit.
create_commit(&work_dir, "base", &[]);
create_commit(&work_dir, "a", &["base"]);
create_commit(&work_dir, "b", &["base", "a"]);
create_commit(&work_dir, "c", &["b"]);
// Setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ [vru] c
○ [roy] b
├─╮
│ ○ [zsu] a
├─╯
○ [rlv] base
◆ [zzz]
[EOF]
");
// Now, the test
let output = work_dir.run_jj(["abandon", "base"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: The Git backend does not support creating merge commits with the root commit as one of the parents.
[EOF]
[exit status: 1]
");
}
#[test]
fn test_double_abandon() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
create_commit(&work_dir, "a", &[]);
// Test the setup
insta::assert_snapshot!(work_dir.run_jj(["log", "--no-graph", "-r", "a"]), @r"
rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 2443ea76
a
[EOF]
");
let commit_id = work_dir
.run_jj(["log", "--no-graph", "--color=never", "-T=commit_id", "-r=a"])
.success()
.stdout
.into_raw();
let output = work_dir.run_jj(["abandon", &commit_id]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
rlvkpnrz 2443ea76 a | a
Deleted bookmarks: a
Working copy (@) now at: royxmykx f37b4afd (empty) (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
let output = work_dir.run_jj(["abandon", &commit_id]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
rlvkpnrz hidden 2443ea76 a
Nothing changed.
[EOF]
");
}
#[test]
fn test_abandon_restore_descendants() {
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", "foo\n");
work_dir.run_jj(["new"]).success();
work_dir.write_file("file", "bar\n");
work_dir.run_jj(["new"]).success();
work_dir.write_file("file", "baz\n");
// Remove the commit containing "bar"
let output = work_dir.run_jj(["abandon", "-r@-", "--restore-descendants"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
rlvkpnrz 225adef1 (no description set)
Rebased 1 descendant commits (while preserving their content) onto parents of abandoned commits
Working copy (@) now at: kkmpptxz a734deb0 (no description set)
Parent commit (@-) : qpvuntsm 485d52a9 (no description set)
[EOF]
");
let output = work_dir.run_jj(["diff", "--git"]);
insta::assert_snapshot!(output, @r"
diff --git a/file b/file
index 257cc5642c..76018072e0 100644
--- a/file
+++ b/file
@@ -1,1 +1,1 @@
-foo
+baz
[EOF]
");
}
#[test]
fn test_abandon_tracking_bookmarks() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "remote"]).success();
let remote_dir = test_env.work_dir("remote");
remote_dir
.run_jj(["bookmark", "set", "-r@", "foo"])
.success();
remote_dir.run_jj(["git", "export"]).success();
// Create colocated Git repo which may have @git tracking bookmarks
test_env
.run_jj_in(
".",
[
"git",
"clone",
"--colocate",
"--config=git.auto-local-bookmark=true",
"remote/.jj/repo/store/git",
"local",
],
)
.success();
let local_dir = test_env.work_dir("local");
local_dir
.run_jj(["bookmark", "set", "-r@", "bar"])
.success();
insta::assert_snapshot!(get_log_output(&local_dir), @r"
@ [zsu] bar
│ ○ [vvk] foo
├─╯
◆ [zzz]
[EOF]
");
let output = local_dir.run_jj(["abandon", "foo"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
vvkvtnvv 230dd059 foo | (empty) (no description set)
Deleted bookmarks: foo
Hint: Deleted bookmarks can be pushed by name or all at once with `jj git push --deleted`.
[EOF]
");
let output = local_dir.run_jj(["abandon", "bar"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
zsuskuln f652c321 bar | (empty) (no description set)
Deleted bookmarks: bar
Working copy (@) now at: vruxwmqv 41658cf4 (empty) (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
}
#[must_use]
fn get_log_output(work_dir: &TestWorkDir) -> CommandOutput {
let template = r#"separate(" ", "[" ++ change_id.short(3) ++ "]", bookmarks)"#;
work_dir.run_jj(["log", "-T", template])
}
Reference in New Issue View Git Blame Copy Permalink