mirrors/jj
1
0
Fork 0
mirror of https://github.com/jj-vcs/jj.git synced 2025-12-23 06:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

tests: get current operation id without running jj

Browse source 
It's nice that the operation id can be captured without incrementing seed.
This commit is contained in:
Yuya Nishihara 2025-08-25 10:27:15 +09:00
parent 9d67c47a0c
commit 35995514c8
9 changed files with 503 additions and 494 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cli/tests/common/test_environment.rs
View file

@ -20,6 +20,7 @@ use std::path::PathBuf;
use bstr::BString;
use indoc::formatdoc;
use itertools::Itertools as _;
use regex::Captures;
use regex::Regex;
use tempfile::TempDir;
@ -288,12 +289,20 @@ impl TestWorkDir<'_> {
}
}
/// Reads the current operation id without resolving divergence nor
/// snapshotting. `TestWorkDir` must be at the workspace root.
#[track_caller]
pub fn current_operation_id(&self) -> String {
let output = self
.run_jj(["debug", "operation", "--display=id"])
.success();
output.stdout.raw().trim_end().to_owned()
let heads_dir = self
.root()
.join(PathBuf::from_iter([".jj", "repo", "op_heads", "heads"]));
let head_entry = heads_dir
.read_dir()
.expect("TestWorkDir must point to the workspace root")
.exactly_one()
.expect("divergence not supported")
.unwrap();
head_entry.file_name().into_string().unwrap()
}
/// Returns test helper for the specified sub directory.

12
cli/tests/test_abandon_command.rs
View file

@ -244,8 +244,8 @@ fn test_bug_2600() {
zsuskuln 67c2f714 base | base
Deleted bookmarks: base
Rebased 3 descendant commits onto parents of abandoned commits
Working copy (@) now at: znkkpsqq 1e89909f c | c
Parent commit (@-) : vruxwmqv a3a61e53 b | b
Working copy (@) now at: znkkpsqq c1223866 c | c
Parent commit (@-) : vruxwmqv 1dfaa834 b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@ -270,8 +270,8 @@ fn test_bug_2600() {
royxmykx 183dbbca a | a
Deleted bookmarks: a
Rebased 2 descendant commits onto parents of abandoned commits
Working copy (@) now at: znkkpsqq a9a97c4c c | c
Parent commit (@-) : vruxwmqv bccf7988 b | b
Working copy (@) now at: znkkpsqq f863da3f c | c
Parent commit (@-) : vruxwmqv d7aed853 b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@ -295,7 +295,7 @@ fn test_bug_2600() {
vruxwmqv cedee197 b | b
Deleted bookmarks: b
Rebased 1 descendant commits onto parents of abandoned commits
Working copy (@) now at: znkkpsqq 8030a364 c | c
Working copy (@) now at: znkkpsqq 4dc308fb c | c
Parent commit (@-) : zsuskuln 67c2f714 base | base
Parent commit (@-) : royxmykx 183dbbca a | a
Added 0 files, modified 0 files, removed 1 files
@ -333,7 +333,7 @@ fn test_bug_2600() {
vruxwmqv cedee197 b | b
royxmykx 183dbbca a | a
Rebased 1 descendant commits onto parents of abandoned commits
Working copy (@) now at: znkkpsqq 75bef1a6 c | c
Working copy (@) now at: znkkpsqq b350f44b c | c
Parent commit (@-) : zsuskuln 67c2f714 a b base | base
Added 0 files, modified 0 files, removed 2 files
[EOF]

624
cli/tests/test_duplicate_command.rs
View file

File diff suppressed because it is too large Load diff

12
cli/tests/test_git_import_export.rs
View file

@ -255,15 +255,15 @@ fn test_git_import_move_export_with_default_undo() {
.run_jj(["bookmark", "set", "a", "--to=@"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
a: yqosqzyt 507c0edc (empty) (no description set)
a: royxmykx e7d0d5fd (empty) (no description set)
@git (behind by 1 commits): qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
let output = work_dir.run_jj(["git", "export"]);
insta::assert_snapshot!(output, @"");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
a: yqosqzyt 507c0edc (empty) (no description set)
@git: yqosqzyt 507c0edc (empty) (no description set)
a: royxmykx e7d0d5fd (empty) (no description set)
@git: royxmykx e7d0d5fd (empty) (no description set)
[EOF]
");
@ -284,7 +284,7 @@ fn test_git_import_move_export_with_default_undo() {
(
"refs/heads/a",
CommitId(
"507c0edcfc028f714f3c7a3027cb141f6610e867",
"e7d0d5fdaf96051d0dacec1e74d9413d64a15822",
),
),
]
@ -299,8 +299,8 @@ fn test_git_import_move_export_with_default_undo() {
[EOF]
");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
a: yqosqzyt 507c0edc (empty) (no description set)
@git: yqosqzyt 507c0edc (empty) (no description set)
a: royxmykx e7d0d5fd (empty) (no description set)
@git: royxmykx e7d0d5fd (empty) (no description set)
[EOF]
");
}

74
cli/tests/test_operations.rs
View file

@ -1791,9 +1791,9 @@ fn test_op_diff_divergent_change() {
work_dir.write_file("file", "1\n2b\n");
work_dir.run_jj(["desc", "-m2b"]).success();
insta::assert_snapshot!(work_dir.run_jj(["log"]), @r"
@ rlvkpnrz?? test.user@example.com 2001-02-03 08:05:12 82ad1ba9
@ rlvkpnrz?? test.user@example.com 2001-02-03 08:05:11 c5cad9ab
│ 2b
│ ○ rlvkpnrz?? test.user@example.com 2001-02-03 08:05:10 a7e9a63b
│ ○ rlvkpnrz?? test.user@example.com 2001-02-03 08:05:09 f189cafa
├─╯ 2a
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 8a06f3b3
│ 1
@ -1807,7 +1807,7 @@ fn test_op_diff_divergent_change() {
.run_jj(["squash", "--from=subject(2a)", "--to=@", "-m2ab"])
.success();
insta::assert_snapshot!(work_dir.run_jj(["log"]), @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:15 da3f472d
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:13 17d68d92
│ 2ab
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 8a06f3b3
│ 1
@ -1827,16 +1827,16 @@ fn test_op_diff_divergent_change() {
]);
insta::assert_snapshot!(output, @r"
From operation: ef75d88dd5fe (2001-02-03 08:05:08) commit 5d86d4b609080a15077fcd723e537582d5ea6559
To operation: 8bd3751c26de (2001-02-03 08:05:12) describe commit 105ead440de2cf759d89f951c6def56bde950ef7
To operation: a1af26c1d765 (2001-02-03 08:05:11) describe commit 7a72a9ad7f4d8aa8b613a9840313b0ef0632842b
Changed commits:
○ + rlvkpnrz?? 82ad1ba9 2b
○ + rlvkpnrz?? c5cad9ab 2b
- rlvkpnrz hidden 4f7a567a (empty) (no description set)
○ + rlvkpnrz?? a7e9a63b 2a
○ + rlvkpnrz?? f189cafa 2a
- rlvkpnrz hidden 4f7a567a (empty) (no description set)
Changed working copy default@:
+ rlvkpnrz?? 82ad1ba9 2b
+ rlvkpnrz?? c5cad9ab 2b
- rlvkpnrz hidden 4f7a567a (empty) (no description set)
[EOF]
");
@ -1851,17 +1851,17 @@ fn test_op_diff_divergent_change() {
&resolved_op_id,
]);
insta::assert_snapshot!(output, @r"
From operation: 8bd3751c26de (2001-02-03 08:05:12) describe commit 105ead440de2cf759d89f951c6def56bde950ef7
To operation: 6a444a3d42e6 (2001-02-03 08:05:15) squash commits into 82ad1ba9ded407bab6fea1524b207f49a02779a0
From operation: a1af26c1d765 (2001-02-03 08:05:11) describe commit 7a72a9ad7f4d8aa8b613a9840313b0ef0632842b
To operation: 90aa25304059 (2001-02-03 08:05:13) squash commits into c5cad9ab7772714178c158a133a0243908545b48
Changed commits:
○ + rlvkpnrz da3f472d 2ab
- rlvkpnrz hidden 82ad1ba9 2b
- rlvkpnrz hidden a7e9a63b 2a
○ + rlvkpnrz 17d68d92 2ab
- rlvkpnrz hidden c5cad9ab 2b
- rlvkpnrz hidden f189cafa 2a
Changed working copy default@:
+ rlvkpnrz da3f472d 2ab
- rlvkpnrz hidden 82ad1ba9 2b
+ rlvkpnrz 17d68d92 2ab
- rlvkpnrz hidden c5cad9ab 2b
[EOF]
");
@ -1877,10 +1877,10 @@ fn test_op_diff_divergent_change() {
]);
insta::assert_snapshot!(output, @r"
From operation: ef75d88dd5fe (2001-02-03 08:05:08) commit 5d86d4b609080a15077fcd723e537582d5ea6559
To operation: 8bd3751c26de (2001-02-03 08:05:12) describe commit 105ead440de2cf759d89f951c6def56bde950ef7
To operation: a1af26c1d765 (2001-02-03 08:05:11) describe commit 7a72a9ad7f4d8aa8b613a9840313b0ef0632842b
Changed commits:
○ + rlvkpnrz?? 82ad1ba9 2b
○ + rlvkpnrz?? c5cad9ab 2b
- rlvkpnrz hidden 4f7a567a (empty) (no description set)
diff --git a/file b/file
index d00491fd7e..5e0f51b37b 100644
@ -1889,7 +1889,7 @@ fn test_op_diff_divergent_change() {
@@ -1,1 +1,2 @@
1
+2b
○ + rlvkpnrz?? a7e9a63b 2a
○ + rlvkpnrz?? f189cafa 2a
- rlvkpnrz hidden 4f7a567a (empty) (no description set)
diff --git a/file b/file
index d00491fd7e..13a46f22fa 100644
@ -1900,7 +1900,7 @@ fn test_op_diff_divergent_change() {
1
Changed working copy default@:
+ rlvkpnrz?? 82ad1ba9 2b
+ rlvkpnrz?? c5cad9ab 2b
- rlvkpnrz hidden 4f7a567a (empty) (no description set)
[EOF]
");
@ -1916,13 +1916,13 @@ fn test_op_diff_divergent_change() {
&resolved_op_id,
]);
insta::assert_snapshot!(output, @r"
From operation: 8bd3751c26de (2001-02-03 08:05:12) describe commit 105ead440de2cf759d89f951c6def56bde950ef7
To operation: 6a444a3d42e6 (2001-02-03 08:05:15) squash commits into 82ad1ba9ded407bab6fea1524b207f49a02779a0
From operation: a1af26c1d765 (2001-02-03 08:05:11) describe commit 7a72a9ad7f4d8aa8b613a9840313b0ef0632842b
To operation: 90aa25304059 (2001-02-03 08:05:13) squash commits into c5cad9ab7772714178c158a133a0243908545b48
Changed commits:
○ + rlvkpnrz da3f472d 2ab
- rlvkpnrz hidden 82ad1ba9 2b
- rlvkpnrz hidden a7e9a63b 2a
○ + rlvkpnrz 17d68d92 2ab
- rlvkpnrz hidden c5cad9ab 2b
- rlvkpnrz hidden f189cafa 2a
diff --git a/file b/file
index 5e0f51b37b..60327514e0 100644
--- a/file
@ -1933,8 +1933,8 @@ fn test_op_diff_divergent_change() {
2b
Changed working copy default@:
+ rlvkpnrz da3f472d 2ab
- rlvkpnrz hidden 82ad1ba9 2b
+ rlvkpnrz 17d68d92 2ab
- rlvkpnrz hidden c5cad9ab 2b
[EOF]
");
@ -1948,18 +1948,18 @@ fn test_op_diff_divergent_change() {
&divergent_op_id,
]);
insta::assert_snapshot!(output, @r"
From operation: 6a444a3d42e6 (2001-02-03 08:05:15) squash commits into 82ad1ba9ded407bab6fea1524b207f49a02779a0
To operation: 8bd3751c26de (2001-02-03 08:05:12) describe commit 105ead440de2cf759d89f951c6def56bde950ef7
From operation: 90aa25304059 (2001-02-03 08:05:13) squash commits into c5cad9ab7772714178c158a133a0243908545b48
To operation: a1af26c1d765 (2001-02-03 08:05:11) describe commit 7a72a9ad7f4d8aa8b613a9840313b0ef0632842b
Changed commits:
○ + rlvkpnrz?? 82ad1ba9 2b
- rlvkpnrz hidden da3f472d 2ab
○ + rlvkpnrz?? a7e9a63b 2a
- rlvkpnrz hidden da3f472d 2ab
○ + rlvkpnrz?? c5cad9ab 2b
- rlvkpnrz hidden 17d68d92 2ab
○ + rlvkpnrz?? f189cafa 2a
- rlvkpnrz hidden 17d68d92 2ab
Changed working copy default@:
+ rlvkpnrz?? 82ad1ba9 2b
- rlvkpnrz hidden da3f472d 2ab
+ rlvkpnrz?? c5cad9ab 2b
- rlvkpnrz hidden 17d68d92 2ab
[EOF]
");
@ -1973,17 +1973,17 @@ fn test_op_diff_divergent_change() {
&initial_op_id,
]);
insta::assert_snapshot!(output, @r"
From operation: 8bd3751c26de (2001-02-03 08:05:12) describe commit 105ead440de2cf759d89f951c6def56bde950ef7
From operation: a1af26c1d765 (2001-02-03 08:05:11) describe commit 7a72a9ad7f4d8aa8b613a9840313b0ef0632842b
To operation: ef75d88dd5fe (2001-02-03 08:05:08) commit 5d86d4b609080a15077fcd723e537582d5ea6559
Changed commits:
○ + rlvkpnrz 4f7a567a (empty) (no description set)
- rlvkpnrz hidden 82ad1ba9 2b
- rlvkpnrz hidden a7e9a63b 2a
- rlvkpnrz hidden f189cafa 2a
- rlvkpnrz hidden c5cad9ab 2b
Changed working copy default@:
+ rlvkpnrz 4f7a567a (empty) (no description set)
- rlvkpnrz hidden 82ad1ba9 2b
- rlvkpnrz hidden c5cad9ab 2b
[EOF]
");
}

164
cli/tests/test_rebase_command.rs
View file

@ -681,9 +681,9 @@ fn test_rebase_revision_onto_descendant() {
------- stderr -------
Rebased 1 commits to destination
Rebased 3 descendant commits
Working copy (@) now at: vruxwmqv c6955993 merge | merge
Parent commit (@-) : royxmykx c5c326af b | b
Parent commit (@-) : zsuskuln 0209b42d a | a
Working copy (@) now at: vruxwmqv 6a82c6c9 merge | merge
Parent commit (@-) : royxmykx 934eadd8 b | b
Parent commit (@-) : zsuskuln fd4e3113 a | a
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@ -715,9 +715,9 @@ fn test_rebase_revision_onto_descendant() {
------- stderr -------
Rebased 1 commits to destination
Rebased 3 descendant commits
Working copy (@) now at: vruxwmqv 0107ef56 merge | merge
Parent commit (@-) : royxmykx 308bc577 b | b
Parent commit (@-) : zsuskuln 787e95a3 a | a
Working copy (@) now at: vruxwmqv 6091a06e merge | merge
Parent commit (@-) : royxmykx 072bc1fa b | b
Parent commit (@-) : zsuskuln afb318cf a | a
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@ -1081,8 +1081,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 3 commits to destination
Working copy (@) now at: znkkpsqq 18654225 c | c
Parent commit (@-) : vruxwmqv 0692b190 b | b
Working copy (@) now at: znkkpsqq b65f55fb c | c
Parent commit (@-) : vruxwmqv c90d30a4 b | b
[EOF]
");
// Commit "a" should be rebased onto the root commit. Commit "b" should have
@ -1140,8 +1140,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 commits to destination
Working copy (@) now at: znkkpsqq 9c2125ec c | c
Parent commit (@-) : vruxwmqv 4e0e4f65 b | b
Working copy (@) now at: znkkpsqq 5b285fee c | c
Parent commit (@-) : vruxwmqv 988d520d b | b
[EOF]
");
// The commits in roots(a..c), i.e. commit "b" should be rebased onto "a",
@ -1197,8 +1197,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr -------
Rebased 1 commits to destination
Rebased 3 descendant commits
Working copy (@) now at: znkkpsqq ad824411 c | c
Parent commit (@-) : vruxwmqv 00fef98f b | b
Working copy (@) now at: znkkpsqq ad772a82 c | c
Parent commit (@-) : vruxwmqv 79030f30 b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@ -1224,8 +1224,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr -------
Rebased 1 commits to destination
Rebased 3 descendant commits
Working copy (@) now at: znkkpsqq 90fa9696 c | c
Parent commit (@-) : vruxwmqv 879a9415 b | b
Working copy (@) now at: znkkpsqq 3cdfeb24 c | c
Parent commit (@-) : vruxwmqv d77e32e7 b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@ -1250,8 +1250,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr -------
Rebased 1 commits to destination
Rebased 3 descendant commits
Working copy (@) now at: znkkpsqq 8a117fcc c | c
Parent commit (@-) : vruxwmqv 317e1465 b | b
Working copy (@) now at: znkkpsqq afc19fe0 c | c
Parent commit (@-) : vruxwmqv c319447d b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@ -1287,8 +1287,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr -------
Rebased 1 commits to destination
Rebased 2 descendant commits
Working copy (@) now at: znkkpsqq 4eb7e0f2 c | c
Parent commit (@-) : vruxwmqv cb7405be b | b
Working copy (@) now at: znkkpsqq 1cb17633 c | c
Parent commit (@-) : vruxwmqv 801b1b8c b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@ -1311,7 +1311,7 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr -------
Rebased 1 commits to destination
Rebased 1 descendant commits
Working copy (@) now at: znkkpsqq 213edff9 c | c
Working copy (@) now at: znkkpsqq f8853d0d c | c
Parent commit (@-) : zsuskuln 3a2d0837 base | base
Parent commit (@-) : royxmykx c7aebf99 a | a
Added 0 files, modified 0 files, removed 1 files
@ -1339,7 +1339,7 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr -------
Rebased 1 commits to destination
Rebased 1 descendant commits
Working copy (@) now at: znkkpsqq b2ebd194 c | c
Working copy (@) now at: znkkpsqq 6feb5c0f c | c
Parent commit (@-) : zsuskuln 3a2d0837 base | base
Parent commit (@-) : royxmykx c7aebf99 a | a
Added 0 files, modified 0 files, removed 1 files
@ -1364,7 +1364,7 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 commits to destination
Working copy (@) now at: znkkpsqq c5bfb6cd c | c
Working copy (@) now at: znkkpsqq a0c5ea8f c | c
Parent commit (@-) : royxmykx c7aebf99 a | a
Added 0 files, modified 0 files, removed 1 files
[EOF]
@ -1473,8 +1473,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 1 commits to destination
Rebased 3 descendant commits
Working copy (@) now at: xznxytkn 97cc6077 f | f
Parent commit (@-) : kmkuslsw 5dbb2427 c | c
Working copy (@) now at: xznxytkn 2f59b944 f | f
Parent commit (@-) : kmkuslsw 88ddc78c c | c
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -1501,7 +1501,7 @@ fn test_rebase_after() {
------- stderr -------
Rebased 1 commits to destination
Rebased 1 descendant commits
Working copy (@) now at: xznxytkn d8eb20c6 f | f
Working copy (@) now at: xznxytkn da215ecd f | f
Parent commit (@-) : kmkuslsw ed86d82a c | c
Added 0 files, modified 0 files, removed 1 files
[EOF]
@ -1530,7 +1530,7 @@ fn test_rebase_after() {
------- stderr -------
Rebased 1 commits to destination
Rebased 4 descendant commits
Working copy (@) now at: xznxytkn 5fd4cd2f f | f
Working copy (@) now at: xznxytkn 2c606e19 f | f
Parent commit (@-) : zsuskuln 62634b59 b1 | b1
Added 0 files, modified 0 files, removed 5 files
[EOF]
@ -1559,7 +1559,7 @@ fn test_rebase_after() {
------- stderr -------
Rebased 1 commits to destination
Rebased 3 descendant commits
Working copy (@) now at: xznxytkn 2d5daf12 f | f
Working copy (@) now at: xznxytkn e60a4b0c f | f
Parent commit (@-) : royxmykx 40646d19 b2 | b2
Added 0 files, modified 0 files, removed 4 files
[EOF]
@ -1590,7 +1590,7 @@ fn test_rebase_after() {
------- stderr -------
Rebased 1 commits to destination
Rebased 2 descendant commits
Working copy (@) now at: xznxytkn 8e643676 f | f
Working copy (@) now at: xznxytkn 84786555 f | f
Parent commit (@-) : kmkuslsw ed86d82a c | c
Added 0 files, modified 0 files, removed 1 files
[EOF]
@ -1618,7 +1618,7 @@ fn test_rebase_after() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 commits to destination
Working copy (@) now at: xznxytkn 2f0981e9 f | f
Working copy (@) now at: xznxytkn d5324bb4 f | f
Parent commit (@-) : nkmrtpmo 50d9bd5d e | e
Parent commit (@-) : lylxulpl 610f541b d | d
Added 1 files, modified 0 files, removed 0 files
@ -1649,8 +1649,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 2 commits to destination
Rebased 6 descendant commits
Working copy (@) now at: xznxytkn 21d27649 f | f
Parent commit (@-) : kmkuslsw 92f2c98c c | c
Working copy (@) now at: xznxytkn 17632090 f | f
Parent commit (@-) : kmkuslsw 726c937e c | c
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@ -1680,8 +1680,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 3 commits to destination
Rebased 3 descendant commits
Working copy (@) now at: xznxytkn 9a8f2c96 f | f
Parent commit (@-) : nkmrtpmo 820c8b34 e | e
Working copy (@) now at: xznxytkn 991bd3ac f | f
Parent commit (@-) : nkmrtpmo f9ecf426 e | e
Added 0 files, modified 0 files, removed 3 files
[EOF]
");
@ -1711,8 +1711,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 4 commits to destination
Rebased 2 descendant commits
Working copy (@) now at: xznxytkn d07fb785 f | f
Parent commit (@-) : nkmrtpmo aa71eb43 e | e
Working copy (@) now at: xznxytkn 0123019e f | f
Parent commit (@-) : nkmrtpmo 903f8aa0 e | e
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@ -1742,8 +1742,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 3 commits to destination
Rebased 6 descendant commits
Working copy (@) now at: xznxytkn f9826fef f | f
Parent commit (@-) : nkmrtpmo b81b7ce9 e | e
Working copy (@) now at: xznxytkn fdeb070b f | f
Parent commit (@-) : nkmrtpmo f1b259b2 e | e
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@ -1771,8 +1771,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 2 commits to destination
Rebased 3 descendant commits
Working copy (@) now at: xznxytkn d78db4b3 f | f
Parent commit (@-) : kmkuslsw 993282fd c | c
Working copy (@) now at: xznxytkn c8ba9324 f | f
Parent commit (@-) : kmkuslsw 0bd3b3d1 c | c
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@ -1826,8 +1826,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 4 commits to destination
Rebased 2 descendant commits
Working copy (@) now at: xznxytkn 7487eccf f | f
Parent commit (@-) : nkmrtpmo 8ad5c1e5 e | e
Working copy (@) now at: xznxytkn 9ea28699 f | f
Parent commit (@-) : nkmrtpmo 989281ba e | e
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@ -1859,8 +1859,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 6 commits to destination
Rebased 1 descendant commits
Working copy (@) now at: xznxytkn 082a50a2 f | f
Parent commit (@-) : nkmrtpmo 2480a543 e | e
Working copy (@) now at: xznxytkn 63860138 f | f
Parent commit (@-) : nkmrtpmo cc7e9907 e | e
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@ -1991,8 +1991,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 1 commits to destination
Rebased 8 descendant commits
Working copy (@) now at: xznxytkn 98c82067 f | f
Parent commit (@-) : nkmrtpmo 41089a93 e | e
Working copy (@) now at: xznxytkn ff62b7d5 f | f
Parent commit (@-) : nkmrtpmo b007a305 e | e
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -2019,7 +2019,7 @@ fn test_rebase_before() {
------- stderr -------
Rebased 1 commits to destination
Rebased 1 descendant commits
Working copy (@) now at: xznxytkn ffa5832a f | f
Working copy (@) now at: xznxytkn d8eb20c6 f | f
Parent commit (@-) : kmkuslsw ed86d82a c | c
Added 0 files, modified 0 files, removed 1 files
[EOF]
@ -2048,7 +2048,7 @@ fn test_rebase_before() {
------- stderr -------
Rebased 1 commits to destination
Rebased 4 descendant commits
Working copy (@) now at: xznxytkn 545fc926 f | f
Working copy (@) now at: xznxytkn 5fd4cd2f f | f
Parent commit (@-) : zsuskuln 62634b59 b1 | b1
Added 0 files, modified 0 files, removed 5 files
[EOF]
@ -2077,7 +2077,7 @@ fn test_rebase_before() {
------- stderr -------
Rebased 1 commits to destination
Rebased 5 descendant commits
Working copy (@) now at: xznxytkn 1ae90146 f | f
Working copy (@) now at: xznxytkn 4bb8afb7 f | f
Parent commit (@-) : rlvkpnrz 7d980be7 a | a
Added 0 files, modified 0 files, removed 6 files
[EOF]
@ -2108,7 +2108,7 @@ fn test_rebase_before() {
------- stderr -------
Rebased 1 commits to destination
Rebased 3 descendant commits
Working copy (@) now at: xznxytkn 2847f9cb f | f
Working copy (@) now at: xznxytkn b1d5040b f | f
Parent commit (@-) : royxmykx 40646d19 b2 | b2
Parent commit (@-) : znkkpsqq 256ac307 b4 | b4
Added 0 files, modified 0 files, removed 2 files
@ -2138,8 +2138,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 1 commits to destination
Rebased 5 descendant commits
Working copy (@) now at: xznxytkn 79a6976d f | f
Parent commit (@-) : nkmrtpmo 0dab325c e | e
Working copy (@) now at: xznxytkn 9ce35fe1 f | f
Parent commit (@-) : nkmrtpmo 95558239 e | e
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -2167,7 +2167,7 @@ fn test_rebase_before() {
------- stderr -------
Rebased 1 commits to destination
Rebased 5 descendant commits
Working copy (@) now at: xznxytkn af3763c8 f | f
Working copy (@) now at: xznxytkn b984057d f | f
Parent commit (@-) : zsuskuln 62634b59 b1 | b1
Parent commit (@-) : vruxwmqv a1d9eeb3 b3 | b3
Added 0 files, modified 0 files, removed 4 files
@ -2200,8 +2200,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 2 commits to destination
Rebased 7 descendant commits
Working copy (@) now at: xznxytkn eca1985d f | f
Parent commit (@-) : nkmrtpmo 74d26317 e | e
Working copy (@) now at: xznxytkn 13214a9a f | f
Parent commit (@-) : nkmrtpmo 257f541d e | e
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -2230,8 +2230,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 3 commits to destination
Rebased 3 descendant commits
Working copy (@) now at: xznxytkn b8d7a20d f | f
Parent commit (@-) : nkmrtpmo 018b2dea e | e
Working copy (@) now at: xznxytkn 903781e1 f | f
Parent commit (@-) : nkmrtpmo 2a0542d6 e | e
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -2261,8 +2261,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 2 commits to destination
Rebased 7 descendant commits
Working copy (@) now at: xznxytkn d8064481 f | f
Parent commit (@-) : kmkuslsw 8a86363c c | c
Working copy (@) now at: xznxytkn 9d5abf25 f | f
Parent commit (@-) : kmkuslsw ecde78f5 c | c
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -2291,8 +2291,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 3 commits to destination
Rebased 6 descendant commits
Working copy (@) now at: xznxytkn 80f586ab f | f
Parent commit (@-) : nkmrtpmo 2a584ab8 e | e
Working copy (@) now at: xznxytkn 912af1a2 f | f
Parent commit (@-) : nkmrtpmo 4e8eabcc e | e
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@ -2321,8 +2321,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 3 commits to destination
Rebased 6 descendant commits
Working copy (@) now at: xznxytkn 5ec39fd4 f | f
Parent commit (@-) : nkmrtpmo 3e5ae779 e | e
Working copy (@) now at: xznxytkn a2ed33ff f | f
Parent commit (@-) : nkmrtpmo b69d0e4b e | e
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@ -2376,8 +2376,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 4 commits to destination
Rebased 2 descendant commits
Working copy (@) now at: xznxytkn 5ef0b783 f | f
Parent commit (@-) : nkmrtpmo 893af621 e | e
Working copy (@) now at: xznxytkn 5fe09799 f | f
Parent commit (@-) : nkmrtpmo ee33f6f1 e | e
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@ -2410,8 +2410,8 @@ fn test_rebase_before() {
Skipped rebase of 2 commits that were already in place
Rebased 4 commits to destination
Rebased 2 descendant commits
Working copy (@) now at: xznxytkn a20aa8c4 f | f
Parent commit (@-) : nkmrtpmo 878800c4 e | e
Working copy (@) now at: xznxytkn d1c73b11 f | f
Parent commit (@-) : nkmrtpmo 53fc68f7 e | e
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@ -2486,8 +2486,8 @@ fn test_rebase_after_before() {
------- stderr -------
Rebased 1 commits to destination
Rebased 1 descendant commits
Working copy (@) now at: nmzmmopx 8ef73923 f | f
Parent commit (@-) : nkmrtpmo 49b3d9d8 d | d
Working copy (@) now at: nmzmmopx 321e1d40 f | f
Parent commit (@-) : nkmrtpmo 7d7b0aec d | d
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@ -2517,9 +2517,9 @@ fn test_rebase_after_before() {
------- stderr -------
Rebased 1 commits to destination
Rebased 1 descendant commits
Working copy (@) now at: nmzmmopx 00bf3e5b f | f
Working copy (@) now at: nmzmmopx a12b0ae1 f | f
Parent commit (@-) : xznxytkn d4334f29 e | e
Parent commit (@-) : nkmrtpmo 26362358 d | d
Parent commit (@-) : nkmrtpmo a3204f2a d | d
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@ -2553,8 +2553,8 @@ fn test_rebase_after_before() {
------- stderr -------
Rebased 1 commits to destination
Rebased 3 descendant commits
Working copy (@) now at: nmzmmopx f386d88f f | f
Parent commit (@-) : xznxytkn 0ad4a454 e | e
Working copy (@) now at: nmzmmopx 97ebbe11 f | f
Parent commit (@-) : xznxytkn e53a8360 e | e
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@ -2589,11 +2589,11 @@ fn test_rebase_after_before() {
------- stderr -------
Rebased 3 commits to destination
Rebased 1 descendant commits
Working copy (@) now at: nmzmmopx 8407e497 f | f
Working copy (@) now at: nmzmmopx 5a27aa46 f | f
Parent commit (@-) : znkkpsqq 0780cdfa b1 | b1
Parent commit (@-) : kmkuslsw 0692c8ed b2 | b2
Parent commit (@-) : nkmrtpmo 872104af d | d
Parent commit (@-) : xznxytkn dfec5269 e | e
Parent commit (@-) : nkmrtpmo 07028fe4 d | d
Parent commit (@-) : xznxytkn 1aa724f0 e | e
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@ -2624,8 +2624,8 @@ fn test_rebase_after_before() {
------- stderr -------
Rebased 4 commits to destination
Rebased 1 descendant commits
Working copy (@) now at: nmzmmopx 64331877 f | f
Parent commit (@-) : xznxytkn 59635051 e | e
Working copy (@) now at: nmzmmopx 5b68ace7 f | f
Parent commit (@-) : xznxytkn 8bfa4c49 e | e
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@ -2657,8 +2657,8 @@ fn test_rebase_after_before() {
------- stderr -------
Rebased 3 commits to destination
Rebased 4 descendant commits
Working copy (@) now at: nmzmmopx f78e66eb f | f
Parent commit (@-) : xznxytkn 4ca68c7c e | e
Working copy (@) now at: nmzmmopx 68713d9d f | f
Parent commit (@-) : xznxytkn d4bcbcd4 e | e
Added 3 files, modified 0 files, removed 0 files
[EOF]
");
@ -2727,8 +2727,8 @@ fn test_rebase_skip_emptied() {
------- stderr -------
Rebased 2 commits to destination
Abandoned 1 newly emptied commits
Working copy (@) now at: yostqsxw f2f45f17 (empty) also already empty
Parent commit (@-) : vruxwmqv fe22a09e (empty) already empty
Working copy (@) now at: yostqsxw 6b46781e (empty) also already empty
Parent commit (@-) : vruxwmqv 4861a0a8 (empty) already empty
[EOF]
");
@ -2766,8 +2766,8 @@ fn test_rebase_skip_emptied() {
------- stderr -------
Rebased 2 descendant commits
Abandoned 1 newly emptied commits
Working copy (@) now at: yostqsxw a9d31081 (empty) also already empty
Parent commit (@-) : vruxwmqv 39722460 (empty) already empty
Working copy (@) now at: yostqsxw bbfc2a27 (empty) also already empty
Parent commit (@-) : vruxwmqv 1b8c46b3 (empty) already empty
Added 0 files, modified 0 files, removed 1 files
[EOF]
");

44
cli/tests/test_revert_command.rs
View file

@ -62,11 +62,11 @@ fn test_revert() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Reverted 1 commits as follows:
lylxulpl bd658e04 Revert "a"
wqnwkozp 64910788 Revert "a"
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
○ bd658e0413c5 Revert "a"
○ 64910788f8a5 Revert "a"
│
│ This reverts commit 7d980be7a1d499e4d316ab4c01242885032f7eaf.
@ 98fb6151f954 d
@ -87,14 +87,14 @@ fn test_revert() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Reverted 1 commits as follows:
uyznsvlq fee69440 Revert "Revert "a""
nkmrtpmo 90d12316 Revert "Revert "a""
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
○ fee69440c3d9 Revert "Revert "a""
○ 90d123162199 Revert "Revert "a""
│
│ This reverts commit bd658e0413c590b93dcbabec38fc5d15258469a1.
○ bd658e0413c5 Revert "a"
│ This reverts commit 64910788f8a5d322739e1e38ef35f7d06ea4b38d.
○ 64910788f8a5 Revert "a"
│
│ This reverts commit 7d980be7a1d499e4d316ab4c01242885032f7eaf.
@ 98fb6151f954 d
@ -116,17 +116,17 @@ fn test_revert() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Reverted 1 commits as follows:
tlkvzzqu ccdc971f Revert "a"
nmzmmopx 9e7b8585 Revert "a"
Rebased 2 descendant commits
Working copy (@) now at: vruxwmqv c114bcab d | (empty) d
Parent commit (@-) : royxmykx 59e91fd2 c | (empty) c
Working copy (@) now at: vruxwmqv b1885396 d | (empty) d
Parent commit (@-) : royxmykx efc4bd83 c | (empty) c
Added 0 files, modified 0 files, removed 1 files
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ c114bcabdf5e d
○ 59e91fd21873 c
○ ccdc971f590b Revert "a"
@ b18853966f79 d
○ efc4bd83159f c
○ 9e7b85853718 Revert "a"
│
│ This reverts commit 7d980be7a1d499e4d316ab4c01242885032f7eaf.
○ 58aaf278bf58 b
@ -146,16 +146,16 @@ fn test_revert() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Reverted 1 commits as follows:
xlzxqlsl afc1d158 Revert "a"
pzsxstzt d51ea564 Revert "a"
Rebased 1 descendant commits
Working copy (@) now at: vruxwmqv cdc45e62 d | (empty) d
Parent commit (@-) : xlzxqlsl afc1d158 Revert "a"
Working copy (@) now at: vruxwmqv 5c5d60a6 d | (empty) d
Parent commit (@-) : pzsxstzt d51ea564 Revert "a"
Added 0 files, modified 0 files, removed 1 files
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ cdc45e62ac5b d
○ afc1d15825d2 Revert "a"
@ 5c5d60a69afd d
○ d51ea56444ce Revert "a"
│
│ This reverts commit 7d980be7a1d499e4d316ab4c01242885032f7eaf.
○ 96ff42270bbc c
@ -176,18 +176,18 @@ fn test_revert() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Reverted 1 commits as follows:
pkstwlsy 6c118c03 Revert "a"
oupztwtk d311a8f0 Revert "a"
Rebased 1 descendant commits
Working copy (@) now at: vruxwmqv 3f3fb2f9 d | (empty) d
Working copy (@) now at: vruxwmqv 5b97d572 d | (empty) d
Parent commit (@-) : royxmykx 96ff4227 c | (empty) c
Parent commit (@-) : pkstwlsy 6c118c03 Revert "a"
Parent commit (@-) : oupztwtk d311a8f0 Revert "a"
Added 0 files, modified 0 files, removed 1 files
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ 3f3fb2f905d3 d
@ 5b97d572e457 d
├─╮
│ ○ 6c118c03ae97 Revert "a"
│ ○ d311a8f0c13f Revert "a"
│ │
│ │ This reverts commit 7d980be7a1d499e4d316ab4c01242885032f7eaf.
○ │ 96ff42270bbc c

14
cli/tests/test_simplify_parents_command.rs
View file

@ -200,8 +200,8 @@ fn test_simplify_parents_multiple_redundant_parents() {
------- stderr -------
Removed 2 edges from 2 out of 2 commits.
Rebased 2 descendant commits
Working copy (@) now at: kmkuslsw 58e098e5 f | f
Parent commit (@-) : znkkpsqq 374f4ddc e | e
Working copy (@) now at: kmkuslsw 5ad764e9 f | f
Parent commit (@-) : znkkpsqq 9102487c e | e
[EOF]
");
@ -224,8 +224,8 @@ fn test_simplify_parents_multiple_redundant_parents() {
------- stderr -------
Removed 2 edges from 2 out of 4 commits.
Rebased 2 descendant commits
Working copy (@) now at: kmkuslsw 37ef137f f | f
Parent commit (@-) : znkkpsqq b982b07d e | e
Working copy (@) now at: kmkuslsw 2b2c1c63 f | f
Parent commit (@-) : znkkpsqq 9142e3bb e | e
[EOF]
");
@ -276,8 +276,8 @@ fn test_simplify_parents_no_args() {
------- stderr -------
Removed 2 edges from 2 out of 6 commits.
Rebased 2 descendant commits
Working copy (@) now at: kmkuslsw 58e098e5 f | f
Parent commit (@-) : znkkpsqq 374f4ddc e | e
Working copy (@) now at: kmkuslsw 5ad764e9 f | f
Parent commit (@-) : znkkpsqq 9102487c e | e
[EOF]
");
@ -300,7 +300,7 @@ fn test_simplify_parents_no_args() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Removed 1 edges from 1 out of 3 commits.
Working copy (@) now at: kmkuslsw 78ceb6e1 f | f
Working copy (@) now at: kmkuslsw 1180d0f5 f | f
Parent commit (@-) : znkkpsqq 009aef72 e | e
[EOF]
");

36
cli/tests/test_squash_command.rs
View file

@ -199,8 +199,8 @@ fn test_squash_partial() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: mzvwutvl f68fa41a c | (no description set)
Parent commit (@-) : qpvuntsm e5907084 a b | (no description set)
Working copy (@) now at: mzvwutvl 34484d82 c | (no description set)
Parent commit (@-) : qpvuntsm 3141e675 a b | (no description set)
[EOF]
");
@ -219,8 +219,8 @@ fn test_squash_partial() {
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ f68fa41ae180 c
○ e59070841535 a b
@ 34484d825f47 c
○ 3141e67514f6 a b
◆ 000000000000 (empty)
[EOF]
");
@ -237,14 +237,14 @@ fn test_squash_partial() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Working copy (@) now at: mzvwutvl 8846468b c | (no description set)
Parent commit (@-) : kkmpptxz 06cb2e79 b | (no description set)
Working copy (@) now at: mzvwutvl 37e1a0ef c | (no description set)
Parent commit (@-) : kkmpptxz b41e789d b | (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 8846468b7db7 c
○ 06cb2e79b78e b
○ 4a8b1bc7c58d a
@ 37e1a0ef57ff c
○ b41e789df71c b
○ 3af17565155e a
◆ 000000000000 (empty)
[EOF]
");
@ -277,14 +277,14 @@ fn test_squash_partial() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Working copy (@) now at: mzvwutvl 67c5cd3d c | (no description set)
Parent commit (@-) : kkmpptxz 9c514289 b | (no description set)
Working copy (@) now at: mzvwutvl 72ff256c c | (no description set)
Parent commit (@-) : kkmpptxz dd056a92 b | (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 67c5cd3d82e9 c
○ 9c51428943be b
○ 5977675073d1 a
@ 72ff256cd290 c
○ dd056a925eb3 b
○ cf083f1d9ccf a
◆ 000000000000 (empty)
[EOF]
");
@ -336,17 +336,17 @@ fn test_squash_partial() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: mzvwutvl a4fcdfe2 c | (no description set)
Parent commit (@-) : kkmpptxz f6a8a023 b | (no description set)
Working copy (@) now at: mzvwutvl 69c58f86 c | (no description set)
Parent commit (@-) : kkmpptxz 0f38c564 b | (no description set)
[EOF]
");
let output = work_dir.run_jj(["log", "-s"]);
insta::assert_snapshot!(output, @r"
@ mzvwutvl test.user@example.com 2001-02-03 08:05:37 c a4fcdfe2
@ mzvwutvl test.user@example.com 2001-02-03 08:05:36 c 69c58f86
│ (no description set)
│ M file1
│ M file2
○ kkmpptxz test.user@example.com 2001-02-03 08:05:37 b f6a8a023
○ kkmpptxz test.user@example.com 2001-02-03 08:05:36 b 0f38c564
│ (no description set)
│ M file1
│ M file2