github/jj-vcs-jj
1
0
Fork 0
mirror of https://github.com/jj-vcs/jj.git synced 2026-07-08 10:08:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

git: write change-id header by default

Browse Source 
We haven't had any reports of problems from people who opted in. Since
it's early in the release cycle now, let's now test it on everyone who
builds from head, so we get almost a month of testing from those
people before it's enabled by default in a released version.

This impacts lots of test cases because the change-id header is added
to the Git commit. Most are uninteresting. `test_git_fetch` now sees
some divergent changes where it used to see only divergent bookmarks,
which makes sense.
This commit is contained in:
Martin von Zweigbergk
2025-05-07 14:18:26 -07:00
parent ed8dcc82b3
commit acd824269f
59 changed files with 4578 additions and 4555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@@ -10,6 +10,15 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
### Release highlights
* The experimental support from release 0.29.0 for transferring the change ID
to/from Git remotes has been enabled by default. The change ID is stored in
the Git commit itself (in a commit header called `change-id`), which means
it will be transferred by regular `git push` etc. Please let us know if you
run into any problems with it. You can disable it setting
`git.write-change-id-header`. Note that some Git remotes (e.g GitLab) and
some Git commands (e.g. `git rebase`) do not preserve the change ids when
they rewrite commits.
### Breaking changes
* The old `libgit2` code path for fetches and pushes has been removed,

112
cli/tests/test_abandon_command.rs
View File

@@ -46,11 +46,11 @@ fn test_basics() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
vruxwmqv b7c62f28 d | d
vruxwmqv 636920e4 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
Working copy (@) now at: znkkpsqq 38e96a1f e | e
Parent commit (@-) : rlvkpnrz 7d980be7 a | a
Parent commit (@-) : royxmykx c12952d9 c d | c
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -71,10 +71,10 @@ fn test_basics() {
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
znkkpsqq 03e0d4bf e | e
Working copy (@) now at: nkmrtpmo 179731fc (empty) (no description set)
Parent commit (@-) : rlvkpnrz 7d980be7 a e?? | a
Parent commit (@-) : vruxwmqv 636920e4 d e?? | d
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -96,12 +96,12 @@ fn test_basics() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 2 commits:
znkkpsqq 5557ece3 e | e
vruxwmqv b7c62f28 d | d
znkkpsqq 03e0d4bf e | e
vruxwmqv 636920e4 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
Working copy (@) now at: xtnwkqum 1c70f4d2 (empty) (no description set)
Parent commit (@-) : rlvkpnrz 7d980be7 a | a
Parent commit (@-) : royxmykx c12952d9 c | c
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -123,7 +123,7 @@ fn test_basics() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
zsuskuln 1394f625 b | b
zsuskuln 123b4d91 b | b
Deleted bookmarks: b
[EOF]
");
@@ -144,12 +144,12 @@ fn test_basics() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 2 commits:
znkkpsqq 5557ece3 e | e
vruxwmqv b7c62f28 d | d
znkkpsqq 03e0d4bf e | e
vruxwmqv 636920e4 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
Working copy (@) now at: xlzxqlsl 55d5c4c2 (empty) (no description set)
Parent commit (@-) : rlvkpnrz 7d980be7 a | a
Parent commit (@-) : royxmykx c12952d9 c | c
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -188,18 +188,18 @@ fn test_abandon_many() {
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
kpqxywon 6faec5d1 (empty) commit9
znkkpsqq 80f67a53 (empty) commit8
yostqsxw 8bd72fcc (empty) commit7
vruxwmqv 06c46771 (empty) commit6
yqosqzyt 168813e3 (empty) commit5
royxmykx bd8c3571 (empty) commit4
mzvwutvl 57958fa0 (empty) commit3
zsuskuln 59515644 (empty) commit2
kkmpptxz a969596d (empty) commit1
rlvkpnrz 02fe38c9 (empty) commit0
...
Working copy (@) now at: kmkuslsw 822a2cf5 (empty) (no description set)
Working copy (@) now at: kmkuslsw a36a913b (empty) (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -241,11 +241,11 @@ fn test_bug_2600() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
zsuskuln 73c929fc base | base
zsuskuln 67c2f714 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
Working copy (@) now at: znkkpsqq 1e89909f c | c
Parent commit (@-) : vruxwmqv a3a61e53 b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -267,11 +267,11 @@ fn test_bug_2600() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
royxmykx 98f3b9ba a | a
royxmykx 183dbbca 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
Working copy (@) now at: znkkpsqq a9a97c4c c | c
Parent commit (@-) : vruxwmqv bccf7988 b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -292,12 +292,12 @@ fn test_bug_2600() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
vruxwmqv 8c0dced0 b | b
vruxwmqv cedee197 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
Working copy (@) now at: znkkpsqq 8030a364 c | c
Parent commit (@-) : zsuskuln 67c2f714 base | base
Parent commit (@-) : royxmykx 183dbbca a | a
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -330,11 +330,11 @@ fn test_bug_2600() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 2 commits:
vruxwmqv 8c0dced0 b | b
royxmykx 98f3b9ba a | a
vruxwmqv cedee197 b | b
royxmykx 183dbbca 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
Working copy (@) now at: znkkpsqq 75bef1a6 c | c
Parent commit (@-) : zsuskuln 67c2f714 a b base | base
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -349,7 +349,7 @@ fn test_bug_2600() {
");
let output = work_dir.run_jj(["bookmark", "list", "b"]);
insta::assert_snapshot!(output, @r"
b: zsuskuln 73c929fc base
b: zsuskuln 67c2f714 base
[EOF]
");
}
@@ -397,7 +397,7 @@ fn test_double_abandon() {
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
rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 7d980be7
a
[EOF]
");
@@ -412,9 +412,9 @@ fn test_double_abandon() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
rlvkpnrz 2443ea76 a | a
rlvkpnrz 7d980be7 a | a
Deleted bookmarks: a
Working copy (@) now at: royxmykx f37b4afd (empty) (no description set)
Working copy (@) now at: royxmykx 0cff017c (empty) (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 0 files, removed 1 files
[EOF]
@@ -423,7 +423,7 @@ fn test_double_abandon() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
rlvkpnrz hidden 2443ea76 a
rlvkpnrz hidden 7d980be7 a
Nothing changed.
[EOF]
");
@@ -446,10 +446,10 @@ fn test_abandon_restore_descendants() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
rlvkpnrz 225adef1 (no description set)
rlvkpnrz b23f92c3 (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)
Working copy (@) now at: kkmpptxz 2b575035 (no description set)
Parent commit (@-) : qpvuntsm d0c049cd (no description set)
[EOF]
");
let output = work_dir.run_jj(["diff", "--git"]);
@@ -496,7 +496,7 @@ fn test_abandon_tracking_bookmarks() {
.success();
insta::assert_snapshot!(get_log_output(&local_dir), @r"
@ [zsu] bar
│ ○ [vvk] foo
│ ○ [qpv] foo
├─╯
◆ [zzz]
[EOF]
@@ -506,7 +506,7 @@ fn test_abandon_tracking_bookmarks() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
vvkvtnvv 230dd059 foo | (empty) (no description set)
qpvuntsm e8849ae1 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]
@@ -515,9 +515,9 @@ fn test_abandon_tracking_bookmarks() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Abandoned 1 commits:
zsuskuln f652c321 bar | (empty) (no description set)
zsuskuln c2934cfb bar | (empty) (no description set)
Deleted bookmarks: bar
Working copy (@) now at: vruxwmqv 41658cf4 (empty) (no description set)
Working copy (@) now at: vruxwmqv b64f323d (empty) (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");

226
cli/tests/test_absorb_command.rs
View File

@@ -46,10 +46,10 @@ fn test_absorb_simple() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Absorbed changes into 2 revisions:
zsuskuln 3027ca7a 2
kkmpptxz d0f1e8dd 1
Working copy (@) now at: yqosqzyt 277bed24 (empty) (no description set)
Parent commit (@-) : zsuskuln 3027ca7a 2
zsuskuln 95568809 2
kkmpptxz bd7d4016 1
Working copy (@) now at: yqosqzyt 977269ac (empty) (no description set)
Parent commit (@-) : zsuskuln 95568809 2
[EOF]
");
@@ -59,10 +59,10 @@ fn test_absorb_simple() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Absorbed changes into 1 revisions:
kkmpptxz d366d92c 1
kkmpptxz 5810eb0f 1
Rebased 1 descendant commits.
Working copy (@) now at: vruxwmqv 32eb72fe (empty) (no description set)
Parent commit (@-) : zsuskuln 5bf0bc06 2
Working copy (@) now at: vruxwmqv 48c7d8fa (empty) (no description set)
Parent commit (@-) : zsuskuln 8edd60a2 2
[EOF]
");
@@ -72,9 +72,9 @@ fn test_absorb_simple() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Absorbed changes into 1 revisions:
zsuskuln 6e2c4777 2
Working copy (@) now at: yostqsxw 4a48490c (empty) (no description set)
Parent commit (@-) : zsuskuln 6e2c4777 2
zsuskuln dd109863 2
Working copy (@) now at: yostqsxw 7482f74b (empty) (no description set)
Parent commit (@-) : zsuskuln dd109863 2
[EOF]
");
@@ -88,7 +88,7 @@ fn test_absorb_simple() {
");
insta::assert_snapshot!(get_diffs(&work_dir, "mutable()"), @r"
@ yostqsxw 80965bcc (no description set)
@ yostqsxw bde51bc9 (no description set)
│ diff --git a/file1 b/file1
│ index 8653ca354d..88eb438902 100644
│ --- a/file1
@@ -100,7 +100,7 @@ fn test_absorb_simple() {
│ +Y
│ 2a
│ 2Z
○ zsuskuln 6e2c4777 2
○ zsuskuln dd109863 2
│ diff --git a/file1 b/file1
│ index ed237b5112..8653ca354d 100644
│ --- a/file1
@@ -111,7 +111,7 @@ fn test_absorb_simple() {
│ 1b
│ +2a
│ +2Z
○ kkmpptxz d366d92c 1
○ kkmpptxz 5810eb0f 1
│ diff --git a/file1 b/file1
│ index e69de29bb2..ed237b5112 100644
│ --- a/file1
@@ -120,37 +120,37 @@ fn test_absorb_simple() {
│ +1X
│ +1A
│ +1b
○ qpvuntsm 1a4edb91 0
○ qpvuntsm 6a446874 0
│ diff --git a/file1 b/file1
~ new file mode 100644
index 0000000000..e69de29bb2
[EOF]
");
insta::assert_snapshot!(get_evolog(&work_dir, "description(1)"), @r"
○ kkmpptxz d366d92c 1
○ kkmpptxz 5810eb0f 1
├─╮
│ ○ yqosqzyt hidden c506fbc7 (no description set)
│ ○ yqosqzyt hidden 277bed24 (empty) (no description set)
○ kkmpptxz hidden d0f1e8dd 1
│ ○ yqosqzyt hidden 39b42898 (no description set)
│ ○ yqosqzyt hidden 977269ac (empty) (no description set)
○ kkmpptxz hidden bd7d4016 1
├─╮
│ ○ mzvwutvl hidden 8935ee61 (no description set)
│ ○ mzvwutvl hidden 2bc3d2ce (empty) (no description set)
○ kkmpptxz hidden ee76d790 1
○ kkmpptxz hidden 677e62d5 (empty) 1
│ ○ mzvwutvl hidden 0b307741 (no description set)
│ ○ mzvwutvl hidden f2709b4e (empty) (no description set)
○ kkmpptxz hidden 1553c5e8 1
○ kkmpptxz hidden eb943711 (empty) 1
[EOF]
");
insta::assert_snapshot!(get_evolog(&work_dir, "description(2)"), @r"
○ zsuskuln 6e2c4777 2
○ zsuskuln dd109863 2
├─╮
│ ○ vruxwmqv hidden 7b1da5cd (no description set)
│ ○ vruxwmqv hidden 32eb72fe (empty) (no description set)
○ zsuskuln hidden 5bf0bc06 2
○ zsuskuln hidden 3027ca7a 2
│ ○ vruxwmqv hidden 761492a8 (no description set)
│ ○ vruxwmqv hidden 48c7d8fa (empty) (no description set)
○ zsuskuln hidden 8edd60a2 2
○ zsuskuln hidden 95568809 2
├─╮
│ ○ mzvwutvl hidden 8935ee61 (no description set)
│ ○ mzvwutvl hidden 2bc3d2ce (empty) (no description set)
○ zsuskuln hidden cca09b4d 2
○ zsuskuln hidden 7b092471 (empty) 2
│ ○ mzvwutvl hidden 0b307741 (no description set)
│ ○ mzvwutvl hidden f2709b4e (empty) (no description set)
○ zsuskuln hidden 36fad385 2
○ zsuskuln hidden 561fbce9 (empty) 2
[EOF]
");
}
@@ -176,12 +176,12 @@ fn test_absorb_replace_single_line_hunk() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Absorbed changes into 1 revisions:
qpvuntsm 7e885236 (conflict) 1
qpvuntsm 5bdb5ca1 (conflict) 1
Rebased 1 descendant commits.
Working copy (@) now at: mzvwutvl e9c3b95b (empty) (no description set)
Parent commit (@-) : kkmpptxz 7c36845c 2
Working copy (@) now at: mzvwutvl 804fe9d9 (empty) (no description set)
Parent commit (@-) : kkmpptxz 6068e8fc 2
New conflicts appeared in 1 commits:
qpvuntsm 7e885236 (conflict) 1
qpvuntsm 5bdb5ca1 (conflict) 1
Hint: To resolve the conflicts, start by updating to it:
jj new qpvuntsm
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -191,8 +191,8 @@ fn test_absorb_replace_single_line_hunk() {
");
insta::assert_snapshot!(get_diffs(&work_dir, "mutable()"), @r"
@ mzvwutvl e9c3b95b (empty) (no description set)
○ kkmpptxz 7c36845c 2
@ mzvwutvl 804fe9d9 (empty) (no description set)
○ kkmpptxz 6068e8fc 2
│ diff --git a/file1 b/file1
│ index 0000000000..2f87e8e465 100644
│ --- a/file1
@@ -208,7 +208,7 @@ fn test_absorb_replace_single_line_hunk() {
│ 1A
│ 2b
│ ->>>>>>> Conflict 1 of 1 ends
× qpvuntsm 7e885236 (conflict) 1
× qpvuntsm 5bdb5ca1 (conflict) 1
│ diff --git a/file1 b/file1
~ new file mode 100644
index 0000000000..0000000000
@@ -247,9 +247,9 @@ fn test_absorb_merge() {
let output = work_dir.run_jj(["new", "-m3", "description(1)", "description(2)"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: mzvwutvl 08898161 (empty) 3
Parent commit (@-) : kkmpptxz 7e9df299 1
Parent commit (@-) : zsuskuln baf056cf 2
Working copy (@) now at: mzvwutvl 42875bf7 (empty) 3
Parent commit (@-) : kkmpptxz 9c66f62f 1
Parent commit (@-) : zsuskuln 6a3dcbcf 2
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -260,12 +260,12 @@ fn test_absorb_merge() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Absorbed changes into 2 revisions:
zsuskuln 71d1ee56 2
kkmpptxz 4d379399 1
zsuskuln a6fde7ea 2
kkmpptxz 00ecc958 1
Rebased 1 descendant commits.
Working copy (@) now at: mzvwutvl 9db19b54 (empty) 3
Parent commit (@-) : kkmpptxz 4d379399 1
Parent commit (@-) : zsuskuln 71d1ee56 2
Working copy (@) now at: mzvwutvl 30499858 (empty) 3
Parent commit (@-) : kkmpptxz 00ecc958 1
Parent commit (@-) : zsuskuln a6fde7ea 2
[EOF]
");
@@ -279,15 +279,15 @@ fn test_absorb_merge() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Absorbed changes into 1 revisions:
mzvwutvl e93c0210 3
Working copy (@) now at: vruxwmqv 1b10dfa4 (empty) (no description set)
Parent commit (@-) : mzvwutvl e93c0210 3
mzvwutvl faf778a4 3
Working copy (@) now at: vruxwmqv cec519a1 (empty) (no description set)
Parent commit (@-) : mzvwutvl faf778a4 3
[EOF]
");
insta::assert_snapshot!(get_diffs(&work_dir, "mutable()"), @r"
@ vruxwmqv 1b10dfa4 (empty) (no description set)
○ mzvwutvl e93c0210 3
@ vruxwmqv cec519a1 (empty) (no description set)
○ mzvwutvl faf778a4 3
├─╮ diff --git a/file2 b/file2
│ │ new file mode 100644
│ │ index 0000000000..44442d2d7b
@@ -295,7 +295,7 @@ fn test_absorb_merge() {
│ │ +++ b/file2
│ │ @@ -0,0 +1,1 @@
│ │ +3A
│ ○ zsuskuln 71d1ee56 2
│ ○ zsuskuln a6fde7ea 2
│ │ diff --git a/file1 b/file1
│ │ index eb6e8821f1..4907935b9f 100644
│ │ --- a/file1
@@ -304,7 +304,7 @@ fn test_absorb_merge() {
│ │ 0a
│ │ +2a
│ │ +2B
○ │ kkmpptxz 4d379399 1
○ │ kkmpptxz 00ecc958 1
├─╯ diff --git a/file1 b/file1
│ index eb6e8821f1..902dd8ef13 100644
│ --- a/file1
@@ -313,7 +313,7 @@ fn test_absorb_merge() {
│ +1A
│ +1b
│ 0a
○ qpvuntsm 3777b700 0
○ qpvuntsm d4f07be5 0
│ diff --git a/file1 b/file1
~ new file mode 100644
index 0000000000..eb6e8821f1
@@ -343,9 +343,9 @@ fn test_absorb_discardable_merge_with_descendant() {
let output = work_dir.run_jj(["new", "description(1)", "description(2)"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: mzvwutvl f59b2364 (empty) (no description set)
Parent commit (@-) : kkmpptxz 7e9df299 1
Parent commit (@-) : zsuskuln baf056cf 2
Working copy (@) now at: mzvwutvl ad00b91a (empty) (no description set)
Parent commit (@-) : kkmpptxz 9c66f62f 1
Parent commit (@-) : zsuskuln 6a3dcbcf 2
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -360,17 +360,17 @@ fn test_absorb_discardable_merge_with_descendant() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Absorbed changes into 2 revisions:
zsuskuln 02668cf6 2
kkmpptxz fcabe394 1
zsuskuln a6cd8e87 2
kkmpptxz 98b7d214 1
Rebased 1 descendant commits.
Working copy (@) now at: royxmykx f04f1247 3
Parent commit (@-) : kkmpptxz fcabe394 1
Parent commit (@-) : zsuskuln 02668cf6 2
Working copy (@) now at: royxmykx df946e9b 3
Parent commit (@-) : kkmpptxz 98b7d214 1
Parent commit (@-) : zsuskuln a6cd8e87 2
[EOF]
");
insta::assert_snapshot!(get_diffs(&work_dir, "mutable()"), @r"
@ royxmykx f04f1247 3
@ royxmykx df946e9b 3
├─╮ diff --git a/file2 b/file2
│ │ new file mode 100644
│ │ index 0000000000..31cd755d20
@@ -378,7 +378,7 @@ fn test_absorb_discardable_merge_with_descendant() {
│ │ +++ b/file2
│ │ @@ -0,0 +1,1 @@
│ │ +3a
│ ○ zsuskuln 02668cf6 2
│ ○ zsuskuln a6cd8e87 2
│ │ diff --git a/file1 b/file1
│ │ index eb6e8821f1..4907935b9f 100644
│ │ --- a/file1
@@ -387,7 +387,7 @@ fn test_absorb_discardable_merge_with_descendant() {
│ │ 0a
│ │ +2a
│ │ +2B
○ │ kkmpptxz fcabe394 1
○ │ kkmpptxz 98b7d214 1
├─╯ diff --git a/file1 b/file1
│ index eb6e8821f1..902dd8ef13 100644
│ --- a/file1
@@ -396,7 +396,7 @@ fn test_absorb_discardable_merge_with_descendant() {
│ +1A
│ +1b
│ 0a
○ qpvuntsm 3777b700 0
○ qpvuntsm d4f07be5 0
│ diff --git a/file1 b/file1
~ new file mode 100644
index 0000000000..eb6e8821f1
@@ -423,13 +423,13 @@ fn test_absorb_conflict() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 commits onto destination
Working copy (@) now at: kkmpptxz 74405a07 (conflict) (no description set)
Parent commit (@-) : qpvuntsm 3619e4e5 1
Working copy (@) now at: kkmpptxz 66d44b8c (conflict) (no description set)
Parent commit (@-) : qpvuntsm e35bcaff 1
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file1 2-sided conflict
New conflicts appeared in 1 commits:
kkmpptxz 74405a07 (conflict) (no description set)
kkmpptxz 66d44b8c (conflict) (no description set)
Hint: To resolve the conflicts, start by updating to it:
jj new kkmpptxz
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -493,21 +493,21 @@ fn test_absorb_deleted_file() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Absorbed changes into 1 revisions:
qpvuntsm f3c5cd48 1
qpvuntsm 38af7fd3 1
Rebased 1 descendant commits.
Working copy (@) now at: kkmpptxz 691fa544 (no description set)
Parent commit (@-) : qpvuntsm f3c5cd48 1
Working copy (@) now at: kkmpptxz efd883f6 (no description set)
Parent commit (@-) : qpvuntsm 38af7fd3 1
Remaining changes:
D file3
[EOF]
");
insta::assert_snapshot!(get_diffs(&work_dir, "mutable()"), @r"
@ kkmpptxz 691fa544 (no description set)
@ kkmpptxz efd883f6 (no description set)
│ diff --git a/file3 b/file3
│ deleted file mode 100644
│ index e69de29bb2..0000000000
○ qpvuntsm f3c5cd48 1
○ qpvuntsm 38af7fd3 1
│ diff --git a/file2 b/file2
~ new file mode 100644
index 0000000000..e69de29bb2
@@ -548,14 +548,14 @@ fn test_absorb_deleted_file_with_multiple_hunks() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Absorbed changes into 2 revisions:
kkmpptxz ca0a3d3c (conflict) 2
qpvuntsm f2703d39 (conflict) 1
kkmpptxz 8407ab95 (conflict) 2
qpvuntsm f1473264 (conflict) 1
Rebased 1 descendant commits.
Working copy (@) now at: zsuskuln 0156c3af (no description set)
Parent commit (@-) : kkmpptxz ca0a3d3c (conflict) 2
Working copy (@) now at: zsuskuln b56f0c39 (no description set)
Parent commit (@-) : kkmpptxz 8407ab95 (conflict) 2
New conflicts appeared in 2 commits:
kkmpptxz ca0a3d3c (conflict) 2
qpvuntsm f2703d39 (conflict) 1
kkmpptxz 8407ab95 (conflict) 2
qpvuntsm f1473264 (conflict) 1
Hint: To resolve the conflicts, start by updating to the first one:
jj new qpvuntsm
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -567,7 +567,7 @@ fn test_absorb_deleted_file_with_multiple_hunks() {
");
insta::assert_snapshot!(get_diffs(&work_dir, "mutable()"), @r"
@ zsuskuln 0156c3af (no description set)
@ zsuskuln b56f0c39 (no description set)
│ diff --git a/file2 b/file2
│ deleted file mode 100644
│ index 0000000000..0000000000
@@ -581,7 +581,7 @@ fn test_absorb_deleted_file_with_multiple_hunks() {
│ -+++++++ Contents of side #2
│ -1a
│ ->>>>>>> Conflict 1 of 1 ends
× kkmpptxz ca0a3d3c (conflict) 2
× kkmpptxz 8407ab95 (conflict) 2
│ diff --git a/file1 b/file1
│ deleted file mode 100644
│ index 0000000000..0000000000
@@ -608,7 +608,7 @@ fn test_absorb_deleted_file_with_multiple_hunks() {
│ -1b
│ +1a
│ >>>>>>> Conflict 1 of 1 ends
× qpvuntsm f2703d39 (conflict) 1
× qpvuntsm f1473264 (conflict) 1
│ diff --git a/file1 b/file1
~ new file mode 100644
index 0000000000..0000000000
@@ -658,21 +658,21 @@ fn test_absorb_file_mode() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Absorbed changes into 1 revisions:
qpvuntsm 991365da 1
qpvuntsm 2a0c7f1d 1
Rebased 1 descendant commits.
Working copy (@) now at: zsuskuln 77de368e (no description set)
Parent commit (@-) : qpvuntsm 991365da 1
Working copy (@) now at: zsuskuln 8ca9761d (no description set)
Parent commit (@-) : qpvuntsm 2a0c7f1d 1
Remaining changes:
M file1
[EOF]
");
insta::assert_snapshot!(get_diffs(&work_dir, "mutable()"), @r"
@ zsuskuln 77de368e (no description set)
@ zsuskuln 8ca9761d (no description set)
│ diff --git a/file1 b/file1
│ old mode 100755
│ new mode 100644
○ qpvuntsm 991365da 1
○ qpvuntsm 2a0c7f1d 1
│ diff --git a/file1 b/file1
~ new file mode 100755
index 0000000000..268de3f3ec
@@ -704,17 +704,17 @@ fn test_absorb_from_into() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Absorbed changes into 1 revisions:
kkmpptxz 91df4543 2
kkmpptxz cae507ef 2
Rebased 1 descendant commits.
Working copy (@) now at: zsuskuln d5424357 (no description set)
Parent commit (@-) : kkmpptxz 91df4543 2
Working copy (@) now at: zsuskuln f02fd9ea (no description set)
Parent commit (@-) : kkmpptxz cae507ef 2
Remaining changes:
M file1
[EOF]
");
insta::assert_snapshot!(get_diffs(&work_dir, "@-::"), @r"
@ zsuskuln d5424357 (no description set)
@ zsuskuln f02fd9ea (no description set)
│ diff --git a/file1 b/file1
│ index faf62af049..c2d0b12547 100644
│ --- a/file1
@@ -727,7 +727,7 @@ fn test_absorb_from_into() {
│ 1c
│ 2b
│ Z
○ kkmpptxz 91df4543 2
○ kkmpptxz cae507ef 2
│ diff --git a/file1 b/file1
~ index 352e9b3794..faf62af049 100644
--- a/file1
@@ -749,15 +749,15 @@ fn test_absorb_from_into() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Absorbed changes into 1 revisions:
rlvkpnrz 3a5fd02e 1
rlvkpnrz ddaed33d 1
Rebased 2 descendant commits.
Working copy (@) now at: zsuskuln 53ce490b (no description set)
Parent commit (@-) : kkmpptxz c94cd773 (empty) 2
Working copy (@) now at: zsuskuln 3652e5e5 (no description set)
Parent commit (@-) : kkmpptxz 7f4339e7 (empty) 2
[EOF]
");
insta::assert_snapshot!(get_diffs(&work_dir, "mutable()"), @r"
@ zsuskuln 53ce490b (no description set)
@ zsuskuln 3652e5e5 (no description set)
│ diff --git a/file1 b/file1
│ index faf62af049..c2d0b12547 100644
│ --- a/file1
@@ -770,8 +770,8 @@ fn test_absorb_from_into() {
│ 1c
│ 2b
│ Z
○ kkmpptxz c94cd773 (empty) 2
○ rlvkpnrz 3a5fd02e 1
○ kkmpptxz 7f4339e7 (empty) 2
○ rlvkpnrz ddaed33d 1
│ diff --git a/file1 b/file1
│ new file mode 100644
│ index 0000000000..faf62af049
@@ -785,7 +785,7 @@ fn test_absorb_from_into() {
│ +1c
│ +2b
│ +Z
○ qpvuntsm 230dd059 (empty) (no description set)
○ qpvuntsm e8849ae1 (empty) (no description set)
│
~
[EOF]
@@ -818,17 +818,17 @@ fn test_absorb_paths() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Absorbed changes into 1 revisions:
qpvuntsm ae044adb 1
qpvuntsm ca07fabe 1
Rebased 1 descendant commits.
Working copy (@) now at: kkmpptxz c6f31836 (no description set)
Parent commit (@-) : qpvuntsm ae044adb 1
Working copy (@) now at: kkmpptxz 4d80ada8 (no description set)
Parent commit (@-) : qpvuntsm ca07fabe 1
Remaining changes:
M file2
[EOF]
");
insta::assert_snapshot!(get_diffs(&work_dir, "mutable()"), @r"
@ kkmpptxz c6f31836 (no description set)
@ kkmpptxz 4d80ada8 (no description set)
│ diff --git a/file2 b/file2
│ index a8994dc188..268de3f3ec 100644
│ --- a/file2
@@ -836,7 +836,7 @@ fn test_absorb_paths() {
│ @@ -1,1 +1,1 @@
│ -1a
│ +1A
○ qpvuntsm ae044adb 1
○ qpvuntsm ca07fabe 1
│ diff --git a/file1 b/file1
~ new file mode 100644
index 0000000000..268de3f3ec
@@ -879,10 +879,10 @@ fn test_absorb_immutable() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Absorbed changes into 1 revisions:
kkmpptxz d80e3c2a 2
kkmpptxz e68cc3e2 2
Rebased 1 descendant commits.
Working copy (@) now at: mzvwutvl 3021153d (no description set)
Parent commit (@-) : kkmpptxz d80e3c2a 2
Working copy (@) now at: mzvwutvl 88443af7 (no description set)
Parent commit (@-) : kkmpptxz e68cc3e2 2
Remaining changes:
M file1
[EOF]
@@ -892,8 +892,8 @@ fn test_absorb_immutable() {
let output = work_dir.run_jj(["absorb", "--into=all()"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 3619e4e52fce is immutable
Hint: Could not modify commit: qpvuntsm 3619e4e5 main | 1
Error: Commit e35bcaffcb55 is immutable
Hint: Could not modify commit: qpvuntsm e35bcaff main | 1
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -904,7 +904,7 @@ fn test_absorb_immutable() {
"#);
insta::assert_snapshot!(get_diffs(&work_dir, ".."), @r"
@ mzvwutvl 3021153d (no description set)
@ mzvwutvl 88443af7 (no description set)
│ diff --git a/file1 b/file1
│ index 75e4047831..428796ca20 100644
│ --- a/file1
@@ -915,7 +915,7 @@ fn test_absorb_immutable() {
│ 1b
│ 2a
│ 2B
○ kkmpptxz d80e3c2a 2
○ kkmpptxz e68cc3e2 2
│ diff --git a/file1 b/file1
│ index 8c5268f893..75e4047831 100644
│ --- a/file1
@@ -925,7 +925,7 @@ fn test_absorb_immutable() {
│ 1b
│ +2a
│ +2B
◆ qpvuntsm 3619e4e5 1
◆ qpvuntsm e35bcaff 1
│ diff --git a/file1 b/file1
~ new file mode 100644
index 0000000000..8c5268f893

4
cli/tests/test_alias.rs
View File

@@ -215,7 +215,7 @@ fn test_alias_global_args_before_and_after() {
// Test the setup
let output = work_dir.run_jj(["l"]);
insta::assert_snapshot!(output, @r"
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -240,7 +240,7 @@ fn test_alias_global_args_before_and_after() {
");
let output = work_dir.run_jj(["-R", "../nonexistent", "l", "-R", "."]);
insta::assert_snapshot!(output, @r"
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");

68
cli/tests/test_backout_command.rs
View File

@@ -26,7 +26,7 @@ fn test_backout() {
create_commit_with_files(&work_dir, "a", &[], &[("a", "a\n")]);
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 2443ea76b0b1 a
@ 7d980be7a1d4 a
◆ 000000000000
[EOF]
");
@@ -45,10 +45,10 @@ fn test_backout() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
○ 6d845ed9fb6a Back out "a"
○ b8c8e82a19bc Back out "a"
│
│ This backs out commit 2443ea76b0b1c531326908326aab7020abab8e6c.
@ 2443ea76b0b1 a
│ This backs out commit 7d980be7a1d499e4d316ab4c01242885032f7eaf.
@ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);
@@ -68,13 +68,13 @@ fn test_backout() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
○ 79555ea9040b Back out "Back out "a""
○ 812d823be175 Back out "Back out "a""
│
│ This backs out commit 6d845ed9fb6a3d367e2d7068ef0256b1a10705a9.
@ 6d845ed9fb6a Back out "a"
│ This backs out commit b8c8e82a19bcf6217e065d1aff9a5f0ba807b565.
@ b8c8e82a19bc Back out "a"
│
│ This backs out commit 2443ea76b0b1c531326908326aab7020abab8e6c.
○ 2443ea76b0b1 a
│ This backs out commit 7d980be7a1d499e4d316ab4c01242885032f7eaf.
○ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);
@@ -99,11 +99,11 @@ fn test_backout_multiple() {
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 208f8612074a e
○ ceeec03be46b d
○ 413337bbd11f c
○ 46cc97af6802 b
○ 2443ea76b0b1 a
@ 51a01d6d8cc4 e
○ 4b9d123d3b33 d
○ 05e1f540476f c
○ f93a910dbdf0 b
○ 7d980be7a1d4 a
◆ 000000000000
[EOF]
");
@@ -117,34 +117,34 @@ fn test_backout_multiple() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
○ 6504c4ded177 Back out "b"
○ 036128aa5f6e Back out "b"
│
│ This backs out commit 46cc97af6802301d8db381386e8485ff3ff24ae6.
○ d31d42e0267f Back out "c"
│ This backs out commit f93a910dbdf0f841e6cf2bc0ab0ba4c336d6f436.
○ 156974608bed Back out "c"
│
│ This backs out commit 413337bbd11f7a6636c010d9e196acf801d8df2f.
○ 8ff3fbc2ccb0 Back out "e"
│ This backs out commit 05e1f540476f8c4207ff44febbe2ce6e6696dc4b.
○ 3f72017241e0 Back out "e"
│
│ This backs out commit 208f8612074af4c219d06568a8e1f04f2e80dc25.
@ 208f8612074a e
○ ceeec03be46b d
○ 413337bbd11f c
○ 46cc97af6802 b
○ 2443ea76b0b1 a
│ This backs out commit 51a01d6d8cc48a296cb87f8383b34ade3c050363.
@ 51a01d6d8cc4 e
○ 4b9d123d3b33 d
○ 05e1f540476f c
○ f93a910dbdf0 b
○ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);
// View the output of each backed out commit
let output = work_dir.run_jj(["show", "@+"]);
insta::assert_snapshot!(output, @r#"
Commit ID: 8ff3fbc2ccb0d66985f558c461d1643cebb4c7d6
Commit ID: 3f72017241e0a32ab837ae929061cdc05ff04f5b
Change ID: wqnwkozpkustnxypnnntnykwrqrkrpvv
Author : Test User <test.user@example.com> (2001-02-03 08:05:19)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:19)
Back out "e"
This backs out commit 208f8612074af4c219d06568a8e1f04f2e80dc25.
This backs out commit 51a01d6d8cc48a296cb87f8383b34ade3c050363.
Modified regular file a:
1 1: a
@@ -154,14 +154,14 @@ fn test_backout_multiple() {
"#);
let output = work_dir.run_jj(["show", "@++"]);
insta::assert_snapshot!(output, @r#"
Commit ID: d31d42e0267f6524d445348b1dd00926c62a6b57
Commit ID: 156974608bed539fb98d89c1f6995d962123cdbd
Change ID: mouksmquosnpvwqrpsvvxtxpywpnxlss
Author : Test User <test.user@example.com> (2001-02-03 08:05:19)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:19)
Back out "c"
This backs out commit 413337bbd11f7a6636c010d9e196acf801d8df2f.
This backs out commit 05e1f540476f8c4207ff44febbe2ce6e6696dc4b.
Removed regular file b:
1 : b
@@ -169,14 +169,14 @@ fn test_backout_multiple() {
"#);
let output = work_dir.run_jj(["show", "@+++"]);
insta::assert_snapshot!(output, @r#"
Commit ID: 6504c4ded177fba2334f76683d1aa643700d5073
Commit ID: 036128aa5f6eb3770cc8284c0dbe198b2c9a5f62
Change ID: tqvpomtpwrqsylrpsxknultrymmqxmxv
Author : Test User <test.user@example.com> (2001-02-03 08:05:19)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:19)
Back out "b"
This backs out commit 46cc97af6802301d8db381386e8485ff3ff24ae6.
This backs out commit f93a910dbdf0f841e6cf2bc0ab0ba4c336d6f436.
Modified regular file a:
1 1: a
@@ -206,7 +206,7 @@ fn test_backout_description_template() {
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 2443ea76b0b1 a
@ 7d980be7a1d4 a
◆ 000000000000
[EOF]
");
@@ -225,8 +225,8 @@ fn test_backout_description_template() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
○ 1db880a5204e Revert commit 2443ea76b0b1 "a"
@ 2443ea76b0b1 a
○ 6bfb98a33f58 Revert commit 7d980be7a1d4 "a"
@ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);

380
cli/tests/test_bookmark_command.rs
View File

@@ -50,11 +50,11 @@ fn test_bookmark_multiple_names() {
let output = work_dir.run_jj(["bookmark", "create", "-r@", "foo", "bar"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Created 2 bookmarks pointing to qpvuntsm 230dd059 bar foo | (empty) (no description set)
Created 2 bookmarks pointing to qpvuntsm e8849ae1 bar foo | (empty) (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ bar foo 230dd059e1b0
@ bar foo e8849ae12c70
◆ 000000000000
[EOF]
");
@@ -63,12 +63,12 @@ fn test_bookmark_multiple_names() {
let output = work_dir.run_jj(["bookmark", "set", "foo", "bar", "--to=@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 2 bookmarks to zsuskuln 8bb159bc bar foo | (empty) (no description set)
Moved 2 bookmarks to zsuskuln 0e555a27 bar foo | (empty) (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ bar foo 8bb159bc30a9
○ 230dd059e1b0
@ bar foo 0e555a27ac99
○ e8849ae12c70
◆ 000000000000
[EOF]
");
@@ -80,8 +80,8 @@ fn test_bookmark_multiple_names() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 8bb159bc30a9
○ 230dd059e1b0
@ 0e555a27ac99
○ e8849ae12c70
◆ 000000000000
[EOF]
");
@@ -90,7 +90,7 @@ fn test_bookmark_multiple_names() {
let output = work_dir.run_jj(["bookmark", "create", "-r@-", "foo", "bar"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Created 2 bookmarks pointing to qpvuntsm 230dd059 bar foo | (empty) (no description set)
Created 2 bookmarks pointing to qpvuntsm e8849ae1 bar foo | (empty) (no description set)
[EOF]
");
@@ -98,8 +98,8 @@ fn test_bookmark_multiple_names() {
let output = work_dir.run_jj(["bookmark", "set", "-r@", "bar", "baz"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Created 1 bookmarks pointing to zsuskuln 8bb159bc bar baz | (empty) (no description set)
Moved 1 bookmarks to zsuskuln 8bb159bc bar baz | (empty) (no description set)
Created 1 bookmarks pointing to zsuskuln 0e555a27 bar baz | (empty) (no description set)
Moved 1 bookmarks to zsuskuln 0e555a27 bar baz | (empty) (no description set)
[EOF]
");
@@ -107,7 +107,7 @@ fn test_bookmark_multiple_names() {
let output = work_dir.run_jj(["bookmark", "set", "-r@", "foo", "bar", "baz"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 1 bookmarks to zsuskuln 8bb159bc bar baz foo | (empty) (no description set)
Moved 1 bookmarks to zsuskuln 0e555a27 bar baz foo | (empty) (no description set)
[EOF]
");
}
@@ -230,7 +230,7 @@ fn test_bookmark_bad_name() {
let output = work_dir.run_jj(["bookmark", "create", "-r@", "'foo@bar'"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Created 1 bookmarks pointing to qpvuntsm 230dd059 foo@bar | (empty) (no description set)
Created 1 bookmarks pointing to qpvuntsm e8849ae1 foo@bar | (empty) (no description set)
[EOF]
");
}
@@ -259,7 +259,7 @@ fn test_bookmark_move() {
let output = work_dir.run_jj(["bookmark", "set", "foo", "--to=@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Created 1 bookmarks pointing to qpvuntsm 230dd059 foo | (empty) (no description set)
Created 1 bookmarks pointing to qpvuntsm e8849ae1 foo | (empty) (no description set)
[EOF]
");
@@ -276,7 +276,7 @@ fn test_bookmark_move() {
let output = work_dir.run_jj(["bookmark", "set", "foo", "--revision", "@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 1 bookmarks to mzvwutvl 167f90e7 foo | (empty) (no description set)
Moved 1 bookmarks to mzvwutvl 8afc18ff foo | (empty) (no description set)
[EOF]
");
@@ -292,14 +292,14 @@ fn test_bookmark_move() {
let output = work_dir.run_jj(["bookmark", "set", "-r@-", "--allow-backwards", "foo"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 1 bookmarks to qpvuntsm 230dd059 foo | (empty) (no description set)
Moved 1 bookmarks to qpvuntsm e8849ae1 foo | (empty) (no description set)
[EOF]
");
let output = work_dir.run_jj(["bookmark", "move", "foo", "--to=@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 1 bookmarks to mzvwutvl 167f90e7 foo | (empty) (no description set)
Moved 1 bookmarks to mzvwutvl 8afc18ff foo | (empty) (no description set)
[EOF]
");
@@ -315,7 +315,7 @@ fn test_bookmark_move() {
let output = work_dir.run_jj(["bookmark", "move", "--to=@-", "--allow-backwards", "foo"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 1 bookmarks to qpvuntsm 230dd059 foo | (empty) (no description set)
Moved 1 bookmarks to qpvuntsm e8849ae1 foo | (empty) (no description set)
[EOF]
");
@@ -327,7 +327,7 @@ fn test_bookmark_move() {
work_dir.run_jj(["bookmark", "delete", "foo"]).success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
foo (deleted)
@origin: qpvuntsm 1eb845f3 (empty) commit
@origin: qpvuntsm 5f3ceb1e (empty) commit
[EOF]
");
@@ -345,12 +345,12 @@ fn test_bookmark_move() {
let output = work_dir.run_jj(["bookmark", "set", "foo", "--to=@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 1 bookmarks to mzvwutvl 66d48752 foo* | (empty) (no description set)
Moved 1 bookmarks to mzvwutvl 91b59745 foo* | (empty) (no description set)
[EOF]
");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
foo: mzvwutvl 66d48752 (empty) (no description set)
@origin (behind by 1 commits): qpvuntsm 1eb845f3 (empty) commit
foo: mzvwutvl 91b59745 (empty) (no description set)
@origin (behind by 1 commits): qpvuntsm 5f3ceb1e (empty) commit
[EOF]
");
@@ -362,12 +362,12 @@ fn test_bookmark_move() {
let output = work_dir.run_jj(["bookmark", "create", "-r@", "foo"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Created 1 bookmarks pointing to mzvwutvl 66d48752 foo | (empty) (no description set)
Created 1 bookmarks pointing to mzvwutvl 91b59745 foo | (empty) (no description set)
[EOF]
");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
foo: mzvwutvl 66d48752 (empty) (no description set)
foo@origin: qpvuntsm 1eb845f3 (empty) commit
foo: mzvwutvl 91b59745 (empty) (no description set)
foo@origin: qpvuntsm 5f3ceb1e (empty) commit
[EOF]
");
}
@@ -392,11 +392,11 @@ fn test_bookmark_move_matching() {
.success();
work_dir.run_jj(["new", "-mhead2"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ a2781dd9ee37
○ c1 f4f38657a3dd
○ b1 f652c32197cf
│ ○ 6b5e840ea72b
│ ○ a1 a2 230dd059e1b0
@ 0dd9a4b12283
○ c1 2cbf65662e56
○ b1 c2934cfbfb19
│ ○ 9328ecc52471
│ ○ a1 a2 e8849ae12c70
├─╯
◆ 000000000000
[EOF]
@@ -445,16 +445,16 @@ fn test_bookmark_move_matching() {
let output = work_dir.run_jj(["bookmark", "move", "--from=::@", "--to=@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 2 bookmarks to vruxwmqv a2781dd9 b1 c1 | (empty) head2
Moved 2 bookmarks to vruxwmqv 0dd9a4b1 b1 c1 | (empty) head2
Hint: Specify bookmark by name to update just one of the bookmarks.
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ b1 c1 a2781dd9ee37
○ f4f38657a3dd
○ f652c32197cf
│ ○ 6b5e840ea72b
│ ○ a1 a2 230dd059e1b0
@ b1 c1 0dd9a4b12283
○ 2cbf65662e56
○ c2934cfbfb19
│ ○ 9328ecc52471
│ ○ a1 a2 e8849ae12c70
├─╯
◆ 000000000000
[EOF]
@@ -471,11 +471,11 @@ fn test_bookmark_move_matching() {
[exit status: 1]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ a2781dd9ee37
○ c1 f4f38657a3dd
○ b1 f652c32197cf
│ ○ 6b5e840ea72b
│ ○ a1 a2 230dd059e1b0
@ 0dd9a4b12283
○ c1 2cbf65662e56
○ b1 c2934cfbfb19
│ ○ 9328ecc52471
│ ○ a1 a2 e8849ae12c70
├─╯
◆ 000000000000
[EOF]
@@ -485,15 +485,15 @@ fn test_bookmark_move_matching() {
let output = work_dir.run_jj(["bookmark", "move", "--from=::a1+", "--to=a1+", "glob:?1"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 1 bookmarks to kkmpptxz 6b5e840e a1 | (empty) head1
Moved 1 bookmarks to kkmpptxz 9328ecc5 a1 | (empty) head1
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ a2781dd9ee37
○ c1 f4f38657a3dd
○ b1 f652c32197cf
│ ○ a1 6b5e840ea72b
│ ○ a2 230dd059e1b0
@ 0dd9a4b12283
○ c1 2cbf65662e56
○ b1 c2934cfbfb19
│ ○ a1 9328ecc52471
│ ○ a2 e8849ae12c70
├─╯
◆ 000000000000
[EOF]
@@ -559,7 +559,7 @@ fn test_bookmark_move_conflicting() {
let output = work_dir.run_jj(["bookmark", "set", "-rdescription(A1)", "foo"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 1 bookmarks to mzvwutvl 9328d344 foo | (empty) A1
Moved 1 bookmarks to mzvwutvl 0f5f3e2c foo | (empty) A1
[EOF]
");
insta::assert_snapshot!(get_log(), @r"
@@ -677,7 +677,7 @@ fn test_bookmark_forget_glob() {
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ bar-2 foo-1 foo-3 foo-4 230dd059e1b0
@ bar-2 foo-1 foo-3 foo-4 e8849ae12c70
◆ 000000000000
[EOF]
");
@@ -695,7 +695,7 @@ fn test_bookmark_forget_glob() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ bar-2 foo-4 230dd059e1b0
@ bar-2 foo-4 e8849ae12c70
◆ 000000000000
[EOF]
");
@@ -709,7 +709,7 @@ fn test_bookmark_forget_glob() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ bar-2 230dd059e1b0
@ bar-2 e8849ae12c70
◆ 000000000000
[EOF]
");
@@ -772,7 +772,7 @@ fn test_bookmark_delete_glob() {
work_dir.run_jj(["git", "push", "--all"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ bar-2 foo-1 foo-3 foo-4 312a98d6f27b
@ bar-2 foo-1 foo-3 foo-4 8e056f6b8c37
◆ 000000000000
[EOF]
");
@@ -790,7 +790,7 @@ fn test_bookmark_delete_glob() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ bar-2 foo-1@origin foo-3@origin foo-4 312a98d6f27b
@ bar-2 foo-1@origin foo-3@origin foo-4 8e056f6b8c37
◆ 000000000000
[EOF]
");
@@ -814,21 +814,21 @@ fn test_bookmark_delete_glob() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ bar-2 foo-1@origin foo-3@origin foo-4@origin 312a98d6f27b
@ bar-2 foo-1@origin foo-3@origin foo-4@origin 8e056f6b8c37
◆ 000000000000
[EOF]
");
// The deleted bookmarks are still there
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bar-2: qpvuntsm 312a98d6 (empty) commit
@origin: qpvuntsm 312a98d6 (empty) commit
bar-2: qpvuntsm 8e056f6b (empty) commit
@origin: qpvuntsm 8e056f6b (empty) commit
foo-1 (deleted)
@origin: qpvuntsm 312a98d6 (empty) commit
@origin: qpvuntsm 8e056f6b (empty) commit
foo-3 (deleted)
@origin: qpvuntsm 312a98d6 (empty) commit
@origin: qpvuntsm 8e056f6b (empty) commit
foo-4 (deleted)
@origin: qpvuntsm 312a98d6 (empty) commit
@origin: qpvuntsm 8e056f6b (empty) commit
[EOF]
");
@@ -872,7 +872,7 @@ fn test_bookmark_delete_export() {
let output = work_dir.run_jj(["bookmark", "list", "--all-remotes"]);
insta::assert_snapshot!(output, @r"
foo (deleted)
@git: rlvkpnrz 65b6b74e (empty) (no description set)
@git: rlvkpnrz 43444d88 (empty) (no description set)
[EOF]
------- stderr -------
Hint: Bookmarks marked as deleted will be deleted from the underlying Git repo on the next `jj git export`.
@@ -894,7 +894,7 @@ fn test_bookmark_forget_export() {
.run_jj(["bookmark", "create", "-r@", "foo"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
foo: rlvkpnrz 65b6b74e (empty) (no description set)
foo: rlvkpnrz 43444d88 (empty) (no description set)
[EOF]
");
@@ -1172,7 +1172,7 @@ fn test_bookmark_track_untrack() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 230dd059e1b0
@ e8849ae12c70
│ ◆ feature1@origin feature2@origin main@origin bd843888ee66
├─╯
◆ 000000000000
@@ -1203,7 +1203,7 @@ fn test_bookmark_track_untrack() {
feature1: qxxqrkql bd843888 commit 1
@origin: qxxqrkql bd843888 commit 1
feature2 (conflicted):
+ qpvuntsm 230dd059 (empty) (no description set)
+ qpvuntsm e8849ae1 (empty) (no description set)
+ qxxqrkql bd843888 commit 1
@origin (behind by 1 commits): qxxqrkql bd843888 commit 1
main: qxxqrkql bd843888 commit 1
@@ -1228,7 +1228,7 @@ fn test_bookmark_track_untrack() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 230dd059e1b0
@ e8849ae12c70
│ ◆ feature1 feature1@origin feature2@origin main bd843888ee66
├─╯
◆ 000000000000
@@ -1263,7 +1263,7 @@ fn test_bookmark_track_untrack() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 230dd059e1b0
@ e8849ae12c70
│ ◆ feature1@origin feature2@origin main 48ec79a430e9
├─╯
│ ○ feature1 bd843888ee66
@@ -1307,7 +1307,7 @@ fn test_bookmark_track_untrack() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 230dd059e1b0
@ e8849ae12c70
│ ◆ feature1@origin feature2@origin feature3 main d8cd3e020382
├─╯
│ ○ feature1 bd843888ee66
@@ -1346,9 +1346,9 @@ fn test_bookmark_track_conflict() {
------- stderr -------
Started tracking 1 remote bookmarks.
main (conflicted):
+ qpvuntsm?? e802c4f8 (empty) b
+ qpvuntsm?? 427890ea (empty) a
@origin (behind by 1 commits): qpvuntsm?? 427890ea (empty) a
+ qpvuntsm?? 56b9f16b (empty) b
+ qpvuntsm?? 7d5ca8e4 (empty) a
@origin (behind by 1 commits): qpvuntsm?? 7d5ca8e4 (empty) a
[EOF]
");
}
@@ -1459,8 +1459,8 @@ fn test_bookmark_track_untrack_patterns() {
@git: yrnqsqlx 41e7a49d commit
@origin: yrnqsqlx 41e7a49d commit
feature2@origin: yrnqsqlx 41e7a49d commit
main: qpvuntsm 230dd059 (empty) (no description set)
@git: qpvuntsm 230dd059 (empty) (no description set)
main: qpvuntsm e8849ae1 (empty) (no description set)
@git: qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
@@ -1479,8 +1479,8 @@ fn test_bookmark_track_untrack_patterns() {
@git: yrnqsqlx 41e7a49d commit
feature1@origin: yrnqsqlx 41e7a49d commit
feature2@origin: yrnqsqlx 41e7a49d commit
main: qpvuntsm 230dd059 (empty) (no description set)
@git: qpvuntsm 230dd059 (empty) (no description set)
main: qpvuntsm e8849ae1 (empty) (no description set)
@git: qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
@@ -1497,8 +1497,8 @@ fn test_bookmark_track_untrack_patterns() {
@origin: yrnqsqlx 41e7a49d commit
feature2: yrnqsqlx 41e7a49d commit
@origin: yrnqsqlx 41e7a49d commit
main: qpvuntsm 230dd059 (empty) (no description set)
@git: qpvuntsm 230dd059 (empty) (no description set)
main: qpvuntsm e8849ae1 (empty) (no description set)
@git: qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
}
@@ -1568,12 +1568,12 @@ fn test_bookmark_list() {
// default
let output = local_dir.run_jj(["bookmark", "list"]);
insta::assert_snapshot!(output, @r"
local-only: wqnwkozp 4e887f78 (empty) local-only
local-only: wqnwkozp 0353dd35 (empty) local-only
remote-delete (deleted)
@origin: mnmymoky 203e60eb (empty) remote-delete
remote-sync: zwtyzrop c761c7ea (empty) remote-sync
remote-unsync: wqnwkozp 4e887f78 (empty) local-only
@origin (ahead by 1 commits, behind by 1 commits): qpsqxpyq 38ef8af7 (empty) remote-unsync
@origin: vruxwmqv b32031cf (empty) remote-delete
remote-sync: rlvkpnrz 7a07dbee (empty) remote-sync
remote-unsync: wqnwkozp 0353dd35 (empty) local-only
@origin (ahead by 1 commits, behind by 1 commits): zsuskuln 553203ba (empty) remote-unsync
[EOF]
------- stderr -------
Hint: Bookmarks marked as deleted can be *deleted permanently* on the remote by running `jj git push --deleted`. Use `jj bookmark forget` if you don't want that.
@@ -1582,14 +1582,14 @@ fn test_bookmark_list() {
let output = local_dir.run_jj(["bookmark", "list", "--all-remotes"]);
insta::assert_snapshot!(output, @r"
local-only: wqnwkozp 4e887f78 (empty) local-only
local-only: wqnwkozp 0353dd35 (empty) local-only
remote-delete (deleted)
@origin: mnmymoky 203e60eb (empty) remote-delete
remote-sync: zwtyzrop c761c7ea (empty) remote-sync
@origin: zwtyzrop c761c7ea (empty) remote-sync
remote-unsync: wqnwkozp 4e887f78 (empty) local-only
@origin (ahead by 1 commits, behind by 1 commits): qpsqxpyq 38ef8af7 (empty) remote-unsync
remote-untrack@origin: vmortlor 71a16b05 (empty) remote-untrack
@origin: vruxwmqv b32031cf (empty) remote-delete
remote-sync: rlvkpnrz 7a07dbee (empty) remote-sync
@origin: rlvkpnrz 7a07dbee (empty) remote-sync
remote-unsync: wqnwkozp 0353dd35 (empty) local-only
@origin (ahead by 1 commits, behind by 1 commits): zsuskuln 553203ba (empty) remote-unsync
remote-untrack@origin: royxmykx 149bc756 (empty) remote-untrack
[EOF]
------- stderr -------
Hint: Bookmarks marked as deleted can be *deleted permanently* on the remote by running `jj git push --deleted`. Use `jj bookmark forget` if you don't want that.
@@ -1747,14 +1747,14 @@ fn test_bookmark_list_filtered() {
let template = r#"separate(" ", commit_id.short(), bookmarks, if(hidden, "(hidden)"))"#;
insta::assert_snapshot!(
local_dir.run_jj(["log", "-r::(bookmarks() | remote_bookmarks())", "-T", template]), @r"
@ c7b4c09cd77c local-keep
│ ○ e31634b64294 remote-rewrite*
@ 4b2bc95cbda6 local-keep
│ ○ e6970e0e1f55 remote-rewrite*
├─╯
│ ○ 3e9a5af6ef15 remote-rewrite@origin (hidden)
│ ○ 331d500d2fda remote-rewrite@origin (hidden)
├─╯
│ ○ dad5f298ca57 remote-delete@origin
│ ○ 0e6b796871e6 remote-delete@origin
├─╯
│ ○ 911e912015fb remote-keep
│ ○ c2f2ee40f03a remote-keep
├─╯
◆ 000000000000
[EOF]
@@ -1763,12 +1763,12 @@ fn test_bookmark_list_filtered() {
// All bookmarks are listed by default.
let output = local_dir.run_jj(["bookmark", "list"]);
insta::assert_snapshot!(output, @r"
local-keep: kpqxywon c7b4c09c (empty) local-keep
local-keep: kpqxywon 4b2bc95c (empty) local-keep
remote-delete (deleted)
@origin: yxusvupt dad5f298 (empty) remote-delete
remote-keep: nlwprzpn 911e9120 (empty) remote-keep
remote-rewrite: xyxluytn e31634b6 (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
@origin: zsuskuln 0e6b7968 (empty) remote-delete
remote-keep: rlvkpnrz c2f2ee40 (empty) remote-keep
remote-rewrite: royxmykx e6970e0e (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): royxmykx hidden 331d500d (empty) remote-rewrite
[EOF]
------- stderr -------
Hint: Bookmarks marked as deleted can be *deleted permanently* on the remote by running `jj git push --deleted`. Use `jj bookmark forget` if you don't want that.
@@ -1781,83 +1781,83 @@ fn test_bookmark_list_filtered() {
// "all()" doesn't include deleted bookmarks since they have no local targets.
// So "all()" is identical to "bookmarks()".
insta::assert_snapshot!(query(&["-rall()"]), @r"
local-keep: kpqxywon c7b4c09c (empty) local-keep
remote-keep: nlwprzpn 911e9120 (empty) remote-keep
remote-rewrite: xyxluytn e31634b6 (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
local-keep: kpqxywon 4b2bc95c (empty) local-keep
remote-keep: rlvkpnrz c2f2ee40 (empty) remote-keep
remote-rewrite: royxmykx e6970e0e (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): royxmykx hidden 331d500d (empty) remote-rewrite
[EOF]
");
// Exclude remote-only bookmarks. "remote-rewrite@origin" is included since
// local "remote-rewrite" target matches.
insta::assert_snapshot!(query(&["-rbookmarks()"]), @r"
local-keep: kpqxywon c7b4c09c (empty) local-keep
remote-keep: nlwprzpn 911e9120 (empty) remote-keep
remote-rewrite: xyxluytn e31634b6 (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
local-keep: kpqxywon 4b2bc95c (empty) local-keep
remote-keep: rlvkpnrz c2f2ee40 (empty) remote-keep
remote-rewrite: royxmykx e6970e0e (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): royxmykx hidden 331d500d (empty) remote-rewrite
[EOF]
");
// Select bookmarks by name.
insta::assert_snapshot!(query(&["remote-rewrite"]), @r"
remote-rewrite: xyxluytn e31634b6 (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
remote-rewrite: royxmykx e6970e0e (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): royxmykx hidden 331d500d (empty) remote-rewrite
[EOF]
");
insta::assert_snapshot!(query(&["-rbookmarks(remote-rewrite)"]), @r"
remote-rewrite: xyxluytn e31634b6 (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
remote-rewrite: royxmykx e6970e0e (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): royxmykx hidden 331d500d (empty) remote-rewrite
[EOF]
");
// Select bookmarks by name, combined with --all-remotes
local_dir.run_jj(["git", "export"]).success();
insta::assert_snapshot!(query(&["--all-remotes", "remote-rewrite"]), @r"
remote-rewrite: xyxluytn e31634b6 (empty) rewritten
@git: xyxluytn e31634b6 (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
remote-rewrite: royxmykx e6970e0e (empty) rewritten
@git: royxmykx e6970e0e (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): royxmykx hidden 331d500d (empty) remote-rewrite
[EOF]
");
insta::assert_snapshot!(query(&["--all-remotes", "-rbookmarks(remote-rewrite)"]), @r"
remote-rewrite: xyxluytn e31634b6 (empty) rewritten
@git: xyxluytn e31634b6 (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
remote-rewrite: royxmykx e6970e0e (empty) rewritten
@git: royxmykx e6970e0e (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): royxmykx hidden 331d500d (empty) remote-rewrite
[EOF]
");
// Select bookmarks with --remote
insta::assert_snapshot!(query(&["--remote", "origin"]), @r"
remote-delete (deleted)
@origin: yxusvupt dad5f298 (empty) remote-delete
remote-keep: nlwprzpn 911e9120 (empty) remote-keep
@origin: nlwprzpn 911e9120 (empty) remote-keep
remote-rewrite: xyxluytn e31634b6 (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
@origin: zsuskuln 0e6b7968 (empty) remote-delete
remote-keep: rlvkpnrz c2f2ee40 (empty) remote-keep
@origin: rlvkpnrz c2f2ee40 (empty) remote-keep
remote-rewrite: royxmykx e6970e0e (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): royxmykx hidden 331d500d (empty) remote-rewrite
[EOF]
------- stderr -------
Hint: Bookmarks marked as deleted can be *deleted permanently* on the remote by running `jj git push --deleted`. Use `jj bookmark forget` if you don't want that.
[EOF]
");
insta::assert_snapshot!(query(&["--remote", "glob:gi?"]), @r"
local-keep: kpqxywon c7b4c09c (empty) local-keep
@git: kpqxywon c7b4c09c (empty) local-keep
remote-keep: nlwprzpn 911e9120 (empty) remote-keep
@git: nlwprzpn 911e9120 (empty) remote-keep
remote-rewrite: xyxluytn e31634b6 (empty) rewritten
@git: xyxluytn e31634b6 (empty) rewritten
local-keep: kpqxywon 4b2bc95c (empty) local-keep
@git: kpqxywon 4b2bc95c (empty) local-keep
remote-keep: rlvkpnrz c2f2ee40 (empty) remote-keep
@git: rlvkpnrz c2f2ee40 (empty) remote-keep
remote-rewrite: royxmykx e6970e0e (empty) rewritten
@git: royxmykx e6970e0e (empty) rewritten
[EOF]
");
insta::assert_snapshot!(query(&["--remote", "origin", "--remote", "git"]), @r"
local-keep: kpqxywon c7b4c09c (empty) local-keep
@git: kpqxywon c7b4c09c (empty) local-keep
local-keep: kpqxywon 4b2bc95c (empty) local-keep
@git: kpqxywon 4b2bc95c (empty) local-keep
remote-delete (deleted)
@origin: yxusvupt dad5f298 (empty) remote-delete
remote-keep: nlwprzpn 911e9120 (empty) remote-keep
@git: nlwprzpn 911e9120 (empty) remote-keep
@origin: nlwprzpn 911e9120 (empty) remote-keep
remote-rewrite: xyxluytn e31634b6 (empty) rewritten
@git: xyxluytn e31634b6 (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
@origin: zsuskuln 0e6b7968 (empty) remote-delete
remote-keep: rlvkpnrz c2f2ee40 (empty) remote-keep
@git: rlvkpnrz c2f2ee40 (empty) remote-keep
@origin: rlvkpnrz c2f2ee40 (empty) remote-keep
remote-rewrite: royxmykx e6970e0e (empty) rewritten
@git: royxmykx e6970e0e (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): royxmykx hidden 331d500d (empty) remote-rewrite
[EOF]
------- stderr -------
Hint: Bookmarks marked as deleted can be *deleted permanently* on the remote by running `jj git push --deleted`. Use `jj bookmark forget` if you don't want that.
@@ -1867,7 +1867,7 @@ fn test_bookmark_list_filtered() {
// Can select deleted bookmark by name pattern, but not by revset.
insta::assert_snapshot!(query(&["remote-delete"]), @r"
remote-delete (deleted)
@origin: yxusvupt dad5f298 (empty) remote-delete
@origin: zsuskuln 0e6b7968 (empty) remote-delete
[EOF]
------- stderr -------
Hint: Bookmarks marked as deleted can be *deleted permanently* on the remote by running `jj git push --deleted`. Use `jj bookmark forget` if you don't want that.
@@ -1884,10 +1884,10 @@ fn test_bookmark_list_filtered() {
// Name patterns are OR-ed.
insta::assert_snapshot!(query(&["glob:*-keep", "remote-delete"]), @r"
local-keep: kpqxywon c7b4c09c (empty) local-keep
local-keep: kpqxywon 4b2bc95c (empty) local-keep
remote-delete (deleted)
@origin: yxusvupt dad5f298 (empty) remote-delete
remote-keep: nlwprzpn 911e9120 (empty) remote-keep
@origin: zsuskuln 0e6b7968 (empty) remote-delete
remote-keep: rlvkpnrz c2f2ee40 (empty) remote-keep
[EOF]
------- stderr -------
Hint: Bookmarks marked as deleted can be *deleted permanently* on the remote by running `jj git push --deleted`. Use `jj bookmark forget` if you don't want that.
@@ -1896,15 +1896,15 @@ fn test_bookmark_list_filtered() {
// Unmatched name pattern shouldn't be an error. A warning can be added later.
insta::assert_snapshot!(query(&["local-keep", "glob:push-*"]), @r"
local-keep: kpqxywon c7b4c09c (empty) local-keep
local-keep: kpqxywon 4b2bc95c (empty) local-keep
[EOF]
");
// Name pattern and revset are OR-ed.
insta::assert_snapshot!(query(&["local-keep", "-rbookmarks(remote-rewrite)"]), @r"
local-keep: kpqxywon c7b4c09c (empty) local-keep
remote-rewrite: xyxluytn e31634b6 (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
local-keep: kpqxywon 4b2bc95c (empty) local-keep
remote-rewrite: royxmykx e6970e0e (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): royxmykx hidden 331d500d (empty) remote-rewrite
[EOF]
");
@@ -1915,10 +1915,10 @@ fn test_bookmark_list_filtered() {
"--remote",
"git",
]), @r"
local-keep: kpqxywon c7b4c09c (empty) local-keep
@git: kpqxywon c7b4c09c (empty) local-keep
remote-rewrite: xyxluytn e31634b6 (empty) rewritten
@git: xyxluytn e31634b6 (empty) rewritten
local-keep: kpqxywon 4b2bc95c (empty) local-keep
@git: kpqxywon 4b2bc95c (empty) local-keep
remote-rewrite: royxmykx e6970e0e (empty) rewritten
@git: royxmykx e6970e0e (empty) rewritten
[EOF]
");
}
@@ -1976,9 +1976,9 @@ fn test_bookmark_list_much_remote_divergence() {
let output = local_dir.run_jj(["bookmark", "list"]);
insta::assert_snapshot!(output, @r"
local-only: zkyosouw 4ab3f751 (empty) local-only
remote-unsync: zkyosouw 4ab3f751 (empty) local-only
@origin (ahead by at least 10 commits, behind by at least 10 commits): lxyktnks 19582022 (empty) remote-unsync
local-only: zkyosouw a30800ad (empty) local-only
remote-unsync: zkyosouw a30800ad (empty) local-only
@origin (ahead by at least 10 commits, behind by at least 10 commits): uyznsvlq a52367f8 (empty) remote-unsync
[EOF]
");
}
@@ -2096,21 +2096,21 @@ fn test_bookmark_list_tracked() {
let output = local_dir.run_jj(["bookmark", "list", "--all-remotes"]);
insta::assert_snapshot!(output, @r"
local-only: nmzmmopx e1da745b (empty) local-only
@git: nmzmmopx e1da745b (empty) local-only
local-only: nmzmmopx 2a685e16 (empty) local-only
@git: nmzmmopx 2a685e16 (empty) local-only
remote-delete (deleted)
@origin: mnmymoky 203e60eb (empty) remote-delete
remote-sync: zwtyzrop c761c7ea (empty) remote-sync
@git: zwtyzrop c761c7ea (empty) remote-sync
@origin: zwtyzrop c761c7ea (empty) remote-sync
remote-unsync: nmzmmopx e1da745b (empty) local-only
@git: nmzmmopx e1da745b (empty) local-only
@origin (ahead by 1 commits, behind by 1 commits): qpsqxpyq 38ef8af7 (empty) remote-unsync
@upstream (ahead by 1 commits, behind by 1 commits): qpsqxpyq 38ef8af7 (empty) remote-unsync
remote-untrack@origin: vmortlor 71a16b05 (empty) remote-untrack
upstream-sync: lolpmnqw 32fa6da0 (empty) upstream-sync
@git: lolpmnqw 32fa6da0 (empty) upstream-sync
@upstream: lolpmnqw 32fa6da0 (empty) upstream-sync
@origin: vruxwmqv b32031cf (empty) remote-delete
remote-sync: rlvkpnrz 7a07dbee (empty) remote-sync
@git: rlvkpnrz 7a07dbee (empty) remote-sync
@origin: rlvkpnrz 7a07dbee (empty) remote-sync
remote-unsync: nmzmmopx 2a685e16 (empty) local-only
@git: nmzmmopx 2a685e16 (empty) local-only
@origin (ahead by 1 commits, behind by 1 commits): zsuskuln 553203ba (empty) remote-unsync
@upstream (ahead by 1 commits, behind by 1 commits): zsuskuln 553203ba (empty) remote-unsync
remote-untrack@origin: royxmykx 149bc756 (empty) remote-untrack
upstream-sync: lylxulpl 169ba7d9 (empty) upstream-sync
@git: lylxulpl 169ba7d9 (empty) upstream-sync
@upstream: lylxulpl 169ba7d9 (empty) upstream-sync
[EOF]
------- stderr -------
Hint: Bookmarks marked as deleted can be *deleted permanently* on the remote by running `jj git push --deleted`. Use `jj bookmark forget` if you don't want that.
@@ -2120,14 +2120,14 @@ fn test_bookmark_list_tracked() {
let output = local_dir.run_jj(["bookmark", "list", "--tracked"]);
insta::assert_snapshot!(output, @r"
remote-delete (deleted)
@origin: mnmymoky 203e60eb (empty) remote-delete
remote-sync: zwtyzrop c761c7ea (empty) remote-sync
@origin: zwtyzrop c761c7ea (empty) remote-sync
remote-unsync: nmzmmopx e1da745b (empty) local-only
@origin (ahead by 1 commits, behind by 1 commits): qpsqxpyq 38ef8af7 (empty) remote-unsync
@upstream (ahead by 1 commits, behind by 1 commits): qpsqxpyq 38ef8af7 (empty) remote-unsync
upstream-sync: lolpmnqw 32fa6da0 (empty) upstream-sync
@upstream: lolpmnqw 32fa6da0 (empty) upstream-sync
@origin: vruxwmqv b32031cf (empty) remote-delete
remote-sync: rlvkpnrz 7a07dbee (empty) remote-sync
@origin: rlvkpnrz 7a07dbee (empty) remote-sync
remote-unsync: nmzmmopx 2a685e16 (empty) local-only
@origin (ahead by 1 commits, behind by 1 commits): zsuskuln 553203ba (empty) remote-unsync
@upstream (ahead by 1 commits, behind by 1 commits): zsuskuln 553203ba (empty) remote-unsync
upstream-sync: lylxulpl 169ba7d9 (empty) upstream-sync
@upstream: lylxulpl 169ba7d9 (empty) upstream-sync
[EOF]
------- stderr -------
Hint: Bookmarks marked as deleted can be *deleted permanently* on the remote by running `jj git push --deleted`. Use `jj bookmark forget` if you don't want that.
@@ -2137,11 +2137,11 @@ fn test_bookmark_list_tracked() {
let output = local_dir.run_jj(["bookmark", "list", "--tracked", "--remote", "origin"]);
insta::assert_snapshot!(output, @r"
remote-delete (deleted)
@origin: mnmymoky 203e60eb (empty) remote-delete
remote-sync: zwtyzrop c761c7ea (empty) remote-sync
@origin: zwtyzrop c761c7ea (empty) remote-sync
remote-unsync: nmzmmopx e1da745b (empty) local-only
@origin (ahead by 1 commits, behind by 1 commits): qpsqxpyq 38ef8af7 (empty) remote-unsync
@origin: vruxwmqv b32031cf (empty) remote-delete
remote-sync: rlvkpnrz 7a07dbee (empty) remote-sync
@origin: rlvkpnrz 7a07dbee (empty) remote-sync
remote-unsync: nmzmmopx 2a685e16 (empty) local-only
@origin (ahead by 1 commits, behind by 1 commits): zsuskuln 553203ba (empty) remote-unsync
[EOF]
------- stderr -------
Hint: Bookmarks marked as deleted can be *deleted permanently* on the remote by running `jj git push --deleted`. Use `jj bookmark forget` if you don't want that.
@@ -2150,9 +2150,9 @@ fn test_bookmark_list_tracked() {
let output = local_dir.run_jj(["bookmark", "list", "--tracked", "remote-unsync"]);
insta::assert_snapshot!(output, @r"
remote-unsync: nmzmmopx e1da745b (empty) local-only
@origin (ahead by 1 commits, behind by 1 commits): qpsqxpyq 38ef8af7 (empty) remote-unsync
@upstream (ahead by 1 commits, behind by 1 commits): qpsqxpyq 38ef8af7 (empty) remote-unsync
remote-unsync: nmzmmopx 2a685e16 (empty) local-only
@origin (ahead by 1 commits, behind by 1 commits): zsuskuln 553203ba (empty) remote-unsync
@upstream (ahead by 1 commits, behind by 1 commits): zsuskuln 553203ba (empty) remote-unsync
[EOF]
");
@@ -2165,8 +2165,8 @@ fn test_bookmark_list_tracked() {
let output = local_dir.run_jj(["bookmark", "list", "--tracked", "remote-unsync"]);
insta::assert_snapshot!(output, @r"
remote-unsync: nmzmmopx e1da745b (empty) local-only
@origin (ahead by 1 commits, behind by 1 commits): qpsqxpyq 38ef8af7 (empty) remote-unsync
remote-unsync: nmzmmopx 2a685e16 (empty) local-only
@origin (ahead by 1 commits, behind by 1 commits): zsuskuln 553203ba (empty) remote-unsync
[EOF]
");
}
@@ -2198,16 +2198,16 @@ fn test_bookmark_list_conflicted() {
.success();
work_dir.run_jj(["status"]).success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bar: kkmpptxz 06a973bc (empty) b
bar: kkmpptxz a82129fb (empty) b
foo (conflicted):
+ rlvkpnrz d8d5f980 (empty) a
+ kkmpptxz 06a973bc (empty) b
+ rlvkpnrz 4e1b2d80 (empty) a
+ kkmpptxz a82129fb (empty) b
[EOF]
");
insta::assert_snapshot!(work_dir.run_jj(["bookmark", "list", "--conflicted"]), @r"
foo (conflicted):
+ rlvkpnrz d8d5f980 (empty) a
+ kkmpptxz 06a973bc (empty) b
+ rlvkpnrz 4e1b2d80 (empty) a
+ kkmpptxz a82129fb (empty) b
[EOF]
");
}
@@ -2340,7 +2340,7 @@ fn test_bookmark_create_with_default_target_revision() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Warning: Target revision was not specified, defaulting to the working copy (-r@). In the near future it will be required to explicitly specify target revision.
Created 1 bookmarks pointing to qpvuntsm 230dd059 foo | (empty) (no description set)
Created 1 bookmarks pointing to qpvuntsm e8849ae1 foo | (empty) (no description set)
[EOF]
");
}
@@ -2355,7 +2355,7 @@ fn test_bookmark_set_with_default_target_revision() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Warning: Target revision was not specified, defaulting to the working copy (--revision=@). In the near future it will be required to explicitly specify target revision.
Created 1 bookmarks pointing to qpvuntsm 230dd059 foo | (empty) (no description set)
Created 1 bookmarks pointing to qpvuntsm e8849ae1 foo | (empty) (no description set)
[EOF]
");
}
@@ -2376,7 +2376,7 @@ fn test_bookmark_move_with_default_target_revision() {
let output = work_dir.run_jj(["bookmark", "create", "foo", "-r@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Created 1 bookmarks pointing to qpvuntsm 230dd059 foo | (empty) (no description set)
Created 1 bookmarks pointing to qpvuntsm e8849ae1 foo | (empty) (no description set)
[EOF]
");
@@ -2385,7 +2385,7 @@ fn test_bookmark_move_with_default_target_revision() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Warning: Target revision was not specified, defaulting to the working copy (--to=@). In the near future it will be required to explicitly specify it.
Moved 1 bookmarks to zsuskuln 8bb159bc foo | (empty) (no description set)
Moved 1 bookmarks to zsuskuln 0e555a27 foo | (empty) (no description set)
[EOF]
");
}

12
cli/tests/test_builtin_aliases.rs
View File

@@ -61,7 +61,7 @@ fn test_builtin_alias_trunk_matches_main() {
let output = work_dir.run_jj(["log", "-r", "trunk()"]);
insta::assert_snapshot!(output, @r"
◆ xtvrqkyv test.user@example.com 2001-02-03 08:05:08 main d13ecdbd
◆ qpvuntsm test.user@example.com 2001-02-03 08:05:08 main 9b2e76de
│ (empty) description 1
~
[EOF]
@@ -75,7 +75,7 @@ fn test_builtin_alias_trunk_matches_master() {
let output = work_dir.run_jj(["log", "-r", "trunk()"]);
insta::assert_snapshot!(output, @r"
◆ xtvrqkyv test.user@example.com 2001-02-03 08:05:08 master d13ecdbd
◆ qpvuntsm test.user@example.com 2001-02-03 08:05:08 master 9b2e76de
│ (empty) description 1
~
[EOF]
@@ -89,7 +89,7 @@ fn test_builtin_alias_trunk_matches_trunk() {
let output = work_dir.run_jj(["log", "-r", "trunk()"]);
insta::assert_snapshot!(output, @r"
◆ xtvrqkyv test.user@example.com 2001-02-03 08:05:08 trunk d13ecdbd
◆ qpvuntsm test.user@example.com 2001-02-03 08:05:08 trunk 9b2e76de
│ (empty) description 1
~
[EOF]
@@ -110,7 +110,7 @@ fn test_builtin_alias_trunk_matches_exactly_one_commit() {
let output = work_dir.run_jj(["log", "-r", "trunk()"]);
insta::assert_snapshot!(output, @r"
◆ xtvrqkyv test.user@example.com 2001-02-03 08:05:08 main d13ecdbd
◆ qpvuntsm test.user@example.com 2001-02-03 08:05:08 main 9b2e76de
│ (empty) description 1
~
[EOF]
@@ -128,7 +128,7 @@ fn test_builtin_alias_trunk_override_alias() {
let output = work_dir.run_jj(["log", "-r", "trunk()"]);
insta::assert_snapshot!(output, @r"
◆ xtvrqkyv test.user@example.com 2001-02-03 08:05:08 override-trunk d13ecdbd
◆ qpvuntsm test.user@example.com 2001-02-03 08:05:08 override-trunk 9b2e76de
│ (empty) description 1
~
[EOF]
@@ -170,7 +170,7 @@ fn test_builtin_user_redefines_builtin_immutable_heads() {
let output = work_dir.run_jj(["log", "-r", "trunk()"]);
insta::assert_snapshot!(output, @r"
○ xtvrqkyv test.user@example.com 2001-02-03 08:05:08 main d13ecdbd
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 main 9b2e76de
│ (empty) description 1
~
[EOF]

44
cli/tests/test_commit_command.rs
View File

@@ -27,8 +27,8 @@ fn test_commit_with_description_from_cli() {
// Description applies to the current working-copy (not the new one)
work_dir.run_jj(["commit", "-m=first"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ e8ea92a8b6b3
○ fa15625b4a98 first
@ eb9fd2ab82e7
○ 68a505386f93 first
◆ 000000000000
[EOF]
");
@@ -47,8 +47,8 @@ fn test_commit_with_editor() {
std::fs::write(&edit_script, ["dump editor0", "write\nmodified"].join("\0")).unwrap();
work_dir.run_jj(["commit"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ a57b2c95fb75
○ 159271101e05 modified
@ 2094c8f2e360
○ a7ba1eb73836 modified
◆ 000000000000
[EOF]
");
@@ -116,7 +116,7 @@ fn test_commit_interactive() {
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("instrs")).unwrap(), @r"
You are splitting the working-copy commit: qpvuntsm 4219467e add files
You are splitting the working-copy commit: qpvuntsm d849dc34 add files
The diff initially shows all changes. Adjust the right side until it shows the
contents you want for the first commit. The remainder will be included in the
@@ -155,10 +155,10 @@ fn test_commit_interactive() {
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ mzvwutvl test.user@example.com 2001-02-03 08:05:11 21b846a6
@ mzvwutvl test.user@example.com 2001-02-03 08:05:11 9b0176ab
│ (no description set)
│ A file2
○ qpvuntsm test.user@example.com 2001-02-03 08:05:11 7d156390
○ qpvuntsm test.user@example.com 2001-02-03 08:05:11 6e6fa925
│ add files
│ A file1
◆ zzzzzzzz root() 00000000
@@ -194,8 +194,8 @@ fn test_commit_interactive_with_paths() {
let output = work_dir.run_jj(["commit", "-i", "file1", "file2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz f3e6062e (no description set)
Parent commit (@-) : rlvkpnrz 9453cb28 edit
Working copy (@) now at: kkmpptxz 50f426df (no description set)
Parent commit (@-) : rlvkpnrz eb640375 edit
[EOF]
");
@@ -211,14 +211,14 @@ fn test_commit_interactive_with_paths() {
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 f3e6062e
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 50f426df
│ (no description set)
│ M file2
│ M file3
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 9453cb28
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 eb640375
│ edit
│ A file1
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 497ed465
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 ff687a2f
│ (no description set)
│ A file2
│ A file3
@@ -241,8 +241,8 @@ fn test_commit_with_default_description() {
work_dir.run_jj(["commit"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ c65242099289
○ 573b6df51aea TESTED=TODO
@ cba559ac1a48
○ 7276dfff8027 TESTED=TODO
◆ 000000000000
[EOF]
------- stderr -------
@@ -395,8 +395,8 @@ fn test_commit_paths_warning() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Warning: The given paths do not match any file: file3
Working copy (@) now at: rlvkpnrz d1872100 (no description set)
Parent commit (@-) : qpvuntsm fa15625b (empty) first
Working copy (@) now at: rlvkpnrz 4c6f0146 (no description set)
Parent commit (@-) : qpvuntsm 68a50538 (empty) first
[EOF]
");
@@ -464,8 +464,8 @@ fn test_commit_trailers() {
let output = work_dir.run_jj(["commit", "-m=first"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: rlvkpnrz e5635290 (empty) (no description set)
Parent commit (@-) : qpvuntsm 78139a3f first
Working copy (@) now at: rlvkpnrz 0c0495f3 (empty) (no description set)
Parent commit (@-) : qpvuntsm ae86ffd4 first
[EOF]
");
@@ -481,8 +481,8 @@ fn test_commit_trailers() {
let output = work_dir.run_jj(["commit", "--config=user.email=foo@bar.org", "-m=second"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: zsuskuln 3b39fdb9 (empty) (no description set)
Parent commit (@-) : rlvkpnrz 1e30b4ab (empty) second
Working copy (@) now at: zsuskuln fd73eac2 (empty) (no description set)
Parent commit (@-) : rlvkpnrz 6e69e833 (empty) second
[EOF]
");
@@ -499,8 +499,8 @@ fn test_commit_trailers() {
let output = work_dir.run_jj(["commit", "--config=user.email=foo@bar.org"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: royxmykx 1dd4f5c9 (empty) (no description set)
Parent commit (@-) : zsuskuln 4ca072aa (empty) Reviewed-by: foo@bar.org
Working copy (@) now at: royxmykx dac9709c (empty) (no description set)
Parent commit (@-) : zsuskuln d9ced309 (empty) Reviewed-by: foo@bar.org
[EOF]
");

190
cli/tests/test_commit_template.rs
View File

@@ -32,11 +32,11 @@ fn test_log_parents() {
r#"commit_id ++ "\nP: " ++ parents.len() ++ " " ++ parents.map(|c| c.commit_id()) ++ "\n""#;
let output = work_dir.run_jj(["log", "-T", template]);
insta::assert_snapshot!(output, @r"
@ c067170d4ca1bc6162b64f7550617ec809647f84
├─╮ P: 2 4db490c88528133d579540b6900b8098f0c17701 230dd059e1b059aefc0da06a2e5a7dbf22362f22
○ │ 4db490c88528133d579540b6900b8098f0c17701
├─╯ P: 1 230dd059e1b059aefc0da06a2e5a7dbf22362f22
○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ 8b93ef7a3ceefa4e4b1a506945588dd0da2d9e3e
├─╮ P: 2 1c1c95df80e53b1e654608d7589f5baabb10ebb2 e8849ae12c709f2321908879bc724fdb2ab8a781
○ │ 1c1c95df80e53b1e654608d7589f5baabb10ebb2
├─╯ P: 1 e8849ae12c709f2321908879bc724fdb2ab8a781
○ e8849ae12c709f2321908879bc724fdb2ab8a781
│ P: 1 0000000000000000000000000000000000000000
◆ 0000000000000000000000000000000000000000
P: 0
@@ -48,9 +48,9 @@ fn test_log_parents() {
r#""P: " ++ parents.filter(|c| !c.root()).map(|c| c.commit_id().short()) ++ "\n""#;
let output = work_dir.run_jj(["log", "-T", template]);
insta::assert_snapshot!(output, @r"
@ P: 4db490c88528 230dd059e1b0
@ P: 1c1c95df80e5 e8849ae12c70
├─╮
○ │ P: 230dd059e1b0
○ │ P: e8849ae12c70
├─╯
○ P:
◆ P:
@@ -60,7 +60,7 @@ fn test_log_parents() {
let template = r#"parents.map(|c| c.commit_id().shortest(4))"#;
let output = work_dir.run_jj(["log", "-T", template, "-r@", "--color=always"]);
insta::assert_snapshot!(output, @r"
@ 4db4 230d
@ 1c1c e884
│
~
[EOF]
@@ -258,9 +258,9 @@ fn test_log_default() {
// Test default log output format
let output = work_dir.run_jj(["log"]);
insta::assert_snapshot!(output, @r"
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 my-bookmark bac9ff9e
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 my-bookmark c938c088
│ (empty) description 1
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 aa2015d7
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 007859d3
│ add a file
◆ zzzzzzzz root() 00000000
[EOF]
@@ -269,22 +269,22 @@ fn test_log_default() {
// Color
let output = work_dir.run_jj(["log", "--color=always"]);
insta::assert_snapshot!(output, @r"
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 my-bookmark bac9ff9e
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 my-bookmark c938c088
│ (empty) description 1
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 aa2015d7
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 007859d3
│ add a file
◆ zzzzzzzz root() 00000000
◆ zzzzzzzz root() 00000000
[EOF]
");
// Color without graph
let output = work_dir.run_jj(["log", "--color=always", "--no-graph"]);
insta::assert_snapshot!(output, @r"
kkmpptxz test.user@example.com 2001-02-03 08:05:09 my-bookmark bac9ff9e
kkmpptxz test.user@example.com 2001-02-03 08:05:09 my-bookmark c938c088
(empty) description 1
qpvuntsm test.user@example.com 2001-02-03 08:05:08 aa2015d7
qpvuntsm test.user@example.com 2001-02-03 08:05:08 007859d3
add a file
zzzzzzzz root() 00000000
zzzzzzzz root() 00000000
[EOF]
");
}
@@ -319,26 +319,26 @@ fn test_log_builtin_templates() {
.success();
insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r"
rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397 (empty) (no description set)
qpvuntsm test.user 2001-02-03 08:05:07 230dd059 (empty) (no description set)
rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark aec3ec96 (empty) (no description set)
qpvuntsm test.user 2001-02-03 08:05:07 e8849ae1 (empty) (no description set)
zzzzzzzz root() 00000000
[EOF]
");
insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r"
rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397
rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark aec3ec96
(empty) (no description set)
qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059
qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
zzzzzzzz root() 00000000
[EOF]
");
insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r"
rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397
rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark aec3ec96
(empty) (no description set)
qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059
qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
zzzzzzzz root() 00000000
@@ -347,7 +347,7 @@ fn test_log_builtin_templates() {
");
insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r"
Commit ID: dc31539712c7294d1d712cec63cef4504b94ca74
Commit ID: aec3ec964d0771edea9da48a2a170bc6ffa1c725
Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
Bookmarks: my-bookmark
Author : (no name set) <(no email set)> (2001-02-03 08:05:08)
@@ -355,7 +355,7 @@ fn test_log_builtin_templates() {
(no description set)
Commit ID: 230dd059e1b059aefc0da06a2e5a7dbf22362f22
Commit ID: e8849ae12c709f2321908879bc724fdb2ab8a781
Change ID: qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu
Author : Test User <test.user@example.com> (2001-02-03 08:05:07)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:07)
@@ -388,26 +388,26 @@ fn test_log_builtin_templates_colored() {
.success();
insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r"
@ rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397 (empty) (no description set)
○ qpvuntsm test.user 2001-02-03 08:05:07 230dd059 (empty) (no description set)
@ rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark aec3ec96 (empty) (no description set)
○ qpvuntsm test.user 2001-02-03 08:05:07 e8849ae1 (empty) (no description set)
◆ zzzzzzzz root() 00000000
[EOF]
");
insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r"
@ rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397
@ rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark aec3ec96
│ (empty) (no description set)
○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059
○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
◆ zzzzzzzz root() 00000000
[EOF]
");
insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r"
@ rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397
@ rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark aec3ec96
│ (empty) (no description set)
│
○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059
○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
│
◆ zzzzzzzz root() 00000000
@@ -416,7 +416,7 @@ fn test_log_builtin_templates_colored() {
");
insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r"
@ Commit ID: dc31539712c7294d1d712cec63cef4504b94ca74
@ Commit ID: aec3ec964d0771edea9da48a2a170bc6ffa1c725
│ Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
│ Bookmarks: my-bookmark
│ Author : (no name set) <(no email set)> (2001-02-03 08:05:08)
@@ -424,7 +424,7 @@ fn test_log_builtin_templates_colored() {
│
│  (no description set)
│
○ Commit ID: 230dd059e1b059aefc0da06a2e5a7dbf22362f22
○ Commit ID: e8849ae12c709f2321908879bc724fdb2ab8a781
│ Change ID: qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu
│ Author : Test User <test.user@example.com> (2001-02-03 08:05:07)
│ Committer: Test User <test.user@example.com> (2001-02-03 08:05:07)
@@ -457,26 +457,26 @@ fn test_log_builtin_templates_colored_debug() {
.success();
insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r"
<<node working_copy::@>> <<log working_copy change_id shortest prefix::r>><<log working_copy change_id shortest rest::lvkpnrz>><<log working_copy:: >><<log working_copy email placeholder::(no email set)>><<log working_copy:: >><<log working_copy committer timestamp local format::2001-02-03 08:05:08>><<log working_copy:: >><<log working_copy bookmarks name::my-bookmark>><<log working_copy:: >><<log working_copy commit_id shortest prefix::d>><<log working_copy commit_id shortest rest::c315397>><<log working_copy:: >><<log working_copy empty::(empty)>><<log working_copy:: >><<log working_copy empty description placeholder::(no description set)>><<log working_copy::>>
<<node::○>> <<log change_id shortest prefix::q>><<log change_id shortest rest::pvuntsm>><<log:: >><<log author email local::test.user>><<log:: >><<log committer timestamp local format::2001-02-03 08:05:07>><<log:: >><<log commit_id shortest prefix::2>><<log commit_id shortest rest::30dd059>><<log:: >><<log empty::(empty)>><<log:: >><<log empty description placeholder::(no description set)>><<log::>>
<<node working_copy::@>> <<log working_copy change_id shortest prefix::r>><<log working_copy change_id shortest rest::lvkpnrz>><<log working_copy:: >><<log working_copy email placeholder::(no email set)>><<log working_copy:: >><<log working_copy committer timestamp local format::2001-02-03 08:05:08>><<log working_copy:: >><<log working_copy bookmarks name::my-bookmark>><<log working_copy:: >><<log working_copy commit_id shortest prefix::a>><<log working_copy commit_id shortest rest::ec3ec96>><<log working_copy:: >><<log working_copy empty::(empty)>><<log working_copy:: >><<log working_copy empty description placeholder::(no description set)>><<log working_copy::>>
<<node::○>> <<log change_id shortest prefix::q>><<log change_id shortest rest::pvuntsm>><<log:: >><<log author email local::test.user>><<log:: >><<log committer timestamp local format::2001-02-03 08:05:07>><<log:: >><<log commit_id shortest prefix::e>><<log commit_id shortest rest::8849ae1>><<log:: >><<log empty::(empty)>><<log:: >><<log empty description placeholder::(no description set)>><<log::>>
<<node immutable::◆>> <<log change_id shortest prefix::z>><<log change_id shortest rest::zzzzzzz>><<log:: >><<log root::root()>><<log:: >><<log commit_id shortest prefix::0>><<log commit_id shortest rest::0000000>><<log::>>
[EOF]
");
insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r"
<<node working_copy::@>> <<log working_copy change_id shortest prefix::r>><<log working_copy change_id shortest rest::lvkpnrz>><<log working_copy:: >><<log working_copy email placeholder::(no email set)>><<log working_copy:: >><<log working_copy committer timestamp local format::2001-02-03 08:05:08>><<log working_copy:: >><<log working_copy bookmarks name::my-bookmark>><<log working_copy:: >><<log working_copy commit_id shortest prefix::d>><<log working_copy commit_id shortest rest::c315397>><<log working_copy::>>
<<node working_copy::@>> <<log working_copy change_id shortest prefix::r>><<log working_copy change_id shortest rest::lvkpnrz>><<log working_copy:: >><<log working_copy email placeholder::(no email set)>><<log working_copy:: >><<log working_copy committer timestamp local format::2001-02-03 08:05:08>><<log working_copy:: >><<log working_copy bookmarks name::my-bookmark>><<log working_copy:: >><<log working_copy commit_id shortest prefix::a>><<log working_copy commit_id shortest rest::ec3ec96>><<log working_copy::>>
│ <<log working_copy empty::(empty)>><<log working_copy:: >><<log working_copy empty description placeholder::(no description set)>><<log working_copy::>>
<<node::○>> <<log change_id shortest prefix::q>><<log change_id shortest rest::pvuntsm>><<log:: >><<log author email local::test.user>><<log author email::@>><<log author email domain::example.com>><<log:: >><<log committer timestamp local format::2001-02-03 08:05:07>><<log:: >><<log commit_id shortest prefix::2>><<log commit_id shortest rest::30dd059>><<log::>>
<<node::○>> <<log change_id shortest prefix::q>><<log change_id shortest rest::pvuntsm>><<log:: >><<log author email local::test.user>><<log author email::@>><<log author email domain::example.com>><<log:: >><<log committer timestamp local format::2001-02-03 08:05:07>><<log:: >><<log commit_id shortest prefix::e>><<log commit_id shortest rest::8849ae1>><<log::>>
│ <<log empty::(empty)>><<log:: >><<log empty description placeholder::(no description set)>><<log::>>
<<node immutable::◆>> <<log change_id shortest prefix::z>><<log change_id shortest rest::zzzzzzz>><<log:: >><<log root::root()>><<log:: >><<log commit_id shortest prefix::0>><<log commit_id shortest rest::0000000>><<log::>>
[EOF]
");
insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r"
<<node working_copy::@>> <<log working_copy change_id shortest prefix::r>><<log working_copy change_id shortest rest::lvkpnrz>><<log working_copy:: >><<log working_copy email placeholder::(no email set)>><<log working_copy:: >><<log working_copy committer timestamp local format::2001-02-03 08:05:08>><<log working_copy:: >><<log working_copy bookmarks name::my-bookmark>><<log working_copy:: >><<log working_copy commit_id shortest prefix::d>><<log working_copy commit_id shortest rest::c315397>><<log working_copy::>>
<<node working_copy::@>> <<log working_copy change_id shortest prefix::r>><<log working_copy change_id shortest rest::lvkpnrz>><<log working_copy:: >><<log working_copy email placeholder::(no email set)>><<log working_copy:: >><<log working_copy committer timestamp local format::2001-02-03 08:05:08>><<log working_copy:: >><<log working_copy bookmarks name::my-bookmark>><<log working_copy:: >><<log working_copy commit_id shortest prefix::a>><<log working_copy commit_id shortest rest::ec3ec96>><<log working_copy::>>
│ <<log working_copy empty::(empty)>><<log working_copy:: >><<log working_copy empty description placeholder::(no description set)>><<log working_copy::>>
│ <<log::>>
<<node::○>> <<log change_id shortest prefix::q>><<log change_id shortest rest::pvuntsm>><<log:: >><<log author email local::test.user>><<log author email::@>><<log author email domain::example.com>><<log:: >><<log committer timestamp local format::2001-02-03 08:05:07>><<log:: >><<log commit_id shortest prefix::2>><<log commit_id shortest rest::30dd059>><<log::>>
<<node::○>> <<log change_id shortest prefix::q>><<log change_id shortest rest::pvuntsm>><<log:: >><<log author email local::test.user>><<log author email::@>><<log author email domain::example.com>><<log:: >><<log committer timestamp local format::2001-02-03 08:05:07>><<log:: >><<log commit_id shortest prefix::e>><<log commit_id shortest rest::8849ae1>><<log::>>
│ <<log empty::(empty)>><<log:: >><<log empty description placeholder::(no description set)>><<log::>>
│ <<log::>>
<<node immutable::◆>> <<log change_id shortest prefix::z>><<log change_id shortest rest::zzzzzzz>><<log:: >><<log root::root()>><<log:: >><<log commit_id shortest prefix::0>><<log commit_id shortest rest::0000000>><<log::>>
@@ -485,7 +485,7 @@ fn test_log_builtin_templates_colored_debug() {
");
insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r"
<<node working_copy::@>> <<log::Commit ID: >><<log commit_id::dc31539712c7294d1d712cec63cef4504b94ca74>><<log::>>
<<node working_copy::@>> <<log::Commit ID: >><<log commit_id::aec3ec964d0771edea9da48a2a170bc6ffa1c725>><<log::>>
│ <<log::Change ID: >><<log change_id::rlvkpnrzqnoowoytxnquwvuryrwnrmlp>><<log::>>
│ <<log::Bookmarks: >><<log local_bookmarks name::my-bookmark>><<log::>>
│ <<log::Author : >><<log name placeholder::(no name set)>><<log:: <>><<log email placeholder::(no email set)>><<log::> (>><<log author timestamp local format::2001-02-03 08:05:08>><<log::)>>
@@ -493,7 +493,7 @@ fn test_log_builtin_templates_colored_debug() {
│ <<log::>>
│ <<log empty description placeholder:: (no description set)>><<log::>>
│ <<log::>>
<<node::○>> <<log::Commit ID: >><<log commit_id::230dd059e1b059aefc0da06a2e5a7dbf22362f22>><<log::>>
<<node::○>> <<log::Commit ID: >><<log commit_id::e8849ae12c709f2321908879bc724fdb2ab8a781>><<log::>>
│ <<log::Change ID: >><<log change_id::qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu>><<log::>>
│ <<log::Author : >><<log author name::Test User>><<log:: <>><<log author email local::test.user>><<log author email::@>><<log author email domain::example.com>><<log::> (>><<log author timestamp local format::2001-02-03 08:05:07>><<log::)>>
│ <<log::Committer: >><<log committer name::Test User>><<log:: <>><<log committer email local::test.user>><<log committer email::@>><<log committer email domain::example.com>><<log::> (>><<log committer timestamp local format::2001-02-03 08:05:07>><<log::)>>
@@ -524,7 +524,7 @@ fn test_log_evolog_divergence() {
// No divergence
let output = work_dir.run_jj(["log"]);
insta::assert_snapshot!(output, @r"
@ qpvuntsm test.user@example.com 2001-02-03 08:05:08 ff309c29
@ qpvuntsm test.user@example.com 2001-02-03 08:05:08 556daeb7
│ description 1
◆ zzzzzzzz root() 00000000
[EOF]
@@ -536,9 +536,9 @@ fn test_log_evolog_divergence() {
.success();
let output = work_dir.run_jj(["log"]);
insta::assert_snapshot!(output, @r"
@ qpvuntsm?? test.user@example.com 2001-02-03 08:05:08 ff309c29
@ qpvuntsm?? test.user@example.com 2001-02-03 08:05:08 556daeb7
│ description 1
│ ○ qpvuntsm?? test.user@example.com 2001-02-03 08:05:10 6ba70e00
│ ○ qpvuntsm?? test.user@example.com 2001-02-03 08:05:10 5cea51a1
├─╯ description 2
◆ zzzzzzzz root() 00000000
[EOF]
@@ -550,9 +550,9 @@ fn test_log_evolog_divergence() {
// Color
let output = work_dir.run_jj(["log", "--color=always"]);
insta::assert_snapshot!(output, @r"
@ qpvuntsm?? test.user@example.com 2001-02-03 08:05:08 ff309c29
@ qpvuntsm?? test.user@example.com 2001-02-03 08:05:08 556daeb7
│ description 1
│ ○ qpvuntsm?? test.user@example.com 2001-02-03 08:05:10 6ba70e00
│ ○ qpvuntsm?? test.user@example.com 2001-02-03 08:05:10 5cea51a1
├─╯ description 2
◆ zzzzzzzz root() 00000000
[EOF]
@@ -561,11 +561,11 @@ fn test_log_evolog_divergence() {
// Evolog and hidden divergent
let output = work_dir.run_jj(["evolog"]);
insta::assert_snapshot!(output, @r"
@ qpvuntsm?? test.user@example.com 2001-02-03 08:05:08 ff309c29
@ qpvuntsm?? test.user@example.com 2001-02-03 08:05:08 556daeb7
│ description 1
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 485d52a9
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 d0c049cd
│ (no description set)
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
[EOF]
");
@@ -573,11 +573,11 @@ fn test_log_evolog_divergence() {
// Colored evolog
let output = work_dir.run_jj(["evolog", "--color=always"]);
insta::assert_snapshot!(output, @r"
@ qpvuntsm?? test.user@example.com 2001-02-03 08:05:08 ff309c29
@ qpvuntsm?? test.user@example.com 2001-02-03 08:05:08 556daeb7
│ description 1
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 485d52a9
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 d0c049cd
│ (no description set)
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
[EOF]
");
@@ -655,13 +655,13 @@ fn test_log_bookmarks() {
let template = r#"commit_id.short() ++ " " ++ if(bookmarks, bookmarks, "(no bookmarks)")"#;
let output = work_dir.run_jj(["log", "-T", template]);
insta::assert_snapshot!(output, @r"
@ a5b4d15489cc bookmark2* new-bookmark
○ 8476341eb395 bookmark2@origin unchanged
│ ○ fed794e2ba44 bookmark3?? bookmark3@origin
@ 5987a4a000d5 bookmark2* new-bookmark
○ 38a204733702 bookmark2@origin unchanged
│ ○ 999cf949d279 bookmark3?? bookmark3@origin
├─╯
│ ○ b1bb3766d584 bookmark3??
│ ○ d30139075fb1 bookmark3??
├─╯
│ ○ 4a7e4246fc4d bookmark1*
│ ○ c7f578d6e544 bookmark1*
├─╯
◆ 000000000000 (no bookmarks)
[EOF]
@@ -737,9 +737,9 @@ fn test_log_git_head() {
let output = work_dir.run_jj(["log", "--color=always"]);
insta::assert_snapshot!(output, @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 50aaf475
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 687fadfd
│ initial
○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 git_head() 230dd059
○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 git_head() e8849ae1
│ (empty) (no description set)
◆ zzzzzzzz root() 00000000
[EOF]
@@ -761,9 +761,9 @@ fn test_log_commit_id_normal_hex() {
r#"commit_id ++ ": " ++ commit_id.normal_hex()"#,
]);
insta::assert_snapshot!(output, @r"
@ 6572f22267c6f0f2bf7b8a37969ee5a7d54b8aae: 6572f22267c6f0f2bf7b8a37969ee5a7d54b8aae
○ 222fa9f0b41347630a1371203b8aad3897d34e5f: 222fa9f0b41347630a1371203b8aad3897d34e5f
○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22: 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ 08a70ab33d7143b7130ed8594d8216ef688623c0: 08a70ab33d7143b7130ed8594d8216ef688623c0
○ 25cb82357bdcbe96521d6577807de10f729f3a9c: 25cb82357bdcbe96521d6577807de10f729f3a9c
○ e8849ae12c709f2321908879bc724fdb2ab8a781: e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000: 0000000000000000000000000000000000000000
[EOF]
");
@@ -808,7 +808,7 @@ fn test_log_customize_short_id() {
&format!(r#"{decl}='id.shortest(5).prefix().upper() ++ "_" ++ id.shortest(5).rest()'"#),
]);
insta::assert_snapshot!(output, @r"
@ Q_pvun test.user@example.com 2001-02-03 08:05:08 F_a156
@ Q_pvun test.user@example.com 2001-02-03 08:05:08 6_8a50
│ (empty) first
◆ Z_zzzz root() 0_0000
[EOF]
@@ -820,7 +820,7 @@ fn test_log_customize_short_id() {
"--config=template-aliases.'format_short_change_id(id)'='format_short_id(id).upper()'",
]);
insta::assert_snapshot!(output, @r"
@ QPVUNTSM test.user@example.com 2001-02-03 08:05:08 fa15625b
@ QPVUNTSM test.user@example.com 2001-02-03 08:05:08 68a50538
│ (empty) first
◆ ZZZZZZZZ root() 00000000
[EOF]
@@ -1054,27 +1054,27 @@ fn test_short_prefix_in_transaction() {
}
// Short prefix should be used for commit summary inside the transaction
let parent_id = "58731d"; // Force id lookup to build index before mutation.
// If the cached index wasn't invalidated, the
// newly created commit wouldn't be found in it.
let parent_id = "c0b41"; // Force id lookup to build index before mutation.
// If the cached index wasn't invalidated, the
// newly created commit wouldn't be found in it.
let output = work_dir.run_jj(["new", parent_id, "--no-edit", "-m", "test"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Created new commit km[kuslswpqwq] 7[4ac55dd119b] test
Created new commit km[kuslswpqwq] a[5d12a825adf] test
[EOF]
");
// Should match log's short prefixes
let output = work_dir.run_jj(["log", "--no-graph"]);
insta::assert_snapshot!(output, @r"
km[kuslswpqwq] 7[4ac55dd119b] test
y[qosqzytrlsw] 5[8731db5875e] commit4
r[oyxmykxtrkr] 9[95cc897bca7] commit3
m[zvwutvlkqwt] 3[74534c54448] commit2
zs[uskulnrvyr] d[e304c281bed] commit1
kk[mpptxzrspx] 05[2755155952] commit0
q[pvuntsmwlqt] e[0e22b9fae75] initial
zz[zzzzzzzzzz] 00[0000000000]
km[kuslswpqwq] a[5d12a825adf] test
y[qosqzytrlsw] c0[b41b9a1b34] commit4
r[oyxmykxtrkr] 1[2124aa50a07] commit3
m[zvwutvlkqwt] c7[673aedfb82] commit2
zs[uskulnrvyr] 4[36497fbfb9d] commit1
kk[mpptxzrspx] d[70e8b9aa12b] commit0
q[pvuntsmwlqt] 8[216f646c36d] initial
zz[zzzzzzzzzz] 0[00000000000]
[EOF]
");
@@ -1082,13 +1082,13 @@ fn test_short_prefix_in_transaction() {
let output = work_dir.run_jj(["log", "--no-graph"]);
insta::assert_snapshot!(output, @r"
kmk[uslswpqwq] 74ac[55dd119b] test
yq[osqzytrlsw] 587[31db5875e] commit4
ro[yxmykxtrkr] 99[5cc897bca7] commit3
mz[vwutvlkqwt] 374[534c54448] commit2
zs[uskulnrvyr] de[304c281bed] commit1
kk[mpptxzrspx] 052[755155952] commit0
qp[vuntsmwlqt] e0[e22b9fae75] initial
kmk[uslswpqwq] a5[d12a825adf] test
yq[osqzytrlsw] c0b[41b9a1b34] commit4
ro[yxmykxtrkr] 121[24aa50a07] commit3
mz[vwutvlkqwt] c7[673aedfb82] commit2
zs[uskulnrvyr] 43[6497fbfb9d] commit1
kk[mpptxzrspx] d7[0e8b9aa12b] commit0
qp[vuntsmwlqt] 82[16f646c36d] initial
zz[zzzzzzzzzz] 00[0000000000]
[EOF]
");
@@ -1387,12 +1387,12 @@ fn test_log_diff_predefined_formats() {
"#};
let output = work_dir.run_jj(["log", "--no-graph", "-T", template]);
insta::assert_snapshot!(output, @r"
=== fbad2dd53d06 ===
=== d9ea8f447a3b ===
file1 [modified] source=file1 [file] target=file1 [file]
file2 [modified] source=file2 [file] target=file2 [file]
rename-target [renamed] source=rename-source [file] target=rename-target [file]
* non-empty len=3
=== 3c9b3178609b ===
=== 20bc00d202c2 ===
file1 [added] source=file1 [] target=file1 [file]
file2 [added] source=file2 [] target=file2 [file]
rename-source [added] source=rename-source [] target=rename-source [file]
@@ -1414,9 +1414,9 @@ fn test_log_diff_predefined_formats() {
"#};
let output = work_dir.run_jj(["log", "--no-graph", "-T", template]);
insta::assert_snapshot!(output, @r"
=== fbad2dd53d06 ===
=== d9ea8f447a3b ===
* total_added=3 total_removed=1
=== 3c9b3178609b ===
=== 20bc00d202c2 ===
* total_added=4 total_removed=0
=== 000000000000 ===
* total_added=0 total_removed=0
@@ -1556,8 +1556,8 @@ fn test_signature_templates() {
let output = work_dir.run_jj_with(|cmd| cmd.args(args).arg("builtin_log_oneline"));
insta::assert_snapshot!(output, @r"
@ rlvkpnrz test.user 2001-02-03 08:05:09 a0909ee9 [✓︎] (empty) signed
○ qpvuntsm test.user 2001-02-03 08:05:08 879d5d20 (empty) unsigned
@ rlvkpnrz test.user 2001-02-03 08:05:09 eb0e9b58 [✓︎] (empty) signed
○ qpvuntsm test.user 2001-02-03 08:05:08 0604e056 (empty) unsigned
│
~
[EOF]
@@ -1565,9 +1565,9 @@ fn test_signature_templates() {
let output = work_dir.run_jj_with(|cmd| cmd.args(args).arg("builtin_log_compact"));
insta::assert_snapshot!(output, @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a0909ee9 [✓︎]
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 eb0e9b58 [✓︎]
│ (empty) signed
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 879d5d20
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 0604e056
│ (empty) unsigned
~
[EOF]
@@ -1575,7 +1575,7 @@ fn test_signature_templates() {
let output = work_dir.run_jj_with(|cmd| cmd.args(args).arg("builtin_log_detailed"));
insta::assert_snapshot!(output, @r"
@ Commit ID: a0909ee96bb5c66311a0c579dc8ebed4456dfc1b
@ Commit ID: eb0e9b58b724003df03b4277d3066c1c20187ce5
│ Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
│ Author : Test User <test.user@example.com> (2001-02-03 08:05:09)
│ Committer: Test User <test.user@example.com> (2001-02-03 08:05:09)
@@ -1583,7 +1583,7 @@ fn test_signature_templates() {
│
│ signed
│
○ Commit ID: 879d5d20fea5930f053e0817033ad4aba924a361
○ Commit ID: 0604e056feaf8ee553fae4e06d4bfc57cdd319d6
│ Change ID: qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu
~ Author : Test User <test.user@example.com> (2001-02-03 08:05:08)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:08)
@@ -1602,8 +1602,8 @@ fn test_signature_templates() {
.args(["--config", config_val])
});
insta::assert_snapshot!(output, @r"
@ rlvkpnrz test.user 2001-02-03 08:05:09 a0909ee9 status: good (empty) signed
○ qpvuntsm test.user 2001-02-03 08:05:08 879d5d20 status: <Error: No CryptographicSignature available> (empty) unsigned
@ rlvkpnrz test.user 2001-02-03 08:05:09 eb0e9b58 status: good (empty) signed
○ qpvuntsm test.user 2001-02-03 08:05:08 0604e056 status: <Error: No CryptographicSignature available> (empty) unsigned
│
~
[EOF]
@@ -1637,7 +1637,7 @@ fn test_log_git_format_patch_template() {
"-r@",
]);
insta::assert_snapshot!(output, @r"
From 993219c0b219b5eeac6303b5cb2bf943ea719672 Mon Sep 17 00:00:00 2001
From fee27496968a4347a49d69c0a634fc0d5cf7fbc0 Mon Sep 17 00:00:00 2001
From: Test User <test.user@example.com>
Date: Sat, 3 Feb 2001 04:05:08 +0700
Subject: [PATCH] some change

75
cli/tests/test_completion.rs
View File

@@ -784,8 +784,8 @@ fn test_revisions() {
k working_copy
y mutable
q immutable
zq remote_commit
zz (no description set)
r remote_commit
z (no description set)
remote_bookmark@origin remote_commit
alias_with_newline roots(
siblings @-+ ~@
@@ -800,8 +800,8 @@ fn test_revisions() {
..k working_copy
..y mutable
..q immutable
..zq remote_commit
..zz (no description set)
..r remote_commit
..z (no description set)
..remote_bookmark@origin remote_commit
..alias_with_newline roots(
..siblings @-+ ~@
@@ -814,7 +814,7 @@ fn test_revisions() {
mutable_bookmark mutable
k working_copy
y mutable
zq remote_commit
r remote_commit
alias_with_newline roots(
siblings @-+ ~@
[EOF]
@@ -826,7 +826,7 @@ fn test_revisions() {
y::mutable_bookmark mutable
y::k working_copy
y::y mutable
y::zq remote_commit
y::r remote_commit
y::alias_with_newline roots(
y::siblings @-+ ~@
[EOF]
@@ -848,8 +848,8 @@ fn test_revisions() {
k working_copy
y mutable
q immutable
zq remote_commit
zz (no description set)
r remote_commit
z (no description set)
remote_bookmark@origin remote_commit
alias_with_newline roots(
siblings @-+ ~@
@@ -872,8 +872,8 @@ fn test_revisions() {
a=k working_copy
a=y mutable
a=q immutable
a=zq remote_commit
a=zz (no description set)
a=r remote_commit
a=z (no description set)
a=remote_bookmark@origin remote_commit
a=alias_with_newline roots(
a=siblings @-+ ~@
@@ -911,6 +911,9 @@ fn test_operations() {
work_dir
.run_jj(["describe", "-m", "description 4"])
.success();
work_dir
.run_jj(["describe", "-m", "description 5"])
.success();
let work_dir = test_env.work_dir("repo");
@@ -924,58 +927,58 @@ fn test_operations() {
.split('\t')
.next()
.unwrap();
insta::assert_snapshot!(add_workspace_id, @"eac759b9ab75");
insta::assert_snapshot!(add_workspace_id, @"09a518cf68a5");
let output = work_dir.complete_fish(["op", "show", "5"]);
let output = work_dir.complete_fish(["op", "show", "8"]);
insta::assert_snapshot!(output, @r"
5bbb4ca536a8 (2001-02-03 08:05:12) describe commit 968261075dddabf4b0e333c1cc9a49ce26a3f710
518b588abbc6 (2001-02-03 08:05:09) describe commit 19611c995a342c01f525583e5fcafdd211f6d009
8862eab31bc3 (2001-02-03 08:05:13) describe commit aa0b3230e3787076f232a08c8b1c7f54948a2d7a
8a1fa92a2a6a (2001-02-03 08:05:09) describe commit 3ae22e7f50a15d393e412cca72d09a61165d0c84
[EOF]
");
// make sure global --at-op flag is respected
let output = work_dir.complete_fish(["--at-op", "518b588abbc6", "op", "show", "5"]);
let output = work_dir.complete_fish(["--at-op", "8a1fa92a2a6a", "op", "show", "8"]);
insta::assert_snapshot!(output, @r"
518b588abbc6 (2001-02-03 08:05:09) describe commit 19611c995a342c01f525583e5fcafdd211f6d009
8a1fa92a2a6a (2001-02-03 08:05:09) describe commit 3ae22e7f50a15d393e412cca72d09a61165d0c84
[EOF]
");
let output = work_dir.complete_fish(["--at-op", "5b"]);
let output = work_dir.complete_fish(["--at-op", "8a"]);
insta::assert_snapshot!(output, @r"
5bbb4ca536a8 (2001-02-03 08:05:12) describe commit 968261075dddabf4b0e333c1cc9a49ce26a3f710
8a1fa92a2a6a (2001-02-03 08:05:09) describe commit 3ae22e7f50a15d393e412cca72d09a61165d0c84
[EOF]
");
let output = work_dir.complete_fish(["op", "abandon", "5b"]);
let output = work_dir.complete_fish(["op", "abandon", "8a"]);
insta::assert_snapshot!(output, @r"
5bbb4ca536a8 (2001-02-03 08:05:12) describe commit 968261075dddabf4b0e333c1cc9a49ce26a3f710
8a1fa92a2a6a (2001-02-03 08:05:09) describe commit 3ae22e7f50a15d393e412cca72d09a61165d0c84
[EOF]
");
let output = work_dir.complete_fish(["op", "diff", "--op", "5b"]);
let output = work_dir.complete_fish(["op", "diff", "--op", "8a"]);
insta::assert_snapshot!(output, @r"
5bbb4ca536a8 (2001-02-03 08:05:12) describe commit 968261075dddabf4b0e333c1cc9a49ce26a3f710
8a1fa92a2a6a (2001-02-03 08:05:09) describe commit 3ae22e7f50a15d393e412cca72d09a61165d0c84
[EOF]
");
let output = work_dir.complete_fish(["op", "diff", "--from", "5b"]);
let output = work_dir.complete_fish(["op", "diff", "--from", "8a"]);
insta::assert_snapshot!(output, @r"
5bbb4ca536a8 (2001-02-03 08:05:12) describe commit 968261075dddabf4b0e333c1cc9a49ce26a3f710
8a1fa92a2a6a (2001-02-03 08:05:09) describe commit 3ae22e7f50a15d393e412cca72d09a61165d0c84
[EOF]
");
let output = work_dir.complete_fish(["op", "diff", "--to", "5b"]);
let output = work_dir.complete_fish(["op", "diff", "--to", "8a"]);
insta::assert_snapshot!(output, @r"
5bbb4ca536a8 (2001-02-03 08:05:12) describe commit 968261075dddabf4b0e333c1cc9a49ce26a3f710
8a1fa92a2a6a (2001-02-03 08:05:09) describe commit 3ae22e7f50a15d393e412cca72d09a61165d0c84
[EOF]
");
let output = work_dir.complete_fish(["op", "restore", "5b"]);
let output = work_dir.complete_fish(["op", "restore", "8a"]);
insta::assert_snapshot!(output, @r"
5bbb4ca536a8 (2001-02-03 08:05:12) describe commit 968261075dddabf4b0e333c1cc9a49ce26a3f710
8a1fa92a2a6a (2001-02-03 08:05:09) describe commit 3ae22e7f50a15d393e412cca72d09a61165d0c84
[EOF]
");
let output = work_dir.complete_fish(["op", "undo", "5b"]);
let output = work_dir.complete_fish(["op", "undo", "8a"]);
insta::assert_snapshot!(output, @r"
5bbb4ca536a8 (2001-02-03 08:05:12) describe commit 968261075dddabf4b0e333c1cc9a49ce26a3f710
8a1fa92a2a6a (2001-02-03 08:05:09) describe commit 3ae22e7f50a15d393e412cca72d09a61165d0c84
[EOF]
");
}
@@ -1195,11 +1198,11 @@ fn test_files() {
let output = work_dir.run_jj(["log", "-r", "all()", "--summary"]);
insta::assert_snapshot!(output.normalize_backslash(), @r"
@ wqnwkozp test.user@example.com 2001-02-03 08:05:20 working_copy cb594eba
@ wqnwkozp test.user@example.com 2001-02-03 08:05:20 working_copy 440dd927
│ working_copy
│ A f_added_2
│ M f_modified
○ zsuskuln test.user@example.com 2001-02-03 08:05:11 second 24242473
○ zsuskuln test.user@example.com 2001-02-03 08:05:11 second 90bb4e13
│ second
│ A f_added
│ D f_deleted
@@ -1208,24 +1211,24 @@ fn test_files() {
│ A f_dir/dir_file_3
│ M f_modified
│ R {f_not_yet_renamed => f_renamed}
│ × royxmykx test.user@example.com 2001-02-03 08:05:14 conflicted 0ba6786b conflict
│ × royxmykx test.user@example.com 2001-02-03 08:05:14 conflicted b259cb83 conflict
├─╯ conflicted
│ A f_added_2
│ A f_dir/dir_file_1
│ A f_dir/dir_file_2
│ A f_dir/dir_file_3
│ M f_modified
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 first 2a2f433c
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 first 0600c83e
│ first
│ A f_deleted
│ A f_modified
│ A f_not_yet_renamed
│ A f_unchanged
│ ○ kpqxywon test.user@example.com 2001-02-03 08:05:18 interdiff_to 302c4041
│ ○ kpqxywon test.user@example.com 2001-02-03 08:05:18 interdiff_to 5e448a34
├─╯ interdiff_to
│ A f_interdiff_only_to
│ A f_interdiff_same
│ ○ yostqsxw test.user@example.com 2001-02-03 08:05:16 interdiff_from 083d1cc6
│ ○ yostqsxw test.user@example.com 2001-02-03 08:05:16 interdiff_from 039b07b8
├─╯ interdiff_from
│ A f_interdiff_only_from
│ A f_interdiff_same

54
cli/tests/test_concurrent_operations.rs
View File

@@ -34,18 +34,18 @@ fn test_concurrent_operation_divergence() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: The "@" expression resolved to more than one operation
Hint: Try specifying one of the operations by ID: 0162305507cc, d74dff64472e
Hint: Try specifying one of the operations by ID: c4991b0d765d, 9087f4bfa0de
[EOF]
[exit status: 1]
"#);
// "op log --at-op" should work without merging the head operations
let output = work_dir.run_jj(["op", "log", "--at-op=d74dff64472e"]);
let output = work_dir.run_jj(["op", "log", "--at-op=9087f4bfa0de"]);
insta::assert_snapshot!(output, @r"
@ d74dff64472e test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
│ describe commit 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ 9087f4bfa0de test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
│ describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
│ args: jj describe -m 'message 2' --at-op @-
○ eac759b9ab75 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
○ 2affa7025254 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
│ add workspace 'default'
○ 000000000000 root()
[EOF]
@@ -75,13 +75,13 @@ fn test_concurrent_operations_auto_rebase() {
work_dir.run_jj(["describe", "-m", "initial"]).success();
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(output, @r"
@ c62ace5c0522 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
│ describe commit 4e8f9d2be039994f589b4e57ac5e9488703e604d
@ aea22f517416 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
│ describe commit 006bd1130b84e90ab082adeabd7409270d5a86da
│ args: jj describe -m initial
○ 82d32fc68fc3 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
○ b5433cef81fc test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
│ snapshot working copy
│ args: jj describe -m initial
○ eac759b9ab75 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
○ 2affa7025254 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
│ add workspace 'default'
○ 000000000000 root()
[EOF]
@@ -96,8 +96,8 @@ fn test_concurrent_operations_auto_rebase() {
// We should be informed about the concurrent modification
let output = get_log_output(&work_dir);
insta::assert_snapshot!(output, @r"
○ db141860e12c2d5591c56fde4fc99caf71cec418 new child
@ 07c3641e495cce57ea4ca789123b52f421c57aa2 rewritten
○ b748b7189c0b301be205ebaf74b941c4ec209e69 new child
@ 084d39fe0ab1cd01a6b7fd21fdea3a8dcc9a48fc rewritten
◆ 0000000000000000000000000000000000000000
[EOF]
------- stderr -------
@@ -129,10 +129,10 @@ fn test_concurrent_operations_wc_modified() {
// We should be informed about the concurrent modification
let output = get_log_output(&work_dir);
insta::assert_snapshot!(output, @r"
@ 4eadcf3df11f46ef3d825c776496221cc8303053 new child1
│ ○ 68119f1643b7e3c301c5f7c2b6c9bf4ccba87379 new child2
@ fe9f87c5ee87d9cbc9a81fa1ebc600bb85471fd5 new child1
│ ○ 7fd594798328855ba9ca64f2f3708f8e61ea771d new child2
├─╯
○ 2ff7ae858a3a11837fdf9d1a76be295ef53f1bb3 initial
○ 4a8d8ea817a416777a551d7f41d9dfaf5dc2db5d initial
◆ 0000000000000000000000000000000000000000
[EOF]
------- stderr -------
@@ -160,7 +160,7 @@ fn test_concurrent_operations_wc_modified() {
○ │ new empty commit
│ ○ new empty commit
├─╯
○ describe commit 506f4ec3c2c62befa15fabc34ca9d4e6d7bef254
○ describe commit 9a462e35578a347e6a3951bf7a58ad7146959a8b
○ snapshot working copy
○ add workspace 'default'
○
@@ -190,19 +190,19 @@ fn test_concurrent_snapshot_wc_reloadable() {
let template = r#"id ++ "\n" ++ description ++ "\n" ++ tags"#;
let output = work_dir.run_jj(["op", "log", "-T", template]);
insta::assert_snapshot!(output, @r"
@ ec6bf266624bbaed55833a34ae62fa95c0e9efa651b94eb28846972da645845052dcdc8580332a5628849f23f48b9e99fc728dc3fb13106df8d0666d746f8b85
│ commit 554d22b2c43c1c47e279430197363e8daabe2fd6
@ 9009349b5198b481138bc77a268145474c016cd218f1f038317f2fa6f25e4e896e0c4c4e3271b188cb2726938b92ba8135ee2fb62ddf82b2bd41a9c839337b04
│ commit c91a0909a9d3f3d8392ba9fab88f4b40fc0810ee
│ args: jj commit -m 'new child1'
○ 23858df860b789e8176a73c0eb21804e3f1848f26d68b70d234c004d08980c41499b6669042bca20fbc2543c437222a084c7cd473e91c7a9a095a02bf38544ab
○ 0b8f20a1bd79d95aa49a517fbeb0b58caa024ba887c4b8da5b0feee6e2376757fa78fec2a07ee593f61d43eb3487c1ff389df5fb2c9489c313819193ccc0e401
│ snapshot working copy
│ args: jj commit -m 'new child1'
○ e1db5fa988fc66e5cc0491b00c53fb93e25e730341c850cb42e1e0db0c76d2b4065005787563301b1d292c104f381918897f7deabeb92d2532f42ce75d3fe588
│ commit de71e09289762a65f80bb1c3dae2a949df6bcde7
○ b544b8f44a8b084f965cdb3e5f32b4f3423899c1ac004036567125cb596f3eded7f4141561078463e31e7b3dd5832912348d970c78ed2468d118efe584f6e9f0
│ commit 9af4c151edead0304de97ce3a0b414552921a425
│ args: jj commit -m initial
○ 7de878155a459b7751097222132c935f9dcbb8f69a72b0f3a9036345a963010a553dc7c92964220128679ead72b087ca3aaf4ab9e20a221d1ffa4f9e92a32193
○ 8b49a5a258dd19ac6ea757de66f57933978e6e7af948da48247ac98d5933ea6d0f78ee2a3c08757ded39ad87805a2e528dd55fd2e1da71da28e501c0c3454d9a
│ snapshot working copy
│ args: jj commit -m initial
○ eac759b9ab75793fd3da96e60939fb48f2cd2b2a9c1f13ffe723cf620f3005b8d3e7e923634a07ea39513e4f2f360c87b9ad5d331cf90d7a844864b83b72eba1
○ 2affa702525487ca490c4bc8a9a365adf75f972efb5888dd58716de7603e822ba1ed1ed0a50132ee44572bb9d819f37589d0ceb790b397ddcc88c976fde2bf02
│ add workspace 'default'
○ 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
@@ -223,8 +223,8 @@ fn test_concurrent_snapshot_wc_reloadable() {
let output = work_dir.run_jj(["describe", "-m", "new child2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz 1795621b new child2
Parent commit (@-) : rlvkpnrz 86f54245 new child1
Working copy (@) now at: kkmpptxz 5a2a6177 new child2
Parent commit (@-) : rlvkpnrz 15bd889d new child1
[EOF]
");
@@ -233,11 +233,11 @@ fn test_concurrent_snapshot_wc_reloadable() {
let template = r#"commit_id ++ " " ++ description"#;
let output = work_dir.run_jj(["log", "-T", template, "-s"]);
insta::assert_snapshot!(output, @r"
@ 1795621b54f4ebb435978b65d66bc0f90d8f20b6 new child2
@ 5a2a6177e84f2e9e67b896421155ded751801da6 new child2
│ A child2
○ 86f54245e13f850f8275b5541e56da996b6a47b7 new child1
○ 15bd889d60e9f054f5b163a697041a1dad1edfa3 new child1
│ A child1
○ 84f07f6bca2ffeddac84a8b09f60c6b81112375c initial
○ 064f230b16b2bd6435a713d7f3363f562fb0d80f initial
│ A base
◆ 0000000000000000000000000000000000000000
[EOF]

2
cli/tests/test_config_command.rs
View File

@@ -1539,7 +1539,7 @@ fn test_config_author_change_warning() {
let output = work_dir.run_jj(["log"]);
insta::assert_snapshot!(output, @r"
@ qpvuntsm Foo 2001-02-03 08:05:09 ed1febd8
@ qpvuntsm Foo 2001-02-03 08:05:09 f64cf908
│ (empty) (no description set)
◆ zzzzzzzz root() 00000000
[EOF]

2
cli/tests/test_debug_command.rs
View File

@@ -237,7 +237,7 @@ fn test_debug_operation_id() {
let work_dir = test_env.work_dir("repo");
let output = work_dir.run_jj(["debug", "operation", "--display", "id"]);
assert_snapshot!(filter_index_stats(output), @r"
eac759b9ab75793fd3da96e60939fb48f2cd2b2a9c1f13ffe723cf620f3005b8d3e7e923634a07ea39513e4f2f360c87b9ad5d331cf90d7a844864b83b72eba1
2affa702525487ca490c4bc8a9a365adf75f972efb5888dd58716de7603e822ba1ed1ed0a50132ee44572bb9d819f37589d0ceb790b397ddcc88c976fde2bf02
[EOF]
");
}

114
cli/tests/test_describe_command.rs
View File

@@ -31,7 +31,7 @@ fn test_describe() {
let output = work_dir.run_jj(["describe", "-m", "description from CLI"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm 95979928 (empty) description from CLI
Working copy (@) now at: qpvuntsm 7b186b4f (empty) description from CLI
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -65,7 +65,7 @@ fn test_describe() {
let output = work_dir.run_jj(["describe"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm 94fcb906 (empty) description from editor
Working copy (@) now at: qpvuntsm 28173c3e (empty) description from editor
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -79,7 +79,7 @@ fn test_describe() {
let output = work_dir.run_jj(["describe"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm 7a348923 (empty) description among comment
Working copy (@) now at: qpvuntsm e7488502 (empty) description among comment
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -89,7 +89,7 @@ fn test_describe() {
let output = work_dir.run_jj(["describe"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm 749361b5 (empty) line1
Working copy (@) now at: qpvuntsm 7438c202 (empty) line1
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -116,7 +116,7 @@ fn test_describe() {
let output = work_dir.run_jj(["describe"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm dc44dbee (empty) line1
Working copy (@) now at: qpvuntsm f38e2bd7 (empty) line1
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -131,7 +131,7 @@ fn test_describe() {
let output = work_dir.run_jj(["describe", "-m", ""]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm 6296963b (empty) (no description set)
Working copy (@) now at: qpvuntsm 7c00df81 (empty) (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -181,7 +181,7 @@ fn test_describe() {
let output = work_dir.run_jj(["describe"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm 10fa2dc7 (empty) description from editor
Working copy (@) now at: qpvuntsm 0ec68094 (empty) description from editor
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -274,9 +274,9 @@ fn test_describe_multiple_commits() {
work_dir.run_jj(["new"]).success();
work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ c6349e79bbfd
○ 65b6b74e0897
○ 230dd059e1b0
@ 3cd3b246e098
○ 43444d88b009
○ e8849ae12c70
◆ 000000000000
[EOF]
");
@@ -287,14 +287,14 @@ fn test_describe_multiple_commits() {
------- stderr -------
Updated 2 commits
Rebased 1 descendant commits
Working copy (@) now at: kkmpptxz 41659b84 (empty) description from CLI
Parent commit (@-) : rlvkpnrz 8d650510 (empty) (no description set)
Working copy (@) now at: kkmpptxz 4c3ccb9d (empty) description from CLI
Parent commit (@-) : rlvkpnrz 650ac8f2 (empty) (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 41659b846096 description from CLI
○ 8d650510daad
○ a42f5755e688 description from CLI
@ 4c3ccb9d4fb2 description from CLI
○ 650ac8f249be
○ 0ff65c91377a description from CLI
◆ 000000000000
[EOF]
");
@@ -316,10 +316,10 @@ fn test_describe_multiple_commits() {
JJ: - The text you enter will be lost on a syntax error.
JJ: - The syntax of the separator lines may change in the future.
JJ:
JJ: describe 8d650510daad -------
JJ: describe 650ac8f249be -------
JJ: describe 41659b846096 -------
JJ: describe 4c3ccb9d4fb2 -------
description from CLI
JJ: Lines starting with "JJ:" (like this one) will be removed.
@@ -334,12 +334,12 @@ fn test_describe_multiple_commits() {
JJ: More header tests. Library tests verify parsing in other situations.
JJ: describe 8d650510daad -------
JJ: describe 650ac8f249be -------
description from editor of @-
further commit message of @-
JJ: describe 41659b846096 -------
JJ: describe 4c3ccb9d4fb2 -------
description from editor of @
further commit message of @
@@ -352,18 +352,18 @@ fn test_describe_multiple_commits() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Updated 2 commits
Working copy (@) now at: kkmpptxz f203494a (empty) description from editor of @
Parent commit (@-) : rlvkpnrz 0d76a92c (empty) description from editor of @-
Working copy (@) now at: kkmpptxz 87c0f3c7 (empty) description from editor of @
Parent commit (@-) : rlvkpnrz 9b9041eb (empty) description from editor of @-
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ f203494a4507 description from editor of @
@ 87c0f3c75a22 description from editor of @
│
│ further commit message of @
○ 0d76a92ca7cc description from editor of @-
○ 9b9041eb2f04 description from editor of @-
│
│ further commit message of @-
○ a42f5755e688 description from CLI
○ 0ff65c91377a description from CLI
◆ 000000000000
[EOF]
");
@@ -373,17 +373,17 @@ fn test_describe_multiple_commits() {
&edit_script,
indoc! {"
write
JJ: describe 0d76a92ca7cc -------
JJ: describe 9b9041eb2f04 -------
first description from editor of @-
further commit message of @-
JJ: describe 0d76a92ca7cc -------
JJ: describe 9b9041eb2f04 -------
second description from editor of @-
further commit message of @-
JJ: describe f203494a4507 -------
JJ: describe 87c0f3c75a22 -------
updated description from editor of @
further commit message of @
@@ -395,7 +395,7 @@ fn test_describe_multiple_commits() {
let output = work_dir.run_jj(["describe", "@", "@-"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: The following commits were found in the edited message multiple times: 0d76a92ca7cc
Error: The following commits were found in the edited message multiple times: 9b9041eb2f04
[EOF]
[exit status: 1]
");
@@ -408,12 +408,12 @@ fn test_describe_multiple_commits() {
JJ: describe 000000000000 -------
unexpected commit ID
JJ: describe 0d76a92ca7cc -------
JJ: describe 9b9041eb2f04 -------
description from editor of @-
further commit message of @-
JJ: describe f203494a4507 -------
JJ: describe 87c0f3c75a22 -------
description from editor of @
further commit message of @
@@ -435,7 +435,7 @@ fn test_describe_multiple_commits() {
&edit_script,
indoc! {"
write
JJ: describe f203494a4507 -------
JJ: describe 87c0f3c75a22 -------
description from editor of @
further commit message of @
@@ -447,7 +447,7 @@ fn test_describe_multiple_commits() {
let output = work_dir.run_jj(["describe", "@", "@-"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: The description for the following commits were not found in the edited message: 0d76a92ca7cc
Error: The description for the following commits were not found in the edited message: 9b9041eb2f04
[EOF]
[exit status: 1]
");
@@ -460,7 +460,7 @@ fn test_describe_multiple_commits() {
write
description from editor of @-
JJ: describe f203494a4507 -------
JJ: describe 9b9041eb2f04 -------
description from editor of @
JJ: Lines starting with \"JJ: \" (like this one) will be removed.
@@ -500,13 +500,13 @@ fn test_describe_multiple_commits() {
&edit_script,
indoc! {"
write
JJ: describe 0d76a92ca7cc -------
JJ: describe 9b9041eb2f04 -------
description from editor for @-
JJ: ignore-rest
content after ignore-rest should not be included
JJ: describe a42f5755e688 -------
JJ: describe 0ff65c91377a -------
description from editor for @--
JJ: ignore-rest
@@ -519,16 +519,16 @@ fn test_describe_multiple_commits() {
------- stderr -------
Updated 2 commits
Rebased 1 descendant commits
Working copy (@) now at: kkmpptxz 1d7701ee (empty) description from editor of @
Parent commit (@-) : rlvkpnrz 5389926e (empty) description from editor for @-
Working copy (@) now at: kkmpptxz 5a6249e9 (empty) description from editor of @
Parent commit (@-) : rlvkpnrz d1c1edbd (empty) description from editor for @-
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 1d7701eec9bc description from editor of @
@ 5a6249e9e71a description from editor of @
│
│ further commit message of @
○ 5389926ebed6 description from editor for @-
○ eaa8547ae37a description from editor for @--
○ d1c1edbd5595 description from editor for @-
○ a8bf976d72fb description from editor for @--
◆ 000000000000
[EOF]
");
@@ -550,7 +550,7 @@ fn test_multiple_message_args() {
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm 99a36a50 (empty) First Paragraph from CLI
Working copy (@) now at: qpvuntsm 9b8ad205 (empty) First Paragraph from CLI
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -589,7 +589,7 @@ fn test_multiple_message_args() {
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm 01ac40b3 (empty) First Paragraph from CLI
Working copy (@) now at: qpvuntsm ac46ea93 (empty) First Paragraph from CLI
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -619,7 +619,7 @@ fn test_describe_default_description() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Warning: Deprecated config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
Working copy (@) now at: qpvuntsm 573b6df5 TESTED=TODO
Working copy (@) now at: qpvuntsm 7276dfff TESTED=TODO
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
"#);
@@ -640,7 +640,7 @@ fn test_describe_default_description() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Warning: Deprecated config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
Working copy (@) now at: kkmpptxz f652c321 (empty) (no description set)
Working copy (@) now at: kkmpptxz 7118bcb8 (empty) (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
"#);
@@ -805,14 +805,14 @@ fn test_describe_author() {
JJ: - The text you enter will be lost on a syntax error.
JJ: - The syntax of the separator lines may change in the future.
JJ:
JJ: describe eae86afaa20c -------
JJ: describe b6fdbcc93170 -------
JJ: Author: Ove Ridder <ove.ridder@example.com> (2001-02-03 08:05:18)
JJ: Committer: Ove Ridder <ove.ridder@example.com> (2001-02-03 08:05:18)
JJ: 0 files changed, 0 insertions(+), 0 deletions(-)
JJ:
JJ: describe ba485659f76a -------
JJ: describe 3c9fefe4bede -------
JJ: Author: Ove Ridder <ove.ridder@example.com> (2001-02-03 08:05:18)
JJ: Committer: Ove Ridder <ove.ridder@example.com> (2001-02-03 08:05:18)
@@ -852,7 +852,7 @@ fn test_describe_with_edit_and_message_args_opens_editor() {
let output = work_dir.run_jj(["describe", "-m", "message from command line", "--edit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm 61ece7a9 (empty) message from command line
Working copy (@) now at: qpvuntsm f9bee6de (empty) message from command line
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -879,7 +879,7 @@ fn test_describe_change_with_existing_message_with_edit_and_message_args_opens_e
let output = work_dir.run_jj(["describe", "-m", "new message", "--edit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm de694560 (empty) new message
Working copy (@) now at: qpvuntsm f8f14f7c (empty) new message
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -926,7 +926,7 @@ fn test_add_trailer() {
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm f576838d (empty) Message from CLI
Working copy (@) now at: qpvuntsm 55c6f83d (empty) Message from CLI
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -948,7 +948,7 @@ fn test_add_trailer() {
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm 2d3438dc (empty) Message from CLI
Working copy (@) now at: qpvuntsm 2b2e302d (empty) Message from CLI
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -1004,8 +1004,8 @@ fn test_add_trailer() {
let output = work_dir.run_jj(["new"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: yostqsxw 5a8ea7e1 (empty) (no description set)
Parent commit (@-) : qpvuntsm 2d3438dc (empty) Message from CLI
Working copy (@) now at: yostqsxw dbea21e1 (empty) (no description set)
Parent commit (@-) : qpvuntsm 2b2e302d (empty) Message from CLI
[EOF]
");
let output = work_dir.run_jj([
@@ -1035,7 +1035,7 @@ fn test_add_trailer_committer() {
let output = work_dir.run_jj(["describe", "-m", "Message from CLI"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm 500b5e31 (empty) Message from CLI
Working copy (@) now at: qpvuntsm 67458426 (empty) Message from CLI
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -1057,7 +1057,7 @@ fn test_add_trailer_committer() {
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm b71fc9e2 (empty) Message from CLI
Working copy (@) now at: qpvuntsm 05ddee5c (empty) Message from CLI
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -1076,7 +1076,7 @@ fn test_add_trailer_committer() {
let output = work_dir.run_jj(["describe", "--config", "user.email=foo@bar.net"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm d430eef5 (empty) Message from CLI
Working copy (@) now at: qpvuntsm b7dafa2c (empty) Message from CLI
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -1108,8 +1108,8 @@ fn test_add_trailer_committer() {
let output = work_dir.run_jj(["describe"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: vruxwmqv bc9e914e (empty) Signed-off-by: test.user@example.com
Parent commit (@-) : qpvuntsm d430eef5 (empty) Message from CLI
Working copy (@) now at: vruxwmqv b6148729 (empty) Signed-off-by: test.user@example.com
Parent commit (@-) : qpvuntsm b7dafa2c (empty) Message from CLI
[EOF]
");

60
cli/tests/test_diff_command.rs
View File

@@ -2251,19 +2251,19 @@ fn test_diff_conflict_sides_differ() {
// left1+right1.
work_dir.run_jj(["new", "root()"]).success();
insta::assert_snapshot!(work_dir.run_jj(["log", "-r~@"]), @r"
× lylxulpl test.user@example.com 2001-02-03 08:05:20 left2+right2 bfccf5a2 conflict
× lylxulpl test.user@example.com 2001-02-03 08:05:20 left2+right2 530ede8c conflict
├─╮ (empty) left2+right2
│ ○ znkkpsqq test.user@example.com 2001-02-03 08:05:17 right2 adb6aa86
│ ○ znkkpsqq test.user@example.com 2001-02-03 08:05:17 right2 e57450eb
│ │ right2
○ │ royxmykx test.user@example.com 2001-02-03 08:05:13 left2 f4ad65fd
○ │ royxmykx test.user@example.com 2001-02-03 08:05:13 left2 b50b218b
│ │ left2
│ │ × kmkuslsw test.user@example.com 2001-02-03 08:05:18 left1+right1 8dbc225e conflict
│ │ × kmkuslsw test.user@example.com 2001-02-03 08:05:18 left1+right1 83cdbdb5 conflict
╭─┬─╯ (empty) left1+right1
│ ○ vruxwmqv test.user@example.com 2001-02-03 08:05:15 right1 32bc5d06
│ ○ vruxwmqv test.user@example.com 2001-02-03 08:05:15 right1 3fe2e860
│ │ right1
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 left1 fd6e26af
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 left1 713a980c
├─╯ left1
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 base 236ad5a8
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 base aa7e33ed
│ base
◆ zzzzzzzz root() 00000000
[EOF]
@@ -2545,21 +2545,21 @@ fn test_diff_conflict_bases_differ() {
// left1+right1.
work_dir.run_jj(["new", "root()"]).success();
insta::assert_snapshot!(work_dir.run_jj(["log", "-r~@"]), @r"
× nkmrtpmo test.user@example.com 2001-02-03 08:05:22 left2+right2 569df7b1 conflict
× nkmrtpmo test.user@example.com 2001-02-03 08:05:22 left2+right2 22cb40d9 conflict
├─╮ (empty) left2+right2
│ ○ kmkuslsw test.user@example.com 2001-02-03 08:05:19 right2 d394320d
│ ○ kmkuslsw test.user@example.com 2001-02-03 08:05:19 right2 656695c3
│ │ right2
○ │ znkkpsqq test.user@example.com 2001-02-03 08:05:17 left2 88cb6406
○ │ znkkpsqq test.user@example.com 2001-02-03 08:05:17 left2 218094ec
├─╯ left2
○ vruxwmqv test.user@example.com 2001-02-03 08:05:15 base2 bd2e8956
○ vruxwmqv test.user@example.com 2001-02-03 08:05:15 base2 3c4d67e6
│ base2
│ × lylxulpl test.user@example.com 2001-02-03 08:05:20 left1+right1 5fbf08e0 conflict
│ × lylxulpl test.user@example.com 2001-02-03 08:05:20 left1+right1 1711cb65 conflict
│ ├─╮ (empty) left1+right1
│ │ ○ royxmykx test.user@example.com 2001-02-03 08:05:13 right1 a318e8b9
│ │ ○ royxmykx test.user@example.com 2001-02-03 08:05:13 right1 3087be1f
├───╯ right1
│ ○ zsuskuln test.user@example.com 2001-02-03 08:05:11 left1 40ab70b1
│ ○ zsuskuln test.user@example.com 2001-02-03 08:05:11 left1 9e995075
├─╯ left1
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 base1 cffa4075
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 base1 44cfbde6
│ base1
◆ zzzzzzzz root() 00000000
[EOF]
@@ -2701,19 +2701,19 @@ fn test_diff_conflict_three_sides() {
// Test the setup
work_dir.run_jj(["new", "root()"]).success();
insta::assert_snapshot!(work_dir.run_jj(["log", "-r~@"]), @r"
× lylxulpl test.user@example.com 2001-02-03 08:05:20 side1+side2+side3 ba761075 conflict
× lylxulpl test.user@example.com 2001-02-03 08:05:20 side1+side2+side3 ac1efd43 conflict
├─╮ (empty) side1+side2+side3
│ ○ znkkpsqq test.user@example.com 2001-02-03 08:05:17 side3 7139f5ec
│ ○ znkkpsqq test.user@example.com 2001-02-03 08:05:17 side3 f73063c9
│ │ side3
× │ kmkuslsw test.user@example.com 2001-02-03 08:05:18 side1+side2 aa14223d conflict
× │ kmkuslsw test.user@example.com 2001-02-03 08:05:18 side1+side2 a1f24e10 conflict
├───╮ (empty) side1+side2
│ │ ○ vruxwmqv test.user@example.com 2001-02-03 08:05:15 side2 ddf45f8f
│ │ ○ vruxwmqv test.user@example.com 2001-02-03 08:05:15 side2 bc176227
│ │ │ side2
○ │ │ royxmykx test.user@example.com 2001-02-03 08:05:13 side1 df4007a4
○ │ │ royxmykx test.user@example.com 2001-02-03 08:05:13 side1 3a079496
├───╯ side1
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 base2 2c7ca1f2
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 base2 75289ea3
├─╯ base2
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 base1 cd7f3381
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 base1 07965fa1
│ base1
◆ zzzzzzzz root() 00000000
[EOF]
@@ -2875,14 +2875,14 @@ fn test_diff_external_tool() {
");
insta::assert_snapshot!(work_dir.run_jj(["log", "-p", "--tool=fake-diff-editor"]), @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 39d9055d
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 b1e84e17
│ (no description set)
│ file1
│ file2
│ --
│ file2
│ file3
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 0ad4ef22
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 74c18ac3
│ (no description set)
│ --
│ file1
@@ -2893,7 +2893,7 @@ fn test_diff_external_tool() {
");
insta::assert_snapshot!(work_dir.run_jj(["show", "--tool=fake-diff-editor"]), @r"
Commit ID: 39d9055d70873099fd924b9af218289d5663eac8
Commit ID: b1e84e171e795eeb9cea971f052a30a21255a0a5
Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
Author : Test User <test.user@example.com> (2001-02-03 08:05:09)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:09)
@@ -2943,7 +2943,7 @@ fn test_diff_external_tool() {
std::fs::write(&edit_script, "print diff\0fail").unwrap();
let output = work_dir.run_jj(["show", "--tool=fake-diff-editor"]);
insta::assert_snapshot!(output.normalize_stderr_exit_status(), @r"
Commit ID: 39d9055d70873099fd924b9af218289d5663eac8
Commit ID: b1e84e171e795eeb9cea971f052a30a21255a0a5
Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
Author : Test User <test.user@example.com> (2001-02-03 08:05:09)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:09)
@@ -3024,7 +3024,7 @@ fn test_diff_external_file_by_file_tool() {
");
insta::assert_snapshot!(
work_dir.run_jj_with(|cmd| cmd.args(["log", "-p"]).args(configs)), @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 7b01704a
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 6e901d9d
│ (no description set)
│ ==
│ file2
@@ -3038,7 +3038,7 @@ fn test_diff_external_file_by_file_tool() {
│ file1
│ --
│ file4
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 6e485984
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 923beb72
│ (no description set)
│ ==
│ file1
@@ -3053,7 +3053,7 @@ fn test_diff_external_file_by_file_tool() {
");
insta::assert_snapshot!(work_dir.run_jj_with(|cmd| cmd.arg("show").args(configs)), @r"
Commit ID: 7b01704a670bc77d11ed117d362855cff1d4513b
Commit ID: 6e901d9d82f5cdfab386fc2b601186158d12cab7
Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
Author : Test User <test.user@example.com> (2001-02-03 08:05:09)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:09)
@@ -3489,7 +3489,7 @@ fn test_diff_revisions() {
insta::assert_snapshot!(diff_revisions("A|C"), @r"
------- stderr -------
Error: Cannot diff revsets with gaps in.
Hint: Revision 50c75fd767bf would need to be in the set.
Hint: Revision 2378873cd201 would need to be in the set.
[EOF]
[exit status: 1]
");

54
cli/tests/test_diffedit_command.rs
View File

@@ -50,7 +50,7 @@ fn test_diffedit() {
");
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("instrs")).unwrap(), @r"
You are editing changes in: kkmpptxz 3d4cce89 (no description set)
You are editing changes in: kkmpptxz e4245972 (no description set)
The diff initially shows the commit's changes.
@@ -124,8 +124,8 @@ fn test_diffedit() {
let output = work_dir.run_jj(["diffedit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz cbc7a725 (no description set)
Parent commit (@-) : rlvkpnrz a72506cd (no description set)
Working copy (@) now at: kkmpptxz 7ced5d33 (no description set)
Parent commit (@-) : rlvkpnrz 7e268da3 (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -142,8 +142,8 @@ fn test_diffedit() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: kkmpptxz 59ef1b95 (no description set)
Parent commit (@-) : rlvkpnrz d4eef3fc (no description set)
Working copy (@) now at: kkmpptxz c1c7453a (no description set)
Parent commit (@-) : rlvkpnrz 087fca5d (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -160,8 +160,8 @@ fn test_diffedit() {
let output = work_dir.run_jj(["diffedit", "--from", "@--"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz 5b585bd1 (no description set)
Parent commit (@-) : rlvkpnrz a72506cd (no description set)
Working copy (@) now at: kkmpptxz a6e6b3d5 (no description set)
Parent commit (@-) : rlvkpnrz 7e268da3 (no description set)
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -209,8 +209,8 @@ fn test_diffedit_new_file() {
let output = work_dir.run_jj(["diffedit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: rlvkpnrz b0376e2b (no description set)
Parent commit (@-) : qpvuntsm b739eb46 (no description set)
Working copy (@) now at: rlvkpnrz e7b12828 (no description set)
Parent commit (@-) : qpvuntsm eb7b8a1f (no description set)
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -334,9 +334,9 @@ fn test_diffedit_external_tool_conflict_marker_style() {
let output = work_dir.run_jj(["diffedit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: mzvwutvl fb39e804 (conflict) (empty) (no description set)
Parent commit (@-) : rlvkpnrz 3765cc27 side-a
Parent commit (@-) : zsuskuln 8b3de837 side-b
Working copy (@) now at: mzvwutvl 268f208f (conflict) (empty) (no description set)
Parent commit (@-) : rlvkpnrz 74e448a1 side-a
Parent commit (@-) : zsuskuln 6982bce7 side-b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict
@@ -413,9 +413,9 @@ fn test_diffedit_external_tool_conflict_marker_style() {
let output = work_dir.run_jj(["st"]);
insta::assert_snapshot!(output, @r"
The working copy has no changes.
Working copy (@) : mzvwutvl fb39e804 (conflict) (empty) (no description set)
Parent commit (@-): rlvkpnrz 3765cc27 side-a
Parent commit (@-): zsuskuln 8b3de837 side-b
Working copy (@) : mzvwutvl 268f208f (conflict) (empty) (no description set)
Parent commit (@-): rlvkpnrz 74e448a1 side-a
Parent commit (@-): zsuskuln 6982bce7 side-b
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict
[EOF]
@@ -482,8 +482,8 @@ fn test_diffedit_3pane() {
let output = work_dir.run_jj(["diffedit", "--config", config_with_output_as_after]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz ed8aada3 (no description set)
Parent commit (@-) : rlvkpnrz a72506cd (no description set)
Working copy (@) now at: kkmpptxz f83aa6b2 (no description set)
Parent commit (@-) : rlvkpnrz 7e268da3 (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -499,8 +499,8 @@ fn test_diffedit_3pane() {
let output = work_dir.run_jj(["diffedit", "--config", config_with_output_as_after]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz 7c19e689 (no description set)
Parent commit (@-) : rlvkpnrz a72506cd (no description set)
Working copy (@) now at: kkmpptxz db662405 (no description set)
Parent commit (@-) : rlvkpnrz 7e268da3 (no description set)
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -573,8 +573,8 @@ fn test_diffedit_merge() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: yqosqzyt abbb78c1 (conflict) (empty) (no description set)
Parent commit (@-) : royxmykx 0105de4a (conflict) merge
Working copy (@) now at: yqosqzyt ce686d54 (conflict) (empty) (no description set)
Parent commit (@-) : royxmykx 47cae64e (conflict) merge
Added 0 files, modified 0 files, removed 1 files
Warning: There are unresolved conflicts at these paths:
file2 2-sided conflict
@@ -652,8 +652,8 @@ fn test_diffedit_old_restore_interactive_tests() {
let output = work_dir.run_jj(["diffedit", "--from", "@-"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: rlvkpnrz 69811eda (no description set)
Parent commit (@-) : qpvuntsm fc687cb8 (no description set)
Working copy (@) now at: rlvkpnrz 7ef54b56 (no description set)
Parent commit (@-) : qpvuntsm fc6f5e82 (no description set)
Added 0 files, modified 1 files, removed 1 files
[EOF]
");
@@ -669,8 +669,8 @@ fn test_diffedit_old_restore_interactive_tests() {
let output = work_dir.run_jj(["diffedit", "--from", "@-"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: rlvkpnrz 2b76a42e (no description set)
Parent commit (@-) : qpvuntsm fc687cb8 (no description set)
Working copy (@) now at: rlvkpnrz fa736d13 (no description set)
Parent commit (@-) : qpvuntsm fc6f5e82 (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -720,8 +720,8 @@ fn test_diffedit_restore_descendants() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits (while preserving their content)
Working copy (@) now at: kkmpptxz 321d1cd1 (no description set)
Parent commit (@-) : rlvkpnrz 62b8c2ce (no description set)
Working copy (@) now at: kkmpptxz a35ef1a5 (no description set)
Parent commit (@-) : rlvkpnrz 2e949a84 (no description set)
[EOF]
");
let output = work_dir.run_jj(["diff", "--git"]);

1948
cli/tests/test_duplicate_command.rs
View File

File diff suppressed because it is too large Load Diff

14
cli/tests/test_edit_command.rs
View File

@@ -44,15 +44,15 @@ fn test_edit() {
let output = work_dir.run_jj(["edit", "@-"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm 73383c0b first
Working copy (@) now at: qpvuntsm 1f6994f8 first
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
let output = get_log_output(&work_dir);
insta::assert_snapshot!(output, @r"
○ 2c910ae2d628 second
@ 73383c0b6439 first
○ b38b8e65163a second
@ 1f6994f8b95b first
◆ 000000000000
[EOF]
");
@@ -62,8 +62,8 @@ fn test_edit() {
work_dir.write_file("file2", "0");
let output = get_log_output(&work_dir);
insta::assert_snapshot!(output, @r"
○ b384b2cc1883 second
@ ff3f7b0dc386 first
○ d5aea29cb4cb second
@ 2636584c21c0 first
◆ 000000000000
[EOF]
------- stderr -------
@@ -117,8 +117,8 @@ fn test_edit_current_wc_commit_missing() {
Internal error: Failed to edit a commit
Caused by:
1: Current working-copy commit not found
2: Object fa15625b4a986997697639dfc2844138900c79f2 of type commit not found
3: An object with id fa15625b4a986997697639dfc2844138900c79f2 could not be found
2: Object 68a505386f936fff6d718f55005e77ea72589bc1 of type commit not found
3: An object with id 68a505386f936fff6d718f55005e77ea72589bc1 could not be found
[EOF]
[exit status: 255]
");

130
cli/tests/test_evolog_command.rs
View File

@@ -32,13 +32,13 @@ fn test_evolog_with_or_without_diff() {
let output = work_dir.run_jj(["evolog"]);
insta::assert_snapshot!(output, @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 66b42ad3
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
│ my description
× rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 07b18245 conflict
× rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 7f56b2a0 conflict
│ my description
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 068224a7
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 51e08f95
│ my description
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 2b023b5f
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 b955b72e
(empty) my description
[EOF]
");
@@ -46,13 +46,13 @@ fn test_evolog_with_or_without_diff() {
// Color
let output = work_dir.run_jj(["--color=always", "evolog"]);
insta::assert_snapshot!(output, @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 66b42ad3
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
│ my description
× rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 07b18245 conflict
× rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 7f56b2a0 conflict
│ my description
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 068224a7
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 51e08f95
│ my description
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 2b023b5f
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 b955b72e
(empty) my description
[EOF]
");
@@ -61,7 +61,7 @@ fn test_evolog_with_or_without_diff() {
// (even even though it resulted in a conflict).
let output = work_dir.run_jj(["evolog", "-p"]);
insta::assert_snapshot!(output, @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 66b42ad3
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
│ my description
│ Resolved conflict in file1:
│ 1 : <<<<<<< Conflict 1 of 1
@@ -71,16 +71,16 @@ fn test_evolog_with_or_without_diff() {
│ 5 : foo
│ 6 : bar
│ 7 1: >>>>>>> Conflict 1 of 1 endsresolved
× rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 07b18245 conflict
× rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 7f56b2a0 conflict
│ my description
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 068224a7
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 51e08f95
│ my description
│ Modified regular file file1:
│ 1 1: foo
│ 2: bar
│ Added regular file file2:
│ 1: foo
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 2b023b5f
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 b955b72e
(empty) my description
[EOF]
");
@@ -88,9 +88,9 @@ fn test_evolog_with_or_without_diff() {
// Test `--limit`
let output = work_dir.run_jj(["evolog", "--limit=2"]);
insta::assert_snapshot!(output, @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 66b42ad3
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
│ my description
× rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 07b18245 conflict
× rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 7f56b2a0 conflict
│ my description
[EOF]
");
@@ -98,13 +98,13 @@ fn test_evolog_with_or_without_diff() {
// Test `--no-graph`
let output = work_dir.run_jj(["evolog", "--no-graph"]);
insta::assert_snapshot!(output, @r"
rlvkpnrz test.user@example.com 2001-02-03 08:05:10 66b42ad3
rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
my description
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 07b18245 conflict
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 7f56b2a0 conflict
my description
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 068224a7
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 51e08f95
my description
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 2b023b5f
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 b955b72e
(empty) my description
[EOF]
");
@@ -112,7 +112,7 @@ fn test_evolog_with_or_without_diff() {
// Test `--git` format, and that it implies `-p`
let output = work_dir.run_jj(["evolog", "--no-graph", "--git"]);
insta::assert_snapshot!(output, @r"
rlvkpnrz test.user@example.com 2001-02-03 08:05:10 66b42ad3
rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
my description
diff --git a/file1 b/file1
index 0000000000..2ab19ae607 100644
@@ -127,9 +127,9 @@ fn test_evolog_with_or_without_diff() {
-bar
->>>>>>> Conflict 1 of 1 ends
+resolved
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 07b18245 conflict
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 7f56b2a0 conflict
my description
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 068224a7
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 51e08f95
my description
diff --git a/file1 b/file1
index 257cc5642c..3bd1f0e297 100644
@@ -145,7 +145,7 @@ fn test_evolog_with_or_without_diff() {
+++ b/file2
@@ -0,0 +1,1 @@
+foo
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 2b023b5f
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 b955b72e
(empty) my description
[EOF]
");
@@ -170,13 +170,13 @@ fn test_evolog_with_custom_symbols() {
let output = work_dir.run_jj(["evolog", "--config", config]);
insta::assert_snapshot!(output, @r"
$ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 66b42ad3
$ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
│ my description
┝ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 07b18245 conflict
┝ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 7f56b2a0 conflict
│ my description
┝ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 068224a7
┝ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 51e08f95
│ my description
┝ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 2b023b5f
┝ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 b955b72e
(empty) my description
[EOF]
");
@@ -200,34 +200,34 @@ fn test_evolog_word_wrap() {
// ui.log-word-wrap option applies to both graph/no-graph outputs
insta::assert_snapshot!(render(&["evolog"], 40, false), @r"
@ qpvuntsm test.user@example.com 2001-02-03 08:05:08 fa15625b
@ qpvuntsm test.user@example.com 2001-02-03 08:05:08 68a50538
│ (empty) first
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
[EOF]
");
insta::assert_snapshot!(render(&["evolog"], 40, true), @r"
@ qpvuntsm test.user@example.com
│ 2001-02-03 08:05:08 fa15625b
│ 2001-02-03 08:05:08 68a50538
│ (empty) first
○ qpvuntsm hidden test.user@example.com
2001-02-03 08:05:07 230dd059
2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
[EOF]
");
insta::assert_snapshot!(render(&["evolog", "--no-graph"], 40, false), @r"
qpvuntsm test.user@example.com 2001-02-03 08:05:08 fa15625b
qpvuntsm test.user@example.com 2001-02-03 08:05:08 68a50538
(empty) first
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
[EOF]
");
insta::assert_snapshot!(render(&["evolog", "--no-graph"], 40, true), @r"
qpvuntsm test.user@example.com
2001-02-03 08:05:08 fa15625b
2001-02-03 08:05:08 68a50538
(empty) first
qpvuntsm hidden test.user@example.com
2001-02-03 08:05:07 230dd059
2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
[EOF]
");
@@ -275,27 +275,27 @@ fn test_evolog_squash() {
let output = work_dir.run_jj(["evolog", "-p", "-r", "description('squash')"]);
insta::assert_snapshot!(output, @r"
○ qpvuntsm test.user@example.com 2001-02-03 08:05:15 d49749bf
○ qpvuntsm test.user@example.com 2001-02-03 08:05:15 5f3281c6
├─┬─╮ squashed 3
│ │ ○ vruxwmqv hidden test.user@example.com 2001-02-03 08:05:15 8f2ae2b5
│ │ ○ vruxwmqv hidden test.user@example.com 2001-02-03 08:05:15 770795d0
│ │ │ fifth
│ │ │ Added regular file file5:
│ │ │ 1: foo5
│ │ ○ vruxwmqv hidden test.user@example.com 2001-02-03 08:05:14 04d28ca9
│ │ ○ vruxwmqv hidden test.user@example.com 2001-02-03 08:05:14 2e0123d1
│ │ (empty) fifth
│ ○ yqosqzyt hidden test.user@example.com 2001-02-03 08:05:14 c5801e10
│ ○ yqosqzyt hidden test.user@example.com 2001-02-03 08:05:14 ea8161b6
│ │ fourth
│ │ Added regular file file4:
│ │ 1: foo4
│ ○ yqosqzyt hidden test.user@example.com 2001-02-03 08:05:13 bb54a199
│ ○ yqosqzyt hidden test.user@example.com 2001-02-03 08:05:13 1de5fdb6
│ (empty) fourth
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:12 1408a0a7
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:12 5ec0619a
├─╮ squashed 2
│ │ Removed regular file file2:
│ │ 1 : foo2
│ │ Removed regular file file3:
│ │ 1 : foo3
│ ○ zsuskuln hidden test.user@example.com 2001-02-03 08:05:12 c9460789
│ ○ zsuskuln hidden test.user@example.com 2001-02-03 08:05:12 cce957f1
│ │ third
│ │ Modified regular file file1:
│ │ 1 1: foo
@@ -305,26 +305,26 @@ fn test_evolog_squash() {
│ │ 1: foo2
│ │ Added regular file file3:
│ │ 1: foo3
│ ○ zsuskuln hidden test.user@example.com 2001-02-03 08:05:11 66645763
│ ○ zsuskuln hidden test.user@example.com 2001-02-03 08:05:11 3a2a4253
│ │ (empty) third
│ ○ zsuskuln hidden test.user@example.com 2001-02-03 08:05:10 1c7afcb4
│ ○ zsuskuln hidden test.user@example.com 2001-02-03 08:05:10 ebec10f4
│ (empty) (no description set)
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:10 e3c2a446
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:10 69085884
├─╮ squashed 1
│ ○ kkmpptxz hidden test.user@example.com 2001-02-03 08:05:10 46acd22a
│ ○ kkmpptxz hidden test.user@example.com 2001-02-03 08:05:10 a3759c9d
│ │ second
│ │ Modified regular file file1:
│ │ 1 1: foo
│ │ 2: bar
│ ○ kkmpptxz hidden test.user@example.com 2001-02-03 08:05:09 cba41deb
│ ○ kkmpptxz hidden test.user@example.com 2001-02-03 08:05:09 a5b2f625
│ (empty) second
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 766420db
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 5878cbe0
│ first
│ Added regular file file1:
│ 1: foo
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 fa15625b
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 68a50538
│ (empty) first
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
[EOF]
");
@@ -380,22 +380,22 @@ fn test_evolog_reversed_no_graph() {
work_dir.run_jj(["describe", "-m", "c"]).success();
let output = work_dir.run_jj(["evolog", "--reversed", "--no-graph"]);
insta::assert_snapshot!(output, @r"
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 d8d5f980
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 b86e28cd
(empty) a
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 b4584f54
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 9f43967b
(empty) b
qpvuntsm test.user@example.com 2001-02-03 08:05:10 5cb22a87
qpvuntsm test.user@example.com 2001-02-03 08:05:10 b28cda4b
(empty) c
[EOF]
");
let output = work_dir.run_jj(["evolog", "--limit=2", "--reversed", "--no-graph"]);
insta::assert_snapshot!(output, @r"
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 b4584f54
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 9f43967b
(empty) b
qpvuntsm test.user@example.com 2001-02-03 08:05:10 5cb22a87
qpvuntsm test.user@example.com 2001-02-03 08:05:10 b28cda4b
(empty) c
[EOF]
");
@@ -429,30 +429,30 @@ fn test_evolog_reverse_with_graph() {
.success();
let output = work_dir.run_jj(["evolog", "-r", "description(c+d+e)", "--reversed"]);
insta::assert_snapshot!(output, @r"
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 d8d5f980
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 b86e28cd
│ (empty) a
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 b4584f54
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 9f43967b
│ (empty) b
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:10 5cb22a87
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:10 b28cda4b
│ (empty) c
│ ○ mzvwutvl hidden test.user@example.com 2001-02-03 08:05:11 280cbb6e
│ ○ mzvwutvl hidden test.user@example.com 2001-02-03 08:05:11 6a4ff8aa
├─╯ (empty) d
│ ○ royxmykx hidden test.user@example.com 2001-02-03 08:05:12 031df638
│ ○ royxmykx hidden test.user@example.com 2001-02-03 08:05:12 7dea2d1d
├─╯ (empty) e
○ qpvuntsm test.user@example.com 2001-02-03 08:05:13 a177c2f2
○ qpvuntsm test.user@example.com 2001-02-03 08:05:13 78fdd026
(empty) c+d+e
[EOF]
");
let output = work_dir.run_jj(["evolog", "-rdescription(c+d+e)", "--limit=3", "--reversed"]);
insta::assert_snapshot!(output, @r"
○ mzvwutvl hidden test.user@example.com 2001-02-03 08:05:11 280cbb6e
○ mzvwutvl hidden test.user@example.com 2001-02-03 08:05:11 6a4ff8aa
│ (empty) d
│ ○ royxmykx hidden test.user@example.com 2001-02-03 08:05:12 031df638
│ ○ royxmykx hidden test.user@example.com 2001-02-03 08:05:12 7dea2d1d
├─╯ (empty) e
○ qpvuntsm test.user@example.com 2001-02-03 08:05:13 a177c2f2
○ qpvuntsm test.user@example.com 2001-02-03 08:05:13 78fdd026
(empty) c+d+e
[EOF]
");

14
cli/tests/test_file_chmod_command.rs
View File

@@ -106,9 +106,9 @@ fn test_chmod_regular_conflict() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Warning: No matching entries for paths: nonexistent
Working copy (@) now at: yostqsxw 2b11d002 conflict | (conflict) conflict
Parent commit (@-) : royxmykx 427fbd2f x | x
Parent commit (@-) : zsuskuln 3f83a26d n | n
Working copy (@) now at: yostqsxw df2619be conflict | (conflict) conflict
Parent commit (@-) : royxmykx 02247291 x | x
Parent commit (@-) : zsuskuln eb0ba805 n | n
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict including an executable
@@ -196,14 +196,14 @@ fn test_chmod_file_dir_deletion_conflicts() {
let output = work_dir.run_jj(["file", "chmod", "x", "file", "-r=file_deletion"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kmkuslsw 139dee15 file_deletion | (conflict) file_deletion
Parent commit (@-) : zsuskuln c51c9c55 file | file
Parent commit (@-) : royxmykx 6b18b3c1 deletion | deletion
Working copy (@) now at: kmkuslsw dc89f9e7 file_deletion | (conflict) file_deletion
Parent commit (@-) : zsuskuln bc9cdea1 file | file
Parent commit (@-) : royxmykx d7d39332 deletion | deletion
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict including 1 deletion and an executable
New conflicts appeared in 1 commits:
kmkuslsw 139dee15 file_deletion | (conflict) file_deletion
kmkuslsw dc89f9e7 file_deletion | (conflict) file_deletion
Hint: To resolve the conflicts, start by updating to it:
jj new kmkuslsw
Then use `jj resolve`, or edit the conflict markers in the file directly.

58
cli/tests/test_fix_command.rs
View File

@@ -542,8 +542,8 @@ fn test_fix_leaf_commit() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Fixed 1 commits of 1 checked.
Working copy (@) now at: rlvkpnrz 85ce8924 (no description set)
Parent commit (@-) : qpvuntsm b2ca2bc5 (no description set)
Working copy (@) now at: rlvkpnrz 45a3ace1 (no description set)
Parent commit (@-) : qpvuntsm b37955c0 (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -582,8 +582,8 @@ fn test_fix_parent_commit() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Fixed 3 commits of 3 checked.
Working copy (@) now at: mzvwutvl d30c8ae2 child2 | (no description set)
Parent commit (@-) : qpvuntsm 70a4dae2 parent | (no description set)
Working copy (@) now at: mzvwutvl 6842c630 child2 | (no description set)
Parent commit (@-) : qpvuntsm e586ba6c parent | (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -687,8 +687,8 @@ fn test_default_revset() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Fixed 3 commits of 3 checked.
Working copy (@) now at: yostqsxw dabc47b2 bar2 | (no description set)
Parent commit (@-) : yqosqzyt 984b5924 bar1 | (no description set)
Working copy (@) now at: yostqsxw 41903dfd bar2 | (no description set)
Parent commit (@-) : yqosqzyt c2e6d322 bar1 | (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -772,8 +772,8 @@ fn test_fix_immutable_commit() {
let output = work_dir.run_jj(["fix", "-s", "immutable"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit e4b41a3ce243 is immutable
Hint: Could not modify commit: qpvuntsm e4b41a3c immutable | (no description set)
Error: Commit a86b2eccaaab is immutable
Hint: Could not modify commit: qpvuntsm a86b2ecc immutable | (no description set)
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -820,7 +820,7 @@ fn test_fix_some_paths() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Fixed 1 commits of 1 checked.
Working copy (@) now at: qpvuntsm 54a90d2b (no description set)
Working copy (@) now at: qpvuntsm b3e6840d (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
@@ -846,7 +846,7 @@ fn test_fix_cyclic() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Fixed 1 commits of 1 checked.
Working copy (@) now at: qpvuntsm bf5e6a5a (no description set)
Working copy (@) now at: qpvuntsm 087e5fb0 (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
@@ -861,7 +861,7 @@ fn test_fix_cyclic() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Fixed 1 commits of 1 checked.
Working copy (@) now at: qpvuntsm 0e2d20d6 (no description set)
Working copy (@) now at: qpvuntsm 832f43c5 (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
@@ -908,8 +908,8 @@ fn test_deduplication() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Fixed 4 commits of 4 checked.
Working copy (@) now at: yqosqzyt cf770245 d | (no description set)
Parent commit (@-) : mzvwutvl 370615a5 c | (empty) (no description set)
Working copy (@) now at: yqosqzyt 9849a250 d | (no description set)
Parent commit (@-) : mzvwutvl 9544f381 c | (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -1030,7 +1030,7 @@ fn test_stderr_success() {
insta::assert_snapshot!(output, @r"
------- stderr -------
errorFixed 1 commits of 1 checked.
Working copy (@) now at: qpvuntsm 487808ba (no description set)
Working copy (@) now at: qpvuntsm cb75cbcb (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
@@ -1097,7 +1097,7 @@ fn test_fix_file_types() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Fixed 1 commits of 1 checked.
Working copy (@) now at: qpvuntsm 6836a9e4 (no description set)
Working copy (@) now at: qpvuntsm a600eba5 (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
@@ -1126,7 +1126,7 @@ fn test_fix_executable() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Fixed 1 commits of 1 checked.
Working copy (@) now at: qpvuntsm fee78e99 (no description set)
Working copy (@) now at: qpvuntsm ed402983 (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
@@ -1205,9 +1205,9 @@ fn test_fix_adding_merge_commit() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Fixed 1 commits of 1 checked.
Working copy (@) now at: mzvwutvl f93eb5a9 (no description set)
Parent commit (@-) : qpvuntsm 6e64e7a7 a | (no description set)
Parent commit (@-) : kkmpptxz c536f264 b | (no description set)
Working copy (@) now at: mzvwutvl c8d50db3 (no description set)
Parent commit (@-) : qpvuntsm 93f04460 a | (no description set)
Parent commit (@-) : kkmpptxz ad4fc36c b | (no description set)
Added 0 files, modified 4 files, removed 0 files
[EOF]
");
@@ -1256,9 +1256,9 @@ fn test_fix_both_sides_of_conflict() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Fixed 3 commits of 3 checked.
Working copy (@) now at: mzvwutvl a55c6ec2 (conflict) (empty) (no description set)
Parent commit (@-) : qpvuntsm 8e8aad69 a | (no description set)
Parent commit (@-) : kkmpptxz 91f9b284 b | (no description set)
Working copy (@) now at: mzvwutvl d4d02bf0 (conflict) (empty) (no description set)
Parent commit (@-) : qpvuntsm 0eae0dae a | (no description set)
Parent commit (@-) : kkmpptxz eb61ba8d b | (no description set)
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict
@@ -1311,9 +1311,9 @@ fn test_fix_resolve_conflict() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Fixed 3 commits of 3 checked.
Working copy (@) now at: mzvwutvl 50fd048d (empty) (no description set)
Parent commit (@-) : qpvuntsm dd2721f1 a | (no description set)
Parent commit (@-) : kkmpptxz 07c27a8e b | (no description set)
Working copy (@) now at: mzvwutvl c4e4665e (empty) (no description set)
Parent commit (@-) : qpvuntsm 7a0dbb95 a | (no description set)
Parent commit (@-) : kkmpptxz 5d9510ab b | (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -1375,8 +1375,8 @@ fn test_all_files() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Fixed 2 commits of 2 checked.
Working copy (@) now at: rlvkpnrz c098d165 child
Parent commit (@-) : qpvuntsm 0bb31627 parent
Working copy (@) now at: rlvkpnrz d8503fee child
Parent commit (@-) : qpvuntsm 62c6ee98 parent
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -1428,8 +1428,8 @@ fn test_all_files() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Fixed 2 commits of 2 checked.
Working copy (@) now at: rlvkpnrz c5d0aa1d child
Parent commit (@-) : qpvuntsm b4d02ca9 parent
Working copy (@) now at: rlvkpnrz 3675eae3 child
Parent commit (@-) : qpvuntsm 6a0a8a6a parent
Added 0 files, modified 2 files, removed 0 files
[EOF]
");

42
cli/tests/test_git_clone.rs
View File

@@ -65,7 +65,7 @@ fn test_git_clone() {
Fetching into new repo in "$TEST_ENV/clone"
bookmark: main@origin [new] tracked
Setting the revset alias `trunk()` to `main@origin`
Working copy (@) now at: uuqppmxq f78d2645 (empty) (no description set)
Working copy (@) now at: uuqppmxq 3711b3b5 (empty) (no description set)
Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files
[EOF]
@@ -152,7 +152,7 @@ fn test_git_clone() {
Fetching into new repo in "$TEST_ENV/nested/path/to/repo"
bookmark: main@origin [new] tracked
Setting the revset alias `trunk()` to `main@origin`
Working copy (@) now at: uuzqqzqu cf5d593e (empty) (no description set)
Working copy (@) now at: uuzqqzqu c871b515 (empty) (no description set)
Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files
[EOF]
@@ -217,7 +217,7 @@ fn test_git_clone_colocate() {
Fetching into new repo in "$TEST_ENV/clone"
bookmark: main@origin [new] tracked
Setting the revset alias `trunk()` to `main@origin`
Working copy (@) now at: uuqppmxq f78d2645 (empty) (no description set)
Working copy (@) now at: uuqppmxq 3711b3b5 (empty) (no description set)
Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files
[EOF]
@@ -362,7 +362,7 @@ fn test_git_clone_colocate() {
Fetching into new repo in "$TEST_ENV/nested/path/to/repo"
bookmark: main@origin [new] tracked
Setting the revset alias `trunk()` to `main@origin`
Working copy (@) now at: vzqnnsmr 589d0921 (empty) (no description set)
Working copy (@) now at: vzqnnsmr fea36bca (empty) (no description set)
Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files
[EOF]
@@ -398,7 +398,7 @@ fn test_git_clone_remote_default_bookmark() {
bookmark: feature1@origin [new] tracked
bookmark: main@origin [new] tracked
Setting the revset alias `trunk()` to `main@origin`
Working copy (@) now at: sqpuoqvx 2ca1c979 (empty) (no description set)
Working copy (@) now at: sqpuoqvx 1ca44815 (empty) (no description set)
Parent commit (@-) : qomsplrm ebeb70d8 feature1 main | message
Added 1 files, modified 0 files, removed 0 files
[EOF]
@@ -428,7 +428,7 @@ fn test_git_clone_remote_default_bookmark() {
bookmark: feature1@origin [new] untracked
bookmark: main@origin [new] untracked
Setting the revset alias `trunk()` to `main@origin`
Working copy (@) now at: rzvqmyuk 018092c2 (empty) (no description set)
Working copy (@) now at: rzvqmyuk 27e56779 (empty) (no description set)
Parent commit (@-) : qomsplrm ebeb70d8 feature1@origin main | message
Added 1 files, modified 0 files, removed 0 files
[EOF]
@@ -450,7 +450,7 @@ fn test_git_clone_remote_default_bookmark() {
bookmark: feature1@origin [new] untracked
bookmark: main@origin [new] untracked
Setting the revset alias `trunk()` to `feature1@origin`
Working copy (@) now at: nppvrztz 5fd587f4 (empty) (no description set)
Working copy (@) now at: nppvrztz b16020e9 (empty) (no description set)
Parent commit (@-) : qomsplrm ebeb70d8 feature1 main@origin | message
Added 1 files, modified 0 files, removed 0 files
[EOF]
@@ -498,7 +498,7 @@ fn test_git_clone_remote_default_bookmark_with_escape() {
Fetching into new repo in "$TEST_ENV/clone"
bookmark: "\""@origin [new] untracked
Setting the revset alias `trunk()` to `"\""@origin`
Working copy (@) now at: sqpuoqvx 2ca1c979 (empty) (no description set)
Working copy (@) now at: sqpuoqvx 1ca44815 (empty) (no description set)
Parent commit (@-) : qomsplrm ebeb70d8 " | message
Added 1 files, modified 0 files, removed 0 files
[EOF]
@@ -535,7 +535,7 @@ fn test_git_clone_ignore_working_copy() {
let output = clone_dir.run_jj(["status", "--ignore-working-copy"]);
insta::assert_snapshot!(output, @r"
The working copy has no changes.
Working copy (@) : sqpuoqvx 2ca1c979 (empty) (no description set)
Working copy (@) : sqpuoqvx 1ca44815 (empty) (no description set)
Parent commit (@-): qomsplrm ebeb70d8 main | message
[EOF]
");
@@ -544,7 +544,7 @@ fn test_git_clone_ignore_working_copy() {
let output = clone_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: The working copy is stale (not updated since operation eac759b9ab75).
Error: The working copy is stale (not updated since operation 2affa7025254).
Hint: Run `jj workspace update-stale` to update it.
See https://jj-vcs.github.io/jj/latest/working-copy/#stale-working-copy for more information.
[EOF]
@@ -585,7 +585,7 @@ fn test_git_clone_with_remote_name() {
Fetching into new repo in "$TEST_ENV/clone"
bookmark: main@upstream [new] tracked
Setting the revset alias `trunk()` to `main@upstream`
Working copy (@) now at: sqpuoqvx 2ca1c979 (empty) (no description set)
Working copy (@) now at: sqpuoqvx 1ca44815 (empty) (no description set)
Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files
[EOF]
@@ -639,7 +639,7 @@ fn test_git_clone_trunk_deleted() {
Fetching into new repo in "$TEST_ENV/clone"
bookmark: main@origin [new] untracked
Setting the revset alias `trunk()` to `main@origin`
Working copy (@) now at: sqpuoqvx 2ca1c979 (empty) (no description set)
Working copy (@) now at: sqpuoqvx 1ca44815 (empty) (no description set)
Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files
[EOF]
@@ -657,7 +657,7 @@ fn test_git_clone_trunk_deleted() {
let output = clone_dir.run_jj(["log"]);
insta::assert_snapshot!(output, @r"
@ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 2ca1c979
@ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 1ca44815
│ (empty) (no description set)
○ qomsplrm someone@example.org 1970-01-01 11:00:00 ebeb70d8
│ message
@@ -728,7 +728,7 @@ fn test_git_clone_conditional_config() {
Fetching into new repo in "$TEST_ENV/new"
bookmark: main@origin [new] untracked
Setting the revset alias `trunk()` to `main@origin`
Working copy (@) now at: zxsnswpr 9ffb42e2 (empty) (no description set)
Working copy (@) now at: zxsnswpr 5479cd52 (empty) (no description set)
Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files
[EOF]
@@ -770,7 +770,7 @@ fn test_git_clone_with_depth() {
Fetching into new repo in "$TEST_ENV/clone"
bookmark: main@origin [new] tracked
Setting the revset alias `trunk()` to `main@origin`
Working copy (@) now at: sqpuoqvx 2ca1c979 (empty) (no description set)
Working copy (@) now at: sqpuoqvx 1ca44815 (empty) (no description set)
Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files
[EOF]
@@ -778,7 +778,7 @@ fn test_git_clone_with_depth() {
let output = clone_dir.run_jj(["log"]);
insta::assert_snapshot!(output, @r"
@ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 2ca1c979
@ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 1ca44815
│ (empty) (no description set)
◆ qomsplrm someone@example.org 1970-01-01 11:00:00 main ebeb70d8
│ message
@@ -831,7 +831,7 @@ fn test_git_clone_malformed() {
Fetching into new repo in "$TEST_ENV/clone"
bookmark: main@origin [new] untracked
Setting the revset alias `trunk()` to `main@origin`
Internal error: Failed to check out commit 0a09cb41583450703459a2310d63da61456364ce
Internal error: Failed to check out commit 2f4286212884d472a0b2013a961b695a144ac65c
Caused by: Reserved path component .jj in $TEST_ENV/clone/.jj
[EOF]
[exit status: 255]
@@ -841,7 +841,7 @@ fn test_git_clone_malformed() {
let output = clone_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: The working copy is stale (not updated since operation 57e024eb3edf).
Error: The working copy is stale (not updated since operation 045afcc49a1b).
Hint: Run `jj workspace update-stale` to update it.
See https://jj-vcs.github.io/jj/latest/working-copy/#stale-working-copy for more information.
[EOF]
@@ -853,7 +853,7 @@ fn test_git_clone_malformed() {
let output = clone_dir.run_jj(["workspace", "update-stale"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Internal error: Failed to check out commit 0a09cb41583450703459a2310d63da61456364ce
Internal error: Failed to check out commit 2f4286212884d472a0b2013a961b695a144ac65c
Caused by: Reserved path component .jj in $TEST_ENV/clone/.jj
[EOF]
[exit status: 255]
@@ -863,7 +863,7 @@ fn test_git_clone_malformed() {
let output = clone_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r"
The working copy has no changes.
Working copy (@) : zsuskuln f652c321 (empty) (no description set)
Working copy (@) : zsuskuln c2934cfb (empty) (no description set)
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -895,7 +895,7 @@ fn test_git_clone_with_global_git_remote_config() {
Fetching into new repo in "$TEST_ENV/clone"
bookmark: main@origin [new] untracked
Setting the revset alias `trunk()` to `main@origin`
Working copy (@) now at: sqpuoqvx 2ca1c979 (empty) (no description set)
Working copy (@) now at: sqpuoqvx 1ca44815 (empty) (no description set)
Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files
[EOF]

352
cli/tests/test_git_colocated.rs
View File

@@ -49,7 +49,7 @@ fn test_git_colocated() {
.run_jj(["git", "init", "--git-repo", "."])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ c3a12656d5027825bc69f40e11dc0bb381d7c277
@ 524826059adc6f74de30f6be8f8eb86715d75b62
○ 97358f54806c7cd005ed5ade68a779595efbae7e master git_head() initial
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -63,7 +63,7 @@ fn test_git_colocated() {
// HEAD commit should not
work_dir.write_file("file", "modified");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 59642000f061cf23eb37ab6eecce428afe7824da
@ f40534d1cfee0e0916dcfbc65c31970b3c705269
○ 97358f54806c7cd005ed5ade68a779595efbae7e master git_head() initial
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -76,8 +76,8 @@ fn test_git_colocated() {
// Create a new change from jj and check that it's reflected in Git
work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ fd4e130e43068d76ec6eb2c6df01653ea12eccb4
○ 59642000f061cf23eb37ab6eecce428afe7824da git_head()
@ b369903b66e2dba03f3f6b24433670784f6180d7
○ f40534d1cfee0e0916dcfbc65c31970b3c705269 git_head()
○ 97358f54806c7cd005ed5ade68a779595efbae7e master initial
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -85,7 +85,7 @@ fn test_git_colocated() {
assert!(git_repo.head().unwrap().is_detached());
insta::assert_snapshot!(
git_repo.head_id().unwrap().to_string(),
@"59642000f061cf23eb37ab6eecce428afe7824da"
@"f40534d1cfee0e0916dcfbc65c31970b3c705269"
);
}
@@ -176,7 +176,7 @@ fn test_git_colocated_unborn_bookmark() {
b"refs/heads/master"
);
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -186,7 +186,7 @@ fn test_git_colocated_unborn_bookmark() {
let output = work_dir.run_jj(["new", "root()"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz fcdbbd73 (empty) (no description set)
Working copy (@) now at: kkmpptxz 2b17ac71 (empty) (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 0 files, removed 1 files
[EOF]
@@ -197,8 +197,8 @@ fn test_git_colocated_unborn_bookmark() {
b"refs/heads/master"
);
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ fcdbbd731496cae17161cd6be9b6cf1f759655a8
│ ○ 993600f1189571af5bbeb492cf657dc7d0fde48a
@ 2b17ac719c7db025e2514f5708d2b0328fc6b268
│ ○ 1d68db605e7f3722d6869beab15183f0e41fd45c
├─╯
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -207,7 +207,7 @@ fn test_git_colocated_unborn_bookmark() {
checkout_index();
insta::assert_snapshot!(work_dir.run_jj(["status"]), @r"
The working copy has no changes.
Working copy (@) : kkmpptxz fcdbbd73 (empty) (no description set)
Working copy (@) : kkmpptxz 2b17ac71 (empty) (no description set)
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -218,19 +218,19 @@ fn test_git_colocated_unborn_bookmark() {
let output = work_dir.run_jj(["new"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: royxmykx 0e146103 (empty) (no description set)
Parent commit (@-) : kkmpptxz e3e01407 (no description set)
Working copy (@) now at: royxmykx c5b52bf2 (empty) (no description set)
Parent commit (@-) : kkmpptxz 54ca7830 (no description set)
[EOF]
");
assert!(git_repo.head().unwrap().is_detached());
insta::assert_snapshot!(
git_repo.head_id().unwrap().to_string(),
@"e3e01407bd3539722ae4ffff077700d97c60cb11"
@"54ca78301ccd2e0da397694ab34160d539a40e86"
);
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 0e14610343ef50775f5c44db5aeef19aee45d9ad
○ e3e01407bd3539722ae4ffff077700d97c60cb11 git_head()
│ ○ 993600f1189571af5bbeb492cf657dc7d0fde48a
@ c5b52bf20a14ca728cbb2a56b9dffabc266251bd
○ 54ca78301ccd2e0da397694ab34160d539a40e86 git_head()
│ ○ 1d68db605e7f3722d6869beab15183f0e41fd45c
├─╯
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -239,8 +239,8 @@ fn test_git_colocated_unborn_bookmark() {
checkout_index();
insta::assert_snapshot!(work_dir.run_jj(["status"]), @r"
The working copy has no changes.
Working copy (@) : royxmykx 0e146103 (empty) (no description set)
Parent commit (@-): kkmpptxz e3e01407 (no description set)
Working copy (@) : royxmykx c5b52bf2 (empty) (no description set)
Parent commit (@-): kkmpptxz 54ca7830 (no description set)
[EOF]
");
@@ -255,18 +255,18 @@ fn test_git_colocated_unborn_bookmark() {
let output = work_dir.run_jj(["new", "root()"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: znkkpsqq 10dd328b (empty) (no description set)
Working copy (@) now at: znkkpsqq 2b2f7cb0 (empty) (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
assert!(git_repo.head().unwrap().is_unborn());
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 10dd328bb906e15890e55047740eab2812a3b2f7
│ ○ ef75c0b0dcc9b080e00226908c21316acaa84dc6
│ ○ e3e01407bd3539722ae4ffff077700d97c60cb11 master
@ 2b2f7cb00d53f5c0675efb09cbe1a826ce1167a4
│ ○ 6c3d40f5a3260d762cd52a8ff6d09883c88d8db5
│ ○ 54ca78301ccd2e0da397694ab34160d539a40e86 master
├─╯
│ ○ 993600f1189571af5bbeb492cf657dc7d0fde48a
│ ○ 1d68db605e7f3722d6869beab15183f0e41fd45c
├─╯
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -275,7 +275,7 @@ fn test_git_colocated_unborn_bookmark() {
checkout_index();
insta::assert_snapshot!(work_dir.run_jj(["status"]), @r"
The working copy has no changes.
Working copy (@) : znkkpsqq 10dd328b (empty) (no description set)
Working copy (@) : znkkpsqq 2b2f7cb0 (empty) (no description set)
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -285,17 +285,17 @@ fn test_git_colocated_unborn_bookmark() {
let output = work_dir.run_jj(["new"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: wqnwkozp 101e2723 (empty) (no description set)
Parent commit (@-) : znkkpsqq fc8af934 (no description set)
Working copy (@) now at: wqnwkozp 4253b9c0 (empty) (no description set)
Parent commit (@-) : znkkpsqq b8df84db (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 101e272377a9daff75358f10dbd078df922fe68c
○ fc8af9345b0830dcb14716e04cd2af26e2d19f63 git_head()
│ ○ ef75c0b0dcc9b080e00226908c21316acaa84dc6
│ ○ e3e01407bd3539722ae4ffff077700d97c60cb11 master
@ 4253b9c0f70fd5287c2af4e96b779da6066757fd
○ b8df84db65f6a75ace38ceebca6ed8be781ec754 git_head()
│ ○ 6c3d40f5a3260d762cd52a8ff6d09883c88d8db5
│ ○ 54ca78301ccd2e0da397694ab34160d539a40e86 master
├─╯
│ ○ 993600f1189571af5bbeb492cf657dc7d0fde48a
│ ○ 1d68db605e7f3722d6869beab15183f0e41fd45c
├─╯
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -320,7 +320,7 @@ fn test_git_colocated_export_bookmarks_on_snapshot() {
.run_jj(["bookmark", "create", "-r@", "foo"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ b15ef4cdd277d2c63cce6d67c1916f53a36141f7 foo
@ 82a10a4d9ef783fd68b661f40ce10dd80d599d9e foo
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -329,7 +329,7 @@ fn test_git_colocated_export_bookmarks_on_snapshot() {
// exported to Git without requiring any other changes
work_dir.write_file("file", "modified");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 4d2c49a8f8e2f1ba61f48ba79e5f4a5faa6512cf foo
@ 00fc09f48ccf5c8b025a0f93b0ec3b0e4294a598 foo
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -337,7 +337,7 @@ fn test_git_colocated_export_bookmarks_on_snapshot() {
.find_reference("refs/heads/foo")
.unwrap()
.id()
.to_string(), @"4d2c49a8f8e2f1ba61f48ba79e5f4a5faa6512cf");
.to_string(), @"00fc09f48ccf5c8b025a0f93b0ec3b0e4294a598");
}
#[test]
@@ -381,15 +381,15 @@ fn test_git_colocated_rebase_on_import() {
)
.unwrap();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 15b1d70c5e33b5d2b18383292b85324d5153ffed
○ 47fe984daf66f7bf3ebf31b9cb3513c995afb857 master git_head() add a file
@ d46583362b91d0e172aec469ea1689995540de81
○ cbd6c887108743a4abb0919305646a6a914a665e master git_head() add a file
◆ 0000000000000000000000000000000000000000
[EOF]
------- stderr -------
Abandoned 1 commits that are no longer reachable.
Rebased 1 descendant commits off of commits rewritten from git
Working copy (@) now at: zsuskuln 15b1d70c (empty) (no description set)
Parent commit (@-) : qpvuntsm 47fe984d master | add a file
Working copy (@) now at: zsuskuln d4658336 (empty) (no description set)
Parent commit (@-) : qpvuntsm cbd6c887 master | add a file
Added 0 files, modified 1 files, removed 0 files
Done importing changes from the underlying Git repo.
[EOF]
@@ -407,10 +407,10 @@ fn test_git_colocated_bookmarks() {
work_dir.run_jj(["new", "-m", "foo"]).success();
work_dir.run_jj(["new", "@-", "-m", "bar"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 3560559274ab431feea00b7b7e0b9250ecce951f bar
│ ○ 1e6f0b403ed2ff9713b5d6b1dc601e4804250cda foo
@ 95e79774f8e7c785fc36da2b798ecfe0dc864e02 bar
│ ○ b51ab2e2c88fe2d38bd7ca6946c4d87f281ce7e2 foo
├─╯
○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 git_head()
○ e8849ae12c709f2321908879bc724fdb2ab8a781 git_head()
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -422,12 +422,12 @@ fn test_git_colocated_bookmarks() {
.success();
insta::assert_snapshot!(
git_repo.find_reference("refs/heads/master").unwrap().target().id().to_string(),
@"3560559274ab431feea00b7b7e0b9250ecce951f"
@"95e79774f8e7c785fc36da2b798ecfe0dc864e02"
);
assert!(git_repo.head().unwrap().is_detached());
insta::assert_snapshot!(
git_repo.head_id().unwrap().to_string(),
@"230dd059e1b059aefc0da06a2e5a7dbf22362f22"
@"e8849ae12c709f2321908879bc724fdb2ab8a781"
);
// Update the bookmark in Git
@@ -445,16 +445,16 @@ fn test_git_colocated_bookmarks() {
)
.unwrap();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 096dc80da67094fbaa6683e2a205dddffa31f9a8
│ ○ 1e6f0b403ed2ff9713b5d6b1dc601e4804250cda master foo
@ 507c0edcfc028f714f3c7a3027cb141f6610e867
│ ○ b51ab2e2c88fe2d38bd7ca6946c4d87f281ce7e2 master foo
├─╯
○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 git_head()
○ e8849ae12c709f2321908879bc724fdb2ab8a781 git_head()
◆ 0000000000000000000000000000000000000000
[EOF]
------- stderr -------
Abandoned 1 commits that are no longer reachable.
Working copy (@) now at: yqosqzyt 096dc80d (empty) (no description set)
Parent commit (@-) : qpvuntsm 230dd059 (empty) (no description set)
Working copy (@) now at: yqosqzyt 507c0edc (empty) (no description set)
Parent commit (@-) : qpvuntsm e8849ae1 (empty) (no description set)
Done importing changes from the underlying Git repo.
[EOF]
");
@@ -473,14 +473,14 @@ fn test_git_colocated_bookmark_forget() {
.run_jj(["bookmark", "create", "-r@", "foo"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 65b6b74e08973b88d38404430f119c8c79465250 foo
○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 git_head()
@ 43444d88b0096888ebfd664c0cf792c9d15e3f14 foo
○ e8849ae12c709f2321908879bc724fdb2ab8a781 git_head()
◆ 0000000000000000000000000000000000000000
[EOF]
");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
foo: rlvkpnrz 65b6b74e (empty) (no description set)
@git: rlvkpnrz 65b6b74e (empty) (no description set)
foo: rlvkpnrz 43444d88 (empty) (no description set)
@git: rlvkpnrz 43444d88 (empty) (no description set)
[EOF]
");
@@ -517,7 +517,7 @@ fn test_git_colocated_bookmark_at_root() {
let output = work_dir.run_jj(["bookmark", "move", "foo", "--to=@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 1 bookmarks to qpvuntsm 230dd059 foo | (empty) (no description set)
Moved 1 bookmarks to qpvuntsm e8849ae1 foo | (empty) (no description set)
[EOF]
");
@@ -552,7 +552,7 @@ fn test_git_colocated_conflicting_git_refs() {
insta::with_settings!({filters => vec![("Failed to set: .*", "Failed to set: ...")]}, {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Created 1 bookmarks pointing to qpvuntsm 230dd059 main main/sub | (empty) (no description set)
Created 1 bookmarks pointing to qpvuntsm e8849ae1 main main/sub | (empty) (no description set)
Warning: Failed to export some bookmarks:
main/sub@git: Failed to set: ...
Hint: Git doesn't allow a branch name that looks like a parent directory of
@@ -597,7 +597,7 @@ fn test_git_colocated_checkout_non_empty_working_copy() {
let output = work_dir.run_jj(["describe", "-m", "new"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz acea3383 (empty) new
Working copy (@) now at: kkmpptxz 986aa548 (empty) new
Parent commit (@-) : slsumksp 97358f54 master | initial
[EOF]
");
@@ -608,8 +608,8 @@ fn test_git_colocated_checkout_non_empty_working_copy() {
);
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ acea3383e7a9e4e0df035ee0e83d04cac44a3a14 new
│ ○ a99003c2d01be21a82b33c0946c30c596e900287 two
@ 986aa548466ed43b48c059854720e70d8ec2bf71 new
│ ○ 6b0f7d59e0749d3a6ff2ecf686d5fa48023b7b93 two
├─╯
○ 97358f54806c7cd005ed5ade68a779595efbae7e master git_head() initial
◆ 0000000000000000000000000000000000000000
@@ -642,12 +642,12 @@ fn test_git_colocated_fetch_deleted_or_moved_bookmark() {
clone_dir.run_jj(["git", "init", "--git-repo=."]).success();
clone_dir.run_jj(["new", "A"]).success();
insta::assert_snapshot!(get_log_output(&clone_dir), @r"
@ 9c2de797c3c299a40173c5af724329012b77cbdd
│ ○ 4a191a9013d3f3398ccf5e172792a61439dbcf3a C_to_move original C
@ 0060713e4c7c46c4ce0d69a43ac16451582eda79
│ ○ dd905babf5b4ad4689f2da1350fd4f0ac5568209 C_to_move original C
├─╯
│ ○ c49ec4fb50844d0e693f1609da970b11878772ee B_to_delete B_to_delete
│ ○ b2ea51c027e11c0f2871cce2a52e648e194df771 B_to_delete B_to_delete
├─╯
◆ a7e4cec4256b7995129b9d1e1bda7e1df6e60678 A git_head() A
◆ 8777db25171cace71ad014598663d5ffc4fae6b1 A git_head() A
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -670,10 +670,10 @@ fn test_git_colocated_fetch_deleted_or_moved_bookmark() {
// "original C" and "B_to_delete" are abandoned, as the corresponding bookmarks
// were deleted or moved on the remote (#864)
insta::assert_snapshot!(get_log_output(&clone_dir), @r"
@ 9c2de797c3c299a40173c5af724329012b77cbdd
│ ○ 4f3d13296f978cbc351c46a43b4619c91b888475 C_to_move moved C
@ 0060713e4c7c46c4ce0d69a43ac16451582eda79
│ ○ fb297975e4ef98dc057f65b761aed2cdb0386598 C_to_move moved C
├─╯
◆ a7e4cec4256b7995129b9d1e1bda7e1df6e60678 A git_head() A
◆ 8777db25171cace71ad014598663d5ffc4fae6b1 A git_head() A
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -707,8 +707,8 @@ fn test_git_colocated_rebase_dirty_working_copy() {
insta::assert_snapshot!(output, @r"
Working copy changes:
M file
Working copy (@) : rlvkpnrz 6bad94b1 feature?? | (no description set)
Parent commit (@-): qpvuntsm 3230d522 (no description set)
Working copy (@) : rlvkpnrz e23559e3 feature?? | (no description set)
Parent commit (@-): qpvuntsm f99015d7 (no description set)
Warning: These bookmarks have conflicts:
feature
Hint: Use `jj bookmark list` to see details. Use `jj bookmark set <name> -r <rev>` to resolve.
@@ -720,8 +720,8 @@ fn test_git_colocated_rebase_dirty_working_copy() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 6bad94b10401f5fafc8a91064661224650d10d1b feature??
○ 3230d52258f6de7e9afbd10da8d64503cc7cdca5 git_head()
@ e23559e3bc6f22a5562297696fc357e2c581df77 feature??
○ f99015d7d9b82a5912ec4d96a18d2a4afbd8dd49 git_head()
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -755,9 +755,9 @@ fn test_git_colocated_external_checkout() {
// Checked out anonymous bookmark
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ f8a23336e41840ed1757ef323402a770427dc89a
○ eccedddfa5152d99fc8ddd1081b375387a8a382a git_head() B
│ ○ a7e4cec4256b7995129b9d1e1bda7e1df6e60678 master A
@ 6f8612f0e7f6d52efd8a72615796df06f8d64cdc
○ 319eaafc8fd04c763a0683a000bba5452082feb3 git_head() B
│ ○ 8777db25171cace71ad014598663d5ffc4fae6b1 master A
├─╯
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -769,9 +769,9 @@ fn test_git_colocated_external_checkout() {
// The old working-copy commit gets abandoned, but the whole bookmark should not
// be abandoned. (#1042)
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 8bb9e8d42a37c2a4e8dcfad97fce0b8f49bc7afa
○ a7e4cec4256b7995129b9d1e1bda7e1df6e60678 master git_head() A
│ ○ eccedddfa5152d99fc8ddd1081b375387a8a382a B
@ 7ceeaaae54c8ac99ad34eeed7fe1e896f535be99
○ 8777db25171cace71ad014598663d5ffc4fae6b1 master git_head() A
│ ○ 319eaafc8fd04c763a0683a000bba5452082feb3 B
├─╯
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -784,10 +784,10 @@ fn test_git_colocated_external_checkout() {
work_dir.run_jj(["new", "description(B)"]).success();
work_dir.run_jj(["new", "-m=C", "--no-edit"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
○ 99a813753d6db988d8fc436b0d6b30a54d6b2707 C
@ 81e086b7f9b1dd7fde252e28bdcf4ba4abd86ce5
○ eccedddfa5152d99fc8ddd1081b375387a8a382a git_head() B
│ ○ a7e4cec4256b7995129b9d1e1bda7e1df6e60678 master A
○ 823204bc895aad19d46b895bc510fb3e9d0c97c7 C
@ c6abf242550b7c4116d3821b69c79326889aeba0
○ 319eaafc8fd04c763a0683a000bba5452082feb3 git_head() B
│ ○ 8777db25171cace71ad014598663d5ffc4fae6b1 master A
├─╯
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -798,11 +798,11 @@ fn test_git_colocated_external_checkout() {
// The old working-copy commit shouldn't be abandoned. (#3747)
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ ca2a4e32f08688c6fb795c4c034a0a7e09c0d804
○ a7e4cec4256b7995129b9d1e1bda7e1df6e60678 master git_head() A
│ ○ 99a813753d6db988d8fc436b0d6b30a54d6b2707 C
│ ○ 81e086b7f9b1dd7fde252e28bdcf4ba4abd86ce5
│ ○ eccedddfa5152d99fc8ddd1081b375387a8a382a B
@ 277b693c61dcdea59ac26d6982370f78751f6ef5
○ 8777db25171cace71ad014598663d5ffc4fae6b1 master git_head() A
│ ○ 823204bc895aad19d46b895bc510fb3e9d0c97c7 C
│ ○ c6abf242550b7c4116d3821b69c79326889aeba0
│ ○ 319eaafc8fd04c763a0683a000bba5452082feb3 B
├─╯
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -835,25 +835,25 @@ fn test_git_colocated_concurrent_checkout() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Warning: Failed to update Git HEAD ref
Caused by: The reference "HEAD" should have content 58a6206c70b53dfc30dc2f8c9e3713034cfc323e, actual content was 363a08cf5e683485227336e24a006e0deac341bc
Working copy (@) now at: mzvwutvl 6b3bc9c8 (empty) (no description set)
Parent commit (@-) : zsuskuln 7d358222 (empty) commit3
Caused by: The reference "HEAD" should have content dc0b92dfa0af129b2929fa1789fc896b075782b2, actual content was 091e39feb0aba632ab9a9503ceb1dddeac4dd496
Working copy (@) now at: mzvwutvl cf0ddbb4 (empty) (no description set)
Parent commit (@-) : zsuskuln b6786455 (empty) commit3
[EOF]
"#);
// git_head() isn't updated because the export failed
insta::assert_snapshot!(work_dir.run_jj(["log", "--summary", "--ignore-working-copy"]), @r"
@ mzvwutvl test.user@example.com 2001-02-03 08:05:11 6b3bc9c8
@ mzvwutvl test.user@example.com 2001-02-03 08:05:11 cf0ddbb4
│ (empty) (no description set)
○ zsuskuln test.user@example.com 2001-02-03 08:05:11 7d358222
○ zsuskuln test.user@example.com 2001-02-03 08:05:11 b6786455
│ (empty) commit3
○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 git_head() 58a6206c
○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 git_head() dc0b92df
│ commit2
│ A file2
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 363a08cf
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 091e39fe
│ commit1
│ A file1
○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059
○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
◆ zzzzzzzz root() 00000000
[EOF]
@@ -861,17 +861,17 @@ fn test_git_colocated_concurrent_checkout() {
// The current Git HEAD is imported on the next jj invocation
insta::assert_snapshot!(work_dir.run_jj(["log", "--summary"]), @r"
@ yqosqzyt test.user@example.com 2001-02-03 08:05:13 690bd924
@ yqosqzyt test.user@example.com 2001-02-03 08:05:13 9529e8f5
│ (empty) (no description set)
│ ○ zsuskuln test.user@example.com 2001-02-03 08:05:11 7d358222
│ ○ zsuskuln test.user@example.com 2001-02-03 08:05:11 b6786455
│ │ (empty) commit3
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 58a6206c
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 dc0b92df
├─╯ commit2
│ A file2
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 git_head() 363a08cf
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 git_head() 091e39fe
│ commit1
│ A file1
○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059
○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
◆ zzzzzzzz root() 00000000
[EOF]
@@ -890,16 +890,16 @@ fn test_git_colocated_squash_undo() {
work_dir.run_jj(["ci", "-m=A"]).success();
// Test the setup
insta::assert_snapshot!(get_log_output_divergence(&work_dir), @r"
@ rlvkpnrzqnoo 9670380ac379
○ qpvuntsmwlqt a7e4cec4256b A git_head()
@ rlvkpnrzqnoo 682c866b0a2f
○ qpvuntsmwlqt 8777db25171c A git_head()
◆ zzzzzzzzzzzz 000000000000
[EOF]
");
work_dir.run_jj(["squash"]).success();
insta::assert_snapshot!(get_log_output_divergence(&work_dir), @r"
@ zsuskulnrvyr 6ee662324e5a
○ qpvuntsmwlqt 13ab6b96d82e A git_head()
@ zsuskulnrvyr e1c3034f23b9
○ qpvuntsmwlqt ba304e200f4f A git_head()
◆ zzzzzzzzzzzz 000000000000
[EOF]
");
@@ -907,8 +907,8 @@ fn test_git_colocated_squash_undo() {
// TODO: There should be no divergence here; 2f376ea1478c should be hidden
// (#922)
insta::assert_snapshot!(get_log_output_divergence(&work_dir), @r"
@ rlvkpnrzqnoo 9670380ac379
○ qpvuntsmwlqt a7e4cec4256b A git_head()
@ rlvkpnrzqnoo 682c866b0a2f
○ qpvuntsmwlqt 8777db25171c A git_head()
◆ zzzzzzzzzzzz 000000000000
[EOF]
");
@@ -926,10 +926,10 @@ fn test_git_colocated_undo_head_move() {
assert!(git_repo.head().unwrap().is_detached());
insta::assert_snapshot!(
git_repo.head_id().unwrap().to_string(),
@"230dd059e1b059aefc0da06a2e5a7dbf22362f22");
@"e8849ae12c709f2321908879bc724fdb2ab8a781");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 65b6b74e08973b88d38404430f119c8c79465250
○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 git_head()
@ 43444d88b0096888ebfd664c0cf792c9d15e3f14
○ e8849ae12c709f2321908879bc724fdb2ab8a781 git_head()
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -938,7 +938,7 @@ fn test_git_colocated_undo_head_move() {
work_dir.run_jj(["undo"]).success();
assert!(git_repo.head().unwrap().is_unborn());
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -947,33 +947,33 @@ fn test_git_colocated_undo_head_move() {
work_dir.run_jj(["new"]).success();
work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 69b19f73cf584f162f078fb0d91c55ca39d10bc7
○ eb08b363bb5ef8ee549314260488980d7bbe8f63 git_head()
○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ 47762194c5b3d9a9280ee7cfd2b9db16158b1b3c
○ e7d0d5fdaf96051d0dacec1e74d9413d64a15822 git_head()
○ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");
assert!(git_repo.head().unwrap().is_detached());
insta::assert_snapshot!(
git_repo.head_id().unwrap().to_string(),
@"eb08b363bb5ef8ee549314260488980d7bbe8f63");
@"e7d0d5fdaf96051d0dacec1e74d9413d64a15822");
// HEAD should be moved back
let output = work_dir.run_jj(["undo"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Undid operation: b50ec983d1c1 (2001-02-03 08:05:13) new empty commit
Working copy (@) now at: royxmykx eb08b363 (empty) (no description set)
Parent commit (@-) : qpvuntsm 230dd059 (empty) (no description set)
Undid operation: 7b91bd9df087 (2001-02-03 08:05:13) new empty commit
Working copy (@) now at: royxmykx e7d0d5fd (empty) (no description set)
Parent commit (@-) : qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
assert!(git_repo.head().unwrap().is_detached());
insta::assert_snapshot!(
git_repo.head_id().unwrap().to_string(),
@"230dd059e1b059aefc0da06a2e5a7dbf22362f22");
@"e8849ae12c709f2321908879bc724fdb2ab8a781");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ eb08b363bb5ef8ee549314260488980d7bbe8f63
○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 git_head()
@ e7d0d5fdaf96051d0dacec1e74d9413d64a15822
○ e8849ae12c709f2321908879bc724fdb2ab8a781 git_head()
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -1006,9 +1006,9 @@ fn test_git_colocated_update_index_preserves_timestamps() {
work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 051508d190ffd04fe2d79367ad8e9c3713ac2375
○ 563dbc583c0d82eb10c40d3f3276183ea28a0fa7 commit2 git_head()
○ 3c270b473dd871b20d196316eb038f078f80c219 commit1
@ a1886a45815f0dcca5cefcc334d11ffb908a1eb8
○ 8b0c962ef1fea901fb16f8a484e692a1f0dcbc59 commit2 git_head()
○ d37eac5eea00fa74a41c1512839711f42aca2c35 commit1
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -1035,8 +1035,8 @@ fn test_git_colocated_update_index_preserves_timestamps() {
work_dir.run_jj(["edit", "commit2"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 563dbc583c0d82eb10c40d3f3276183ea28a0fa7 commit2
○ 3c270b473dd871b20d196316eb038f078f80c219 commit1 git_head()
@ 8b0c962ef1fea901fb16f8a484e692a1f0dcbc59 commit2
○ d37eac5eea00fa74a41c1512839711f42aca2c35 commit1 git_head()
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -1053,10 +1053,10 @@ fn test_git_colocated_update_index_preserves_timestamps() {
work_dir.run_jj(["new", "commit1"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ ccb1b1807383dba5ff4d335fd9fb92aa540f4632
│ ○ 563dbc583c0d82eb10c40d3f3276183ea28a0fa7 commit2
@ d9c7f1932e1135856d5905f1a0fc194ce2657065
│ ○ 8b0c962ef1fea901fb16f8a484e692a1f0dcbc59 commit2
├─╯
○ 3c270b473dd871b20d196316eb038f078f80c219 commit1 git_head()
○ d37eac5eea00fa74a41c1512839711f42aca2c35 commit1 git_head()
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -1117,12 +1117,12 @@ fn test_git_colocated_update_index_merge_conflict() {
work_dir.run_jj(["new", "left", "right"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ aea7acd77752c3f74914de1fe327075a579bf7c6
@ 8b05232ad2cda6f6d06b290486e07251f53c0958
├─╮
│ ○ df62ad35fc873e89ade730fa9a407cd5cfa5e6ba right
○ │ 68cc2177623364e4f0719d6ec8da1d6ea8d6087e left git_head()
│ ○ 620e15db9fcd05fff912c52d2cafd36c9e01523c right
○ │ d0f55ffafa1e0e72980202c349af23d093f825be left git_head()
├─╯
○ 14b3ff6c73a234ab2a26fc559512e0f056a46bd9 base
○ 1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -1141,13 +1141,13 @@ fn test_git_colocated_update_index_merge_conflict() {
work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ cae33b49a8a514996983caaf171c5edbf0d70e78
× aea7acd77752c3f74914de1fe327075a579bf7c6 git_head()
@ 7c98aa1e17acd7829c9ccb9eaae705df9b255bd1
× 8b05232ad2cda6f6d06b290486e07251f53c0958 git_head()
├─╮
│ ○ df62ad35fc873e89ade730fa9a407cd5cfa5e6ba right
○ │ 68cc2177623364e4f0719d6ec8da1d6ea8d6087e left
│ ○ 620e15db9fcd05fff912c52d2cafd36c9e01523c right
○ │ d0f55ffafa1e0e72980202c349af23d093f825be left
├─╯
○ 14b3ff6c73a234ab2a26fc559512e0f056a46bd9 base
○ 1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -1195,10 +1195,10 @@ fn test_git_colocated_update_index_rebase_conflict() {
work_dir.run_jj(["edit", "left"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 68cc2177623364e4f0719d6ec8da1d6ea8d6087e left
│ ○ df62ad35fc873e89ade730fa9a407cd5cfa5e6ba right
@ d0f55ffafa1e0e72980202c349af23d093f825be left
│ ○ 620e15db9fcd05fff912c52d2cafd36c9e01523c right
├─╯
○ 14b3ff6c73a234ab2a26fc559512e0f056a46bd9 base git_head()
○ 1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base git_head()
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -1224,9 +1224,9 @@ fn test_git_colocated_update_index_rebase_conflict() {
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 233cb41e128e74aa2fcbf01c85d69b33a118faa8 left
○ df62ad35fc873e89ade730fa9a407cd5cfa5e6ba right git_head()
○ 14b3ff6c73a234ab2a26fc559512e0f056a46bd9 base
@ 535388c5aab1b3a33fdc04a4bf8033de0d1b86ec left
○ 620e15db9fcd05fff912c52d2cafd36c9e01523c right git_head()
○ 1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -1243,10 +1243,10 @@ fn test_git_colocated_update_index_rebase_conflict() {
work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 6d84b9021f9e07b69770687071c4e8e71113e688
× 233cb41e128e74aa2fcbf01c85d69b33a118faa8 left git_head()
○ df62ad35fc873e89ade730fa9a407cd5cfa5e6ba right
○ 14b3ff6c73a234ab2a26fc559512e0f056a46bd9 base
@ 04ebd7523ac6107ccdd5bc34600a073b94e43299
× 535388c5aab1b3a33fdc04a4bf8033de0d1b86ec left git_head()
○ 620e15db9fcd05fff912c52d2cafd36c9e01523c right
○ 1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -1320,14 +1320,14 @@ fn test_git_colocated_update_index_3_sided_conflict() {
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ faee07ad76218d193f2784f4988daa2ac46db30c
@ 3105daa0d68e3cdc22b2533d7d1b231cd41c76ec
├─┬─╮
│ │ ○ 86e722ea6a9da2551f1e05bc9aa914acd1cb2304 side-3
│ ○ │ b8b9ca2d8178c4ba727a61e2258603f30ac7c6d3 side-2
│ │ ○ 5008c8807feaa955d02e96cb1b0dcf51536fefb8 side-3
│ ○ │ da6e0a03f8b72f6868a9ea33836123fe965c0cb4 side-2
│ ├─╯
○ │ a4b3ce25ef4857172e7777567afd497a917a0486 side-1 git_head()
○ │ ad7eaf61b769dce99884d2ceb0ddf48fc4eac463 side-1 git_head()
├─╯
○ 14b3ff6c73a234ab2a26fc559512e0f056a46bd9 base
○ 1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -1346,15 +1346,15 @@ fn test_git_colocated_update_index_3_sided_conflict() {
work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ b0e5644063c2a12fb265e5f65cd88c6a2e1cf865
× faee07ad76218d193f2784f4988daa2ac46db30c git_head()
@ 5b4266a02e8fe9febc6294c7d0a02fc8463221e8
× 3105daa0d68e3cdc22b2533d7d1b231cd41c76ec git_head()
├─┬─╮
│ │ ○ 86e722ea6a9da2551f1e05bc9aa914acd1cb2304 side-3
│ ○ │ b8b9ca2d8178c4ba727a61e2258603f30ac7c6d3 side-2
│ │ ○ 5008c8807feaa955d02e96cb1b0dcf51536fefb8 side-3
│ ○ │ da6e0a03f8b72f6868a9ea33836123fe965c0cb4 side-2
│ ├─╯
○ │ a4b3ce25ef4857172e7777567afd497a917a0486 side-1
○ │ ad7eaf61b769dce99884d2ceb0ddf48fc4eac463 side-1
├─╯
○ 14b3ff6c73a234ab2a26fc559512e0f056a46bd9 base
○ 1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -1508,7 +1508,7 @@ fn test_git_colocated_unreachable_commits() {
.run_jj(["git", "init", "--git-repo", "."])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 9ff88424a06a94d04738847733e68e510b906345
@ f3677b3e3b95a34e7017655ab612e1d11b59c713
○ cd740e230992f334de13a0bd0b35709b3f7a89af master git_head() initial
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -1558,15 +1558,15 @@ fn test_git_colocated_operation_cleanup() {
.success();
work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ e3feb4fda7b5e1d458a460ce76cb840b8f3cae34
○ e810c2ff6f3287a27e5d08aa3f429e284d99fea0 feature git_head() 3
│ ○ 52fef888179abf5819a0a0d4f7907fcc025cb2a1 main 2
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 40638ce20b8b74e94460e95709cb077f4307ad7c
○ a50e55141dcd5f8f8d549acd2232ce4839eaa798 feature git_head() 3
│ ○ cf3bb116ded416d9b202e71303f260e504c2eeb9 main 2
├─╯
○ 61c11921948922575504d7b9f2df236543d0cec9 1
○ 87f64775047d7ce62b7ee81412b8e4cc07aea40a 1
◆ 0000000000000000000000000000000000000000
[EOF]
"#);
");
// Start a rebase in Git and expect a merge conflict.
let output = std::process::Command::new("git")
@@ -1587,39 +1587,39 @@ fn test_git_colocated_operation_cleanup() {
insta::assert_snapshot!(String::from_utf8(output.stdout).unwrap(), @r#"
UU file
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ fbb4e341d1e7e1d3b87377c075bd8a407305ba3a
○ 52fef888179abf5819a0a0d4f7907fcc025cb2a1 main git_head() 2
│ ○ e810c2ff6f3287a27e5d08aa3f429e284d99fea0 feature 3
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 588c505e689d116180684778b29c540fe7180268
○ cf3bb116ded416d9b202e71303f260e504c2eeb9 main git_head() 2
│ ○ a50e55141dcd5f8f8d549acd2232ce4839eaa798 feature 3
├─╯
○ 61c11921948922575504d7b9f2df236543d0cec9 1
○ 87f64775047d7ce62b7ee81412b8e4cc07aea40a 1
◆ 0000000000000000000000000000000000000000
[EOF]
------- stderr -------
Reset the working copy parent to the new Git HEAD.
[EOF]
"#);
");
// Reset the Git HEAD with Jujutsu.
let output = work_dir.run_jj(["new", "main"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kmkuslsw 92667528 (empty) (no description set)
Parent commit (@-) : kkmpptxz 52fef888 main | 2
Working copy (@) now at: kmkuslsw aa14563c (empty) (no description set)
Parent commit (@-) : kkmpptxz cf3bb116 main | 2
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ 926675286938f585d83b3646a95df96206968e8c
│ ○ fbb4e341d1e7e1d3b87377c075bd8a407305ba3a
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ aa14563cf5d892238f1e60260c5c284627d76e7c
│ ○ 588c505e689d116180684778b29c540fe7180268
├─╯
○ 52fef888179abf5819a0a0d4f7907fcc025cb2a1 main git_head() 2
│ ○ e810c2ff6f3287a27e5d08aa3f429e284d99fea0 feature 3
○ cf3bb116ded416d9b202e71303f260e504c2eeb9 main git_head() 2
│ ○ a50e55141dcd5f8f8d549acd2232ce4839eaa798 feature 3
├─╯
○ 61c11921948922575504d7b9f2df236543d0cec9 1
○ 87f64775047d7ce62b7ee81412b8e4cc07aea40a 1
◆ 0000000000000000000000000000000000000000
[EOF]
"#);
");
// Check that the operation was correctly aborted.
assert!(!std::fs::exists(work_dir.root().join(".git").join("rebase-merge")).unwrap());

380
cli/tests/test_git_fetch.rs
View File

@@ -544,7 +544,7 @@ fn test_git_fetch_conflicting_bookmarks() {
.run_jj(["bookmark", "create", "-r@", "rem1"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
rem1: kkmpptxz fcdbbd73 (empty) (no description set)
rem1: kkmpptxz 2b17ac71 (empty) (no description set)
[EOF]
");
@@ -554,7 +554,7 @@ fn test_git_fetch_conflicting_bookmarks() {
// This should result in a CONFLICTED bookmark
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
rem1 (conflicted):
+ kkmpptxz fcdbbd73 (empty) (no description set)
+ kkmpptxz 2b17ac71 (empty) (no description set)
+ ppspxspk 4acd0343 message
@rem1 (behind by 1 commits): ppspxspk 4acd0343 message
[EOF]
@@ -580,8 +580,8 @@ fn test_git_fetch_conflicting_bookmarks_colocated() {
.run_jj(["bookmark", "create", "-r@", "rem1"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
rem1: zsuskuln f652c321 (empty) (no description set)
@git: zsuskuln f652c321 (empty) (no description set)
rem1: zsuskuln c2934cfb (empty) (no description set)
@git: zsuskuln c2934cfb (empty) (no description set)
[EOF]
");
@@ -592,9 +592,9 @@ fn test_git_fetch_conflicting_bookmarks_colocated() {
// See https://github.com/jj-vcs/jj/pull/1146#discussion_r1112372340 for the bug this tests for.
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
rem1 (conflicted):
+ zsuskuln f652c321 (empty) (no description set)
+ zsuskuln c2934cfb (empty) (no description set)
+ ppspxspk 4acd0343 message
@git (behind by 1 commits): zsuskuln f652c321 (empty) (no description set)
@git (behind by 1 commits): zsuskuln c2934cfb (empty) (no description set)
@rem1 (behind by 1 commits): ppspxspk 4acd0343 message
[EOF]
");
@@ -651,19 +651,19 @@ fn test_git_fetch_all() {
let source_log = create_colocated_repo_and_bookmarks_from_trunk1(&source_dir);
insta::assert_snapshot!(source_log, @r#"
===== Source git repo contents =====
@ 8cc4df9dd488 "b" b
│ ○ e2a95b19b745 "a2" a2
@ bc83465a3090 "b" b
│ ○ d4d535f1d579 "a2" a2
├─╯
│ ○ dd42071fe1ad "a1" a1
│ ○ c8303692b8e2 "a1" a1
├─╯
○ 9929b494c411 "trunk1" trunk1
○ 382881770501 "trunk1" trunk1
◆ 000000000000 ""
[EOF]
"#);
// Nothing in our repo before the fetch
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
@ e8849ae12c70 ""
◆ 000000000000 ""
[EOF]
"#);
@@ -678,24 +678,24 @@ fn test_git_fetch_all() {
[EOF]
");
insta::assert_snapshot!(get_bookmark_output(&target_dir), @r"
a1: spvnozwy dd42071f a1
@origin: spvnozwy dd42071f a1
a2: qnxtrkvv e2a95b19 a2
@origin: qnxtrkvv e2a95b19 a2
b: lnxrmsmo 8cc4df9d b
@origin: lnxrmsmo 8cc4df9d b
trunk1: qzywppkx 9929b494 trunk1
@origin: qzywppkx 9929b494 trunk1
a1: mzvwutvl c8303692 a1
@origin: mzvwutvl c8303692 a1
a2: yqosqzyt d4d535f1 a2
@origin: yqosqzyt d4d535f1 a2
b: yostqsxw bc83465a b
@origin: yostqsxw bc83465a b
trunk1: kkmpptxz 38288177 trunk1
@origin: kkmpptxz 38288177 trunk1
[EOF]
");
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ 8cc4df9dd488 "b" b
│ │ ○ e2a95b19b745 "a2" a2
@ e8849ae12c70 ""
│ ○ bc83465a3090 "b" b
│ │ ○ d4d535f1d579 "a2" a2
│ ├─╯
│ │ ○ dd42071fe1ad "a1" a1
│ │ ○ c8303692b8e2 "a1" a1
│ ├─╯
│ ○ 9929b494c411 "trunk1" trunk1
│ ○ 382881770501 "trunk1" trunk1
├─╯
◆ 000000000000 ""
[EOF]
@@ -706,13 +706,13 @@ fn test_git_fetch_all() {
let source_log = create_trunk2_and_rebase_bookmarks(&source_dir);
insta::assert_snapshot!(source_log, @r#"
===== Source git repo contents =====
○ 7c277a6aa3c3 "b" b
│ ○ 698fed8731d8 "a2" a2
○ 6fc6fe17dbee "b" b
│ ○ baad96fead6c "a2" a2
├─╯
│ ○ a3f2410627ff "a1" a1
│ ○ 798c5e2435e1 "a1" a1
├─╯
@ e7525a4649e3 "trunk2" trunk2
○ 9929b494c411 "trunk1" trunk1
@ e80d998ab04b "trunk2" trunk2
○ 382881770501 "trunk1" trunk1
◆ 000000000000 ""
[EOF]
"#);
@@ -723,26 +723,26 @@ fn test_git_fetch_all() {
// Our repo before and after fetch
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ 5b3bc9c99bb3 "new_descr_for_b_to_create_conflict" b*
│ │ ○ e2a95b19b745 "a2" a2
@ e8849ae12c70 ""
│ ○ 0fbbc495357c "new_descr_for_b_to_create_conflict" b*
│ │ ○ d4d535f1d579 "a2" a2
│ ├─╯
│ │ ○ dd42071fe1ad "a1" a1
│ │ ○ c8303692b8e2 "a1" a1
│ ├─╯
│ ○ 9929b494c411 "trunk1" trunk1
│ ○ 382881770501 "trunk1" trunk1
├─╯
◆ 000000000000 ""
[EOF]
"#);
insta::assert_snapshot!(get_bookmark_output(&target_dir), @r"
a1: spvnozwy dd42071f a1
@origin: spvnozwy dd42071f a1
a2: qnxtrkvv e2a95b19 a2
@origin: qnxtrkvv e2a95b19 a2
b: lnxrmsmo 5b3bc9c9 new_descr_for_b_to_create_conflict
@origin (ahead by 1 commits, behind by 1 commits): lnxrmsmo hidden 8cc4df9d b
trunk1: qzywppkx 9929b494 trunk1
@origin: qzywppkx 9929b494 trunk1
a1: mzvwutvl c8303692 a1
@origin: mzvwutvl c8303692 a1
a2: yqosqzyt d4d535f1 a2
@origin: yqosqzyt d4d535f1 a2
b: yostqsxw 0fbbc495 new_descr_for_b_to_create_conflict
@origin (ahead by 1 commits, behind by 1 commits): yostqsxw hidden bc83465a b
trunk1: kkmpptxz 38288177 trunk1
@origin: kkmpptxz 38288177 trunk1
[EOF]
");
let output = target_dir.run_jj(["git", "fetch"]);
@@ -756,32 +756,32 @@ fn test_git_fetch_all() {
[EOF]
");
insta::assert_snapshot!(get_bookmark_output(&target_dir), @r"
a1: vrnsrlyk a3f24106 a1
@origin: vrnsrlyk a3f24106 a1
a2: vlowznwy 698fed87 a2
@origin: vlowznwy 698fed87 a2
a1: mzvwutvl 798c5e24 a1
@origin: mzvwutvl 798c5e24 a1
a2: yqosqzyt baad96fe a2
@origin: yqosqzyt baad96fe a2
b (conflicted):
- lnxrmsmo hidden 8cc4df9d b
+ lnxrmsmo 5b3bc9c9 new_descr_for_b_to_create_conflict
+ uulqyxll 7c277a6a b
@origin (behind by 1 commits): uulqyxll 7c277a6a b
trunk1: qzywppkx 9929b494 trunk1
@origin: qzywppkx 9929b494 trunk1
trunk2: lzqpwqnx e7525a46 trunk2
@origin: lzqpwqnx e7525a46 trunk2
- yostqsxw hidden bc83465a b
+ yostqsxw?? 0fbbc495 new_descr_for_b_to_create_conflict
+ yostqsxw?? 6fc6fe17 b
@origin (behind by 1 commits): yostqsxw?? 6fc6fe17 b
trunk1: kkmpptxz 38288177 trunk1
@origin: kkmpptxz 38288177 trunk1
trunk2: uyznsvlq e80d998a trunk2
@origin: uyznsvlq e80d998a trunk2
[EOF]
");
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ 7c277a6aa3c3 "b" b?? b@origin
│ │ ○ 698fed8731d8 "a2" a2
@ e8849ae12c70 ""
│ ○ 6fc6fe17dbee "b" b?? b@origin
│ │ ○ baad96fead6c "a2" a2
│ ├─╯
│ │ ○ a3f2410627ff "a1" a1
│ │ ○ 798c5e2435e1 "a1" a1
│ ├─╯
│ ○ e7525a4649e3 "trunk2" trunk2
│ │ ○ 5b3bc9c99bb3 "new_descr_for_b_to_create_conflict" b??
│ ○ e80d998ab04b "trunk2" trunk2
│ │ ○ 0fbbc495357c "new_descr_for_b_to_create_conflict" b??
│ ├─╯
│ ○ 9929b494c411 "trunk1" trunk1
│ ○ 382881770501 "trunk1" trunk1
├─╯
◆ 000000000000 ""
[EOF]
@@ -809,12 +809,12 @@ fn test_git_fetch_some_of_many_bookmarks() {
let source_log = create_colocated_repo_and_bookmarks_from_trunk1(&source_dir);
insta::assert_snapshot!(source_log, @r#"
===== Source git repo contents =====
@ 8cc4df9dd488 "b" b
│ ○ e2a95b19b745 "a2" a2
@ bc83465a3090 "b" b
│ ○ d4d535f1d579 "a2" a2
├─╯
│ ○ dd42071fe1ad "a1" a1
│ ○ c8303692b8e2 "a1" a1
├─╯
○ 9929b494c411 "trunk1" trunk1
○ 382881770501 "trunk1" trunk1
◆ 000000000000 ""
[EOF]
"#);
@@ -838,7 +838,7 @@ fn test_git_fetch_some_of_many_bookmarks() {
// Nothing in our repo before the fetch
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
@ e8849ae12c70 ""
◆ 000000000000 ""
[EOF]
"#);
@@ -850,17 +850,17 @@ fn test_git_fetch_some_of_many_bookmarks() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ 8cc4df9dd488 "b" b
│ ○ 9929b494c411 "trunk1"
@ e8849ae12c70 ""
│ ○ bc83465a3090 "b" b
│ ○ 382881770501 "trunk1"
├─╯
◆ 000000000000 ""
[EOF]
"#);
// ...check what the intermediate state looks like...
insta::assert_snapshot!(get_bookmark_output(&target_dir), @r"
b: lnxrmsmo 8cc4df9d b
@origin: lnxrmsmo 8cc4df9d b
b: yostqsxw bc83465a b
@origin: yostqsxw bc83465a b
[EOF]
");
// ...then fetch two others with a glob.
@@ -872,13 +872,13 @@ fn test_git_fetch_some_of_many_bookmarks() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ e2a95b19b745 "a2" a2
│ │ ○ dd42071fe1ad "a1" a1
@ e8849ae12c70 ""
│ ○ d4d535f1d579 "a2" a2
│ │ ○ c8303692b8e2 "a1" a1
│ ├─╯
│ │ ○ 8cc4df9dd488 "b" b
│ │ ○ bc83465a3090 "b" b
│ ├─╯
│ ○ 9929b494c411 "trunk1"
│ ○ 382881770501 "trunk1"
├─╯
◆ 000000000000 ""
[EOF]
@@ -891,13 +891,13 @@ fn test_git_fetch_some_of_many_bookmarks() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ e2a95b19b745 "a2" a2
│ │ ○ dd42071fe1ad "a1" a1
@ e8849ae12c70 ""
│ ○ d4d535f1d579 "a2" a2
│ │ ○ c8303692b8e2 "a1" a1
│ ├─╯
│ │ ○ 8cc4df9dd488 "b" b
│ │ ○ bc83465a3090 "b" b
│ ├─╯
│ ○ 9929b494c411 "trunk1"
│ ○ 382881770501 "trunk1"
├─╯
◆ 000000000000 ""
[EOF]
@@ -908,13 +908,13 @@ fn test_git_fetch_some_of_many_bookmarks() {
let source_log = create_trunk2_and_rebase_bookmarks(&source_dir);
insta::assert_snapshot!(source_log, @r#"
===== Source git repo contents =====
○ 96c8ad25ad36 "b" b
│ ○ 9ccd9f75fc0c "a2" a2
○ 2b30dbc93959 "b" b
│ ○ 841140b152fc "a2" a2
├─╯
│ ○ 527d2e46a87f "a1" a1
│ ○ bc7e74c21d43 "a1" a1
├─╯
@ 2f34a0e70741 "trunk2" trunk2
○ 9929b494c411 "trunk1" trunk1
@ 756be1d31c41 "trunk2" trunk2
○ 382881770501 "trunk1" trunk1
◆ 000000000000 ""
[EOF]
"#);
@@ -925,13 +925,13 @@ fn test_git_fetch_some_of_many_bookmarks() {
// Our repo before and after fetch of two bookmarks
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ e9445259b932 "new_descr_for_b_to_create_conflict" b*
│ │ ○ e2a95b19b745 "a2" a2
@ e8849ae12c70 ""
│ ○ c62db3119722 "new_descr_for_b_to_create_conflict" b*
│ │ ○ d4d535f1d579 "a2" a2
│ ├─╯
│ │ ○ dd42071fe1ad "a1" a1
│ │ ○ c8303692b8e2 "a1" a1
│ ├─╯
│ ○ 9929b494c411 "trunk1"
│ ○ 382881770501 "trunk1"
├─╯
◆ 000000000000 ""
[EOF]
@@ -945,16 +945,16 @@ fn test_git_fetch_some_of_many_bookmarks() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ 96c8ad25ad36 "b" b?? b@origin
│ │ ○ 527d2e46a87f "a1" a1
@ e8849ae12c70 ""
│ ○ 2b30dbc93959 "b" b?? b@origin
│ │ ○ bc7e74c21d43 "a1" a1
│ ├─╯
│ ○ 2f34a0e70741 "trunk2"
│ │ ○ e9445259b932 "new_descr_for_b_to_create_conflict" b??
│ ○ 756be1d31c41 "trunk2"
│ │ ○ c62db3119722 "new_descr_for_b_to_create_conflict" b??
│ ├─╯
│ │ ○ e2a95b19b745 "a2" a2
│ │ ○ d4d535f1d579 "a2" a2
│ ├─╯
│ ○ 9929b494c411 "trunk1"
│ ○ 382881770501 "trunk1"
├─╯
◆ 000000000000 ""
[EOF]
@@ -962,15 +962,15 @@ fn test_git_fetch_some_of_many_bookmarks() {
// We left a2 where it was before, let's see how `jj bookmark list` sees this.
insta::assert_snapshot!(get_bookmark_output(&target_dir), @r"
a1: qptloxlm 527d2e46 a1
@origin: qptloxlm 527d2e46 a1
a2: qnxtrkvv e2a95b19 a2
@origin: qnxtrkvv e2a95b19 a2
a1: mzvwutvl bc7e74c2 a1
@origin: mzvwutvl bc7e74c2 a1
a2: yqosqzyt d4d535f1 a2
@origin: yqosqzyt d4d535f1 a2
b (conflicted):
- lnxrmsmo hidden 8cc4df9d b
+ lnxrmsmo e9445259 new_descr_for_b_to_create_conflict
+ rruvkzpm 96c8ad25 b
@origin (behind by 1 commits): rruvkzpm 96c8ad25 b
- yostqsxw hidden bc83465a b
+ yostqsxw?? c62db311 new_descr_for_b_to_create_conflict
+ yostqsxw?? 2b30dbc9 b
@origin (behind by 1 commits): yostqsxw?? 2b30dbc9 b
[EOF]
");
// Now, let's fetch a2 and double-check that fetching a1 and b again doesn't do
@@ -983,30 +983,30 @@ fn test_git_fetch_some_of_many_bookmarks() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ 9ccd9f75fc0c "a2" a2
│ │ ○ 96c8ad25ad36 "b" b?? b@origin
@ e8849ae12c70 ""
│ ○ 841140b152fc "a2" a2
│ │ ○ 2b30dbc93959 "b" b?? b@origin
│ ├─╯
│ │ ○ 527d2e46a87f "a1" a1
│ │ ○ bc7e74c21d43 "a1" a1
│ ├─╯
│ ○ 2f34a0e70741 "trunk2"
│ │ ○ e9445259b932 "new_descr_for_b_to_create_conflict" b??
│ ○ 756be1d31c41 "trunk2"
│ │ ○ c62db3119722 "new_descr_for_b_to_create_conflict" b??
│ ├─╯
│ ○ 9929b494c411 "trunk1"
│ ○ 382881770501 "trunk1"
├─╯
◆ 000000000000 ""
[EOF]
"#);
insta::assert_snapshot!(get_bookmark_output(&target_dir), @r"
a1: qptloxlm 527d2e46 a1
@origin: qptloxlm 527d2e46 a1
a2: ltuqxttq 9ccd9f75 a2
@origin: ltuqxttq 9ccd9f75 a2
a1: mzvwutvl bc7e74c2 a1
@origin: mzvwutvl bc7e74c2 a1
a2: yqosqzyt 841140b1 a2
@origin: yqosqzyt 841140b1 a2
b (conflicted):
- lnxrmsmo hidden 8cc4df9d b
+ lnxrmsmo e9445259 new_descr_for_b_to_create_conflict
+ rruvkzpm 96c8ad25 b
@origin (behind by 1 commits): rruvkzpm 96c8ad25 b
- yostqsxw hidden bc83465a b
+ yostqsxw?? c62db311 new_descr_for_b_to_create_conflict
+ yostqsxw?? 2b30dbc9 b
@origin (behind by 1 commits): yostqsxw?? 2b30dbc9 b
[EOF]
");
}
@@ -1155,12 +1155,12 @@ fn test_git_fetch_undo() {
let source_log = create_colocated_repo_and_bookmarks_from_trunk1(&source_dir);
insta::assert_snapshot!(source_log, @r#"
===== Source git repo contents =====
@ 8cc4df9dd488 "b" b
│ ○ e2a95b19b745 "a2" a2
@ bc83465a3090 "b" b
│ ○ d4d535f1d579 "a2" a2
├─╯
│ ○ dd42071fe1ad "a1" a1
│ ○ c8303692b8e2 "a1" a1
├─╯
○ 9929b494c411 "trunk1" trunk1
○ 382881770501 "trunk1" trunk1
◆ 000000000000 ""
[EOF]
"#);
@@ -1174,11 +1174,11 @@ fn test_git_fetch_undo() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ 8cc4df9dd488 "b" b
│ │ ○ dd42071fe1ad "a1" a1
@ e8849ae12c70 ""
│ ○ bc83465a3090 "b" b
│ │ ○ c8303692b8e2 "a1" a1
│ ├─╯
│ ○ 9929b494c411 "trunk1"
│ ○ 382881770501 "trunk1"
├─╯
◆ 000000000000 ""
[EOF]
@@ -1186,12 +1186,12 @@ fn test_git_fetch_undo() {
let output = target_dir.run_jj(["undo"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Undid operation: 4bd67fb242bc (2001-02-03 08:05:18) fetch from git remote(s) origin
Undid operation: e99f84378887 (2001-02-03 08:05:18) fetch from git remote(s) origin
[EOF]
");
// The undo works as expected
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
@ e8849ae12c70 ""
◆ 000000000000 ""
[EOF]
"#);
@@ -1203,9 +1203,9 @@ fn test_git_fetch_undo() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ 8cc4df9dd488 "b" b
│ ○ 9929b494c411 "trunk1"
@ e8849ae12c70 ""
│ ○ bc83465a3090 "b" b
│ ○ 382881770501 "trunk1"
├─╯
◆ 000000000000 ""
[EOF]
@@ -1234,12 +1234,12 @@ fn test_fetch_undo_what() {
let source_log = create_colocated_repo_and_bookmarks_from_trunk1(&source_dir);
insta::assert_snapshot!(source_log, @r#"
===== Source git repo contents =====
@ 8cc4df9dd488 "b" b
│ ○ e2a95b19b745 "a2" a2
@ bc83465a3090 "b" b
│ ○ d4d535f1d579 "a2" a2
├─╯
│ ○ dd42071fe1ad "a1" a1
│ ○ c8303692b8e2 "a1" a1
├─╯
○ 9929b494c411 "trunk1" trunk1
○ 382881770501 "trunk1" trunk1
◆ 000000000000 ""
[EOF]
"#);
@@ -1257,16 +1257,16 @@ fn test_fetch_undo_what() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ 230dd059e1b0 ""
│ ○ 8cc4df9dd488 "b" b
│ ○ 9929b494c411 "trunk1"
@ e8849ae12c70 ""
│ ○ bc83465a3090 "b" b
│ ○ 382881770501 "trunk1"
├─╯
◆ 000000000000 ""
[EOF]
"#);
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
b: lnxrmsmo 8cc4df9d b
@origin: lnxrmsmo 8cc4df9d b
b: yostqsxw bc83465a b
@origin: yostqsxw bc83465a b
[EOF]
");
@@ -1275,12 +1275,12 @@ fn test_fetch_undo_what() {
let output = work_dir.run_jj(["op", "restore", "--what", "repo", &base_operation_id]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Restored to operation: eac759b9ab75 (2001-02-03 08:05:07) add workspace 'default'
Restored to operation: 2affa7025254 (2001-02-03 08:05:07) add workspace 'default'
[EOF]
");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
b (deleted)
@origin: lnxrmsmo hidden 8cc4df9d b
@origin: yostqsxw hidden bc83465a b
[EOF]
");
@@ -1291,8 +1291,8 @@ fn test_fetch_undo_what() {
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
b (deleted)
@origin: lnxrmsmo hidden 8cc4df9d b
newbookmark: qpvuntsm 230dd059 (empty) (no description set)
@origin: yostqsxw hidden bc83465a b
newbookmark: qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
// Restoring just the remote-tracking state will not affect `newbookmark`, but
@@ -1306,11 +1306,11 @@ fn test_fetch_undo_what() {
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Restored to operation: eac759b9ab75 (2001-02-03 08:05:07) add workspace 'default'
Restored to operation: 2affa7025254 (2001-02-03 08:05:07) add workspace 'default'
[EOF]
");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
newbookmark: qpvuntsm 230dd059 (empty) (no description set)
newbookmark: qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
}
@@ -1327,14 +1327,14 @@ fn test_git_fetch_remove_fetch() {
.run_jj(["bookmark", "create", "-r@", "origin"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
origin: qpvuntsm 230dd059 (empty) (no description set)
origin: qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
work_dir.run_jj(["git", "fetch"]).success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
origin (conflicted):
+ qpvuntsm 230dd059 (empty) (no description set)
+ qpvuntsm e8849ae1 (empty) (no description set)
+ qmyrypzk ab8b299e message
@origin (behind by 1 commits): qmyrypzk ab8b299e message
[EOF]
@@ -1345,7 +1345,7 @@ fn test_git_fetch_remove_fetch() {
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
origin (conflicted):
+ qpvuntsm 230dd059 (empty) (no description set)
+ qpvuntsm e8849ae1 (empty) (no description set)
+ qmyrypzk ab8b299e message
[EOF]
");
@@ -1363,7 +1363,7 @@ fn test_git_fetch_remove_fetch() {
");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
origin (conflicted):
+ qpvuntsm 230dd059 (empty) (no description set)
+ qpvuntsm e8849ae1 (empty) (no description set)
+ qmyrypzk ab8b299e message
@origin (behind by 1 commits): qmyrypzk ab8b299e message
[EOF]
@@ -1382,14 +1382,14 @@ fn test_git_fetch_rename_fetch() {
.run_jj(["bookmark", "create", "-r@", "origin"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
origin: qpvuntsm 230dd059 (empty) (no description set)
origin: qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
work_dir.run_jj(["git", "fetch"]).success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
origin (conflicted):
+ qpvuntsm 230dd059 (empty) (no description set)
+ qpvuntsm e8849ae1 (empty) (no description set)
+ qmyrypzk ab8b299e message
@origin (behind by 1 commits): qmyrypzk ab8b299e message
[EOF]
@@ -1400,7 +1400,7 @@ fn test_git_fetch_rename_fetch() {
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
origin (conflicted):
+ qpvuntsm 230dd059 (empty) (no description set)
+ qpvuntsm e8849ae1 (empty) (no description set)
+ qmyrypzk ab8b299e message
@upstream (behind by 1 commits): qmyrypzk ab8b299e message
[EOF]
@@ -1435,12 +1435,12 @@ fn test_git_fetch_removed_bookmark() {
let source_log = create_colocated_repo_and_bookmarks_from_trunk1(&source_dir);
insta::assert_snapshot!(source_log, @r#"
===== Source git repo contents =====
@ 8cc4df9dd488 "b" b
│ ○ e2a95b19b745 "a2" a2
@ bc83465a3090 "b" b
│ ○ d4d535f1d579 "a2" a2
├─╯
│ ○ dd42071fe1ad "a1" a1
│ ○ c8303692b8e2 "a1" a1
├─╯
○ 9929b494c411 "trunk1" trunk1
○ 382881770501 "trunk1" trunk1
◆ 000000000000 ""
[EOF]
"#);
@@ -1456,13 +1456,13 @@ fn test_git_fetch_removed_bookmark() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ 8cc4df9dd488 "b" b
│ │ ○ e2a95b19b745 "a2" a2
@ e8849ae12c70 ""
│ ○ bc83465a3090 "b" b
│ │ ○ d4d535f1d579 "a2" a2
│ ├─╯
│ │ ○ dd42071fe1ad "a1" a1
│ │ ○ c8303692b8e2 "a1" a1
│ ├─╯
│ ○ 9929b494c411 "trunk1" trunk1
│ ○ 382881770501 "trunk1" trunk1
├─╯
◆ 000000000000 ""
[EOF]
@@ -1481,13 +1481,13 @@ fn test_git_fetch_removed_bookmark() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ 8cc4df9dd488 "b" b
│ │ ○ e2a95b19b745 "a2" a2
@ e8849ae12c70 ""
│ ○ bc83465a3090 "b" b
│ │ ○ d4d535f1d579 "a2" a2
│ ├─╯
│ │ ○ dd42071fe1ad "a1" a1
│ │ ○ c8303692b8e2 "a1" a1
│ ├─╯
│ ○ 9929b494c411 "trunk1" trunk1
│ ○ 382881770501 "trunk1" trunk1
├─╯
◆ 000000000000 ""
[EOF]
@@ -1502,11 +1502,11 @@ fn test_git_fetch_removed_bookmark() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ 8cc4df9dd488 "b" b
│ │ ○ dd42071fe1ad "a1" a1
@ e8849ae12c70 ""
│ ○ bc83465a3090 "b" b
│ │ ○ c8303692b8e2 "a1" a1
│ ├─╯
│ ○ 9929b494c411 "trunk1" trunk1
│ ○ 382881770501 "trunk1" trunk1
├─╯
◆ 000000000000 ""
[EOF]
@@ -1533,12 +1533,12 @@ fn test_git_fetch_removed_parent_bookmark() {
let source_log = create_colocated_repo_and_bookmarks_from_trunk1(&source_dir);
insta::assert_snapshot!(source_log, @r#"
===== Source git repo contents =====
@ 8cc4df9dd488 "b" b
│ ○ e2a95b19b745 "a2" a2
@ bc83465a3090 "b" b
│ ○ d4d535f1d579 "a2" a2
├─╯
│ ○ dd42071fe1ad "a1" a1
│ ○ c8303692b8e2 "a1" a1
├─╯
○ 9929b494c411 "trunk1" trunk1
○ 382881770501 "trunk1" trunk1
◆ 000000000000 ""
[EOF]
"#);
@@ -1554,13 +1554,13 @@ fn test_git_fetch_removed_parent_bookmark() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ 8cc4df9dd488 "b" b
│ │ ○ e2a95b19b745 "a2" a2
@ e8849ae12c70 ""
│ ○ bc83465a3090 "b" b
│ │ ○ d4d535f1d579 "a2" a2
│ ├─╯
│ │ ○ dd42071fe1ad "a1" a1
│ │ ○ c8303692b8e2 "a1" a1
│ ├─╯
│ ○ 9929b494c411 "trunk1" trunk1
│ ○ 382881770501 "trunk1" trunk1
├─╯
◆ 000000000000 ""
[EOF]
@@ -1586,11 +1586,11 @@ fn test_git_fetch_removed_parent_bookmark() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&target_dir), @r#"
@ 230dd059e1b0 ""
│ ○ 8cc4df9dd488 "b" b
│ │ ○ e2a95b19b745 "a2" a2
@ e8849ae12c70 ""
│ ○ bc83465a3090 "b" b
│ │ ○ d4d535f1d579 "a2" a2
│ ├─╯
│ ○ 9929b494c411 "trunk1"
│ ○ 382881770501 "trunk1"
├─╯
◆ 000000000000 ""
[EOF]
@@ -1645,7 +1645,7 @@ fn test_git_fetch_remote_only_bookmark() {
.run_jj(["git", "fetch", "--remote=origin"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ 230dd059e1b0 ""
@ e8849ae12c70 ""
│ ◆ ebeb70d8c5f9 "message" feature1 feature2@origin
├─╯
◆ 000000000000 ""
@@ -1682,7 +1682,7 @@ fn test_git_fetch_preserve_commits_across_repos() {
.run_jj(["git", "fetch", "--remote=fork", "--remote=upstream"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ 230dd059e1b0 ""
@ e8849ae12c70 ""
│ ○ bcd7cd779791 "message" upstream
├─╯
│ ○ 16ec9ef2877a "message" feature
@@ -1739,7 +1739,7 @@ fn test_git_fetch_preserve_commits_across_repos() {
.run_jj(["git", "fetch", "--remote=fork", "--remote=upstream"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ 230dd059e1b0 ""
@ e8849ae12c70 ""
│ ○ f3e9250bd003 "merge" upstream*
│ ├─╮
│ │ ○ 16ec9ef2877a "message"

50
cli/tests/test_git_import_export.rs
View File

@@ -40,8 +40,8 @@ fn test_resolution_of_git_tracking_bookmarks() {
.run_jj(["describe", "-r", "main", "-m", "new_message"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm b61d21b6 (empty) new_message
@git (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 03757d22 (empty) old_message
main: qpvuntsm 384a1421 (empty) new_message
@git (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden a7f9930b (empty) old_message
[EOF]
");
@@ -51,11 +51,11 @@ fn test_resolution_of_git_tracking_bookmarks() {
work_dir.run_jj(["log", "-r", expr, "-T", template, "--no-graph"])
};
insta::assert_snapshot!(query("main"), @r"
b61d21b660c17a7191f3f73873bfe7d3f7938628 new_message
384a14213707d776d0517f65cdcf954d07d88c40 new_message
[EOF]
");
insta::assert_snapshot!(query("main@git"), @r"
03757d2212d89990ec158e97795b612a38446652 old_message
a7f9930bb6d54ba39e6c254135b9bfe32041fea4 old_message
[EOF]
");
// Can't be selected by remote_bookmarks()
@@ -99,13 +99,13 @@ fn test_git_export_undo() {
.run_jj(["bookmark", "create", "-r@", "a"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
a: qpvuntsm 230dd059 (empty) (no description set)
a: qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
let output = work_dir.run_jj(["git", "export"]);
insta::assert_snapshot!(output, @"");
insta::assert_snapshot!(work_dir.run_jj(["log", "-ra@git"]), @r"
@ qpvuntsm test.user@example.com 2001-02-03 08:05:07 a 230dd059
@ qpvuntsm test.user@example.com 2001-02-03 08:05:07 a e8849ae1
│ (empty) (no description set)
~
[EOF]
@@ -116,7 +116,7 @@ fn test_git_export_undo() {
let output = work_dir.run_jj(["op", "undo"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Undid operation: edb40232c741 (2001-02-03 08:05:10) export git refs
Undid operation: 5892a7e5aee4 (2001-02-03 08:05:10) export git refs
[EOF]
");
insta::assert_debug_snapshot!(get_git_repo_refs(&git_repo), @r#"
@@ -124,7 +124,7 @@ fn test_git_export_undo() {
(
"refs/heads/a",
CommitId(
"230dd059e1b059aefc0da06a2e5a7dbf22362f22",
"e8849ae12c709f2321908879bc724fdb2ab8a781",
),
),
]
@@ -141,7 +141,7 @@ fn test_git_export_undo() {
let output = work_dir.run_jj(["git", "export"]);
insta::assert_snapshot!(output, @"");
insta::assert_snapshot!(work_dir.run_jj(["log", "-ra@git"]), @r"
@ qpvuntsm test.user@example.com 2001-02-03 08:05:07 a 230dd059
@ qpvuntsm test.user@example.com 2001-02-03 08:05:07 a e8849ae1
│ (empty) (no description set)
~
[EOF]
@@ -182,8 +182,8 @@ fn test_git_import_undo() {
[EOF]
");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
a: qpvuntsm 230dd059 (empty) (no description set)
@git: qpvuntsm 230dd059 (empty) (no description set)
a: qpvuntsm e8849ae1 (empty) (no description set)
@git: qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
@@ -191,7 +191,7 @@ fn test_git_import_undo() {
let output = work_dir.run_jj(["op", "restore", &base_operation_id]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Restored to operation: eac759b9ab75 (2001-02-03 08:05:07) add workspace 'default'
Restored to operation: 2affa7025254 (2001-02-03 08:05:07) add workspace 'default'
[EOF]
");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @"");
@@ -203,8 +203,8 @@ fn test_git_import_undo() {
[EOF]
");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
a: qpvuntsm 230dd059 (empty) (no description set)
@git: qpvuntsm 230dd059 (empty) (no description set)
a: qpvuntsm e8849ae1 (empty) (no description set)
@git: qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
}
@@ -244,8 +244,8 @@ fn test_git_import_move_export_with_default_undo() {
[EOF]
");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
a: qpvuntsm 230dd059 (empty) (no description set)
@git: qpvuntsm 230dd059 (empty) (no description set)
a: qpvuntsm e8849ae1 (empty) (no description set)
@git: qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
@@ -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 096dc80d (empty) (no description set)
@git (behind by 1 commits): qpvuntsm 230dd059 (empty) (no description set)
a: yqosqzyt 507c0edc (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 096dc80d (empty) (no description set)
@git: yqosqzyt 096dc80d (empty) (no description set)
a: yqosqzyt 507c0edc (empty) (no description set)
@git: yqosqzyt 507c0edc (empty) (no description set)
[EOF]
");
@@ -273,8 +273,8 @@ fn test_git_import_move_export_with_default_undo() {
let output = work_dir.run_jj(["op", "restore", &base_operation_id]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Restored to operation: eac759b9ab75 (2001-02-03 08:05:07) add workspace 'default'
Working copy (@) now at: qpvuntsm 230dd059 (empty) (no description set)
Restored to operation: 2affa7025254 (2001-02-03 08:05:07) add workspace 'default'
Working copy (@) now at: qpvuntsm e8849ae1 (empty) (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -284,7 +284,7 @@ fn test_git_import_move_export_with_default_undo() {
(
"refs/heads/a",
CommitId(
"096dc80da67094fbaa6683e2a205dddffa31f9a8",
"507c0edcfc028f714f3c7a3027cb141f6610e867",
),
),
]
@@ -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 096dc80d (empty) (no description set)
@git: yqosqzyt 096dc80d (empty) (no description set)
a: yqosqzyt 507c0edc (empty) (no description set)
@git: yqosqzyt 507c0edc (empty) (no description set)
[EOF]
");
}

74
cli/tests/test_git_init.rs
View File

@@ -137,7 +137,7 @@ fn test_git_init_external(bare: bool) {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Done importing changes from the underlying Git repo.
Working copy (@) now at: sqpuoqvx 0bd37cef (empty) (no description set)
Working copy (@) now at: sqpuoqvx ed6b5138 (empty) (no description set)
Parent commit (@-) : nntyzxmz e80a42cc my-bookmark | My commit message
Added 1 files, modified 0 files, removed 0 files
Initialized repo in "repo"
@@ -164,7 +164,7 @@ fn test_git_init_external(bare: bool) {
// Check that the Git repo's HEAD got checked out
insta::allow_duplicates! {
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 0bd37cef2051
@ ed6b513890ae
○ e80a42cccd06 my-bookmark git_head() My commit message
◆ 000000000000
[EOF]
@@ -215,7 +215,7 @@ fn test_git_init_external_import_trunk(bare: bool) {
------- stderr -------
Done importing changes from the underlying Git repo.
Setting the revset alias `trunk()` to `trunk@origin`
Working copy (@) now at: sqpuoqvx 0bd37cef (empty) (no description set)
Working copy (@) now at: sqpuoqvx ed6b5138 (empty) (no description set)
Parent commit (@-) : nntyzxmz e80a42cc my-bookmark trunk@origin | My commit message
Added 1 files, modified 0 files, removed 0 files
Initialized repo in "repo"
@@ -340,7 +340,7 @@ fn test_git_init_colocated_via_git_repo_path() {
// Check that the Git repo's HEAD got checked out
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 5f169ecc57b8
@ f3fe58bc88cc
○ e80a42cccd06 my-bookmark git_head() My commit message
◆ 000000000000
[EOF]
@@ -349,8 +349,8 @@ fn test_git_init_colocated_via_git_repo_path() {
// Check that the Git repo's HEAD moves
work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 62eda98b5eb4
○ 5f169ecc57b8 git_head()
@ 0c77f9e21b55
○ f3fe58bc88cc git_head()
○ e80a42cccd06 my-bookmark My commit message
◆ 000000000000
[EOF]
@@ -378,7 +378,7 @@ fn test_git_init_colocated_via_git_repo_path_gitlink() {
// Check that the Git repo's HEAD got checked out
insta::assert_snapshot!(get_log_output(&jj_work_dir), @r"
@ 5f169ecc57b8
@ f3fe58bc88cc
○ e80a42cccd06 my-bookmark git_head() My commit message
◆ 000000000000
[EOF]
@@ -387,8 +387,8 @@ fn test_git_init_colocated_via_git_repo_path_gitlink() {
// Check that the Git repo's HEAD moves
jj_work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&jj_work_dir), @r"
@ 62eda98b5eb4
○ 5f169ecc57b8 git_head()
@ 0c77f9e21b55
○ f3fe58bc88cc git_head()
○ e80a42cccd06 my-bookmark My commit message
◆ 000000000000
[EOF]
@@ -416,7 +416,7 @@ fn test_git_init_colocated_via_git_repo_path_symlink_directory() {
// Check that the Git repo's HEAD got checked out
insta::assert_snapshot!(get_log_output(&jj_work_dir), @r"
@ 5f169ecc57b8
@ f3fe58bc88cc
○ e80a42cccd06 my-bookmark git_head() My commit message
◆ 000000000000
[EOF]
@@ -425,8 +425,8 @@ fn test_git_init_colocated_via_git_repo_path_symlink_directory() {
// Check that the Git repo's HEAD moves
jj_work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&jj_work_dir), @r"
@ 62eda98b5eb4
○ 5f169ecc57b8 git_head()
@ 0c77f9e21b55
○ f3fe58bc88cc git_head()
○ e80a42cccd06 my-bookmark My commit message
◆ 000000000000
[EOF]
@@ -458,7 +458,7 @@ fn test_git_init_colocated_via_git_repo_path_symlink_directory_without_bare_conf
// Check that the Git repo's HEAD got checked out
insta::assert_snapshot!(get_log_output(&jj_work_dir), @r"
@ 5f169ecc57b8
@ f3fe58bc88cc
○ e80a42cccd06 my-bookmark git_head() My commit message
◆ 000000000000
[EOF]
@@ -467,8 +467,8 @@ fn test_git_init_colocated_via_git_repo_path_symlink_directory_without_bare_conf
// Check that the Git repo's HEAD moves
jj_work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&jj_work_dir), @r"
@ 62eda98b5eb4
○ 5f169ecc57b8 git_head()
@ 0c77f9e21b55
○ f3fe58bc88cc git_head()
○ e80a42cccd06 my-bookmark My commit message
◆ 000000000000
[EOF]
@@ -503,7 +503,7 @@ fn test_git_init_colocated_via_git_repo_path_symlink_gitlink() {
// Check that the Git repo's HEAD got checked out
insta::assert_snapshot!(get_log_output(&jj_work_dir), @r"
@ 5f169ecc57b8
@ f3fe58bc88cc
○ e80a42cccd06 my-bookmark git_head() My commit message
◆ 000000000000
[EOF]
@@ -512,8 +512,8 @@ fn test_git_init_colocated_via_git_repo_path_symlink_gitlink() {
// Check that the Git repo's HEAD moves
jj_work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&jj_work_dir), @r"
@ 62eda98b5eb4
○ 5f169ecc57b8 git_head()
@ 0c77f9e21b55
○ f3fe58bc88cc git_head()
○ e80a42cccd06 my-bookmark My commit message
◆ 000000000000
[EOF]
@@ -563,12 +563,12 @@ fn test_git_init_colocated_via_git_repo_path_imported_refs() {
[EOF]
"#);
insta::assert_snapshot!(get_bookmark_output(&local_dir), @r"
local-remote: vvkvtnvv 230dd059 (empty) (no description set)
@git: vvkvtnvv 230dd059 (empty) (no description set)
@origin: vvkvtnvv 230dd059 (empty) (no description set)
remote-only: vvkvtnvv 230dd059 (empty) (no description set)
@git: vvkvtnvv 230dd059 (empty) (no description set)
@origin: vvkvtnvv 230dd059 (empty) (no description set)
local-remote: qpvuntsm e8849ae1 (empty) (no description set)
@git: qpvuntsm e8849ae1 (empty) (no description set)
@origin: qpvuntsm e8849ae1 (empty) (no description set)
remote-only: qpvuntsm e8849ae1 (empty) (no description set)
@git: qpvuntsm e8849ae1 (empty) (no description set)
@origin: qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
@@ -587,10 +587,10 @@ fn test_git_init_colocated_via_git_repo_path_imported_refs() {
[EOF]
"#);
insta::assert_snapshot!(get_bookmark_output(&local_dir), @r"
local-remote: vvkvtnvv 230dd059 (empty) (no description set)
@git: vvkvtnvv 230dd059 (empty) (no description set)
local-remote@origin: vvkvtnvv 230dd059 (empty) (no description set)
remote-only@origin: vvkvtnvv 230dd059 (empty) (no description set)
local-remote: qpvuntsm e8849ae1 (empty) (no description set)
@git: qpvuntsm e8849ae1 (empty) (no description set)
local-remote@origin: qpvuntsm e8849ae1 (empty) (no description set)
remote-only@origin: qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
}
@@ -642,7 +642,7 @@ fn test_git_init_colocated_dirty_working_copy() {
// Working-copy changes should have been snapshotted.
let output = work_dir.run_jj(["log", "-s", "--ignore-working-copy"]);
insta::assert_snapshot!(output, @r"
@ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 36dbd9a1
@ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 6efc2a53
│ (no description set)
│ C {some-file => new-staged-file}
│ M some-file
@@ -747,7 +747,7 @@ fn test_git_init_external_but_git_dir_exists() {
// The local ".git" repository is unrelated, so no commits should be imported
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 230dd059e1b0
@ e8849ae12c70
◆ 000000000000
[EOF]
");
@@ -755,8 +755,8 @@ fn test_git_init_external_but_git_dir_exists() {
// Check that Git HEAD is not set because this isn't a colocated repo
work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 4db490c88528
○ 230dd059e1b0
@ 1c1c95df80e5
○ e8849ae12c70
◆ 000000000000
[EOF]
");
@@ -778,7 +778,7 @@ fn test_git_init_colocated_via_flag_git_dir_exists() {
// Check that the Git repo's HEAD got checked out
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 5f169ecc57b8
@ f3fe58bc88cc
○ e80a42cccd06 my-bookmark git_head() My commit message
◆ 000000000000
[EOF]
@@ -787,8 +787,8 @@ fn test_git_init_colocated_via_flag_git_dir_exists() {
// Check that the Git repo's HEAD moves
work_dir.run_jj(["new"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 62eda98b5eb4
○ 5f169ecc57b8 git_head()
@ 0c77f9e21b55
○ f3fe58bc88cc git_head()
○ e80a42cccd06 my-bookmark My commit message
◆ 000000000000
[EOF]
@@ -807,7 +807,7 @@ fn test_git_init_colocated_via_flag_git_dir_not_exists() {
"#);
// No HEAD ref is available yet
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 230dd059e1b0
@ e8849ae12c70
◆ 000000000000
[EOF]
");
@@ -820,7 +820,7 @@ fn test_git_init_colocated_via_flag_git_dir_not_exists() {
// If .git/HEAD pointed to the default bookmark, new working-copy commit would
// be created on top.
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 230dd059e1b0 main master
@ e8849ae12c70 main master
◆ 000000000000
[EOF]
");

50
cli/tests/test_git_private_commits.rs
View File

@@ -93,8 +93,8 @@ fn test_git_private_commits_block_pushing() {
let output = work_dir.run_jj(["git", "push", "--all"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Won't push commit aa3058ff8663 since it is private
Hint: Rejected commit: yqosqzyt aa3058ff main* | (empty) private 1
Error: Won't push commit 7f665ca27d4e since it is private
Hint: Rejected commit: yqosqzyt 7f665ca2 main* | (empty) private 1
Hint: Configured git.private-commits: 'description(glob:'private*')'
[EOF]
[exit status: 1]
@@ -106,10 +106,10 @@ fn test_git_private_commits_block_pushing() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move forward bookmark main from 7eb97bf230ad to aa3058ff8663
Move forward bookmark main from 95cc152cd086 to 7f665ca27d4e
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: znkkpsqq 2e1adf47 (empty) (no description set)
Parent commit (@-) : yqosqzyt aa3058ff main | (empty) private 1
Working copy (@) now at: znkkpsqq 8227d51b (empty) (no description set)
Parent commit (@-) : yqosqzyt 7f665ca2 main | (empty) private 1
[EOF]
");
}
@@ -130,8 +130,8 @@ fn test_git_private_commits_can_be_overridden() {
let output = work_dir.run_jj(["git", "push", "--all"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Won't push commit aa3058ff8663 since it is private
Hint: Rejected commit: yqosqzyt aa3058ff main* | (empty) private 1
Error: Won't push commit 7f665ca27d4e since it is private
Hint: Rejected commit: yqosqzyt 7f665ca2 main* | (empty) private 1
Hint: Configured git.private-commits: 'description(glob:'private*')'
[EOF]
[exit status: 1]
@@ -142,10 +142,10 @@ fn test_git_private_commits_can_be_overridden() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move forward bookmark main from 7eb97bf230ad to aa3058ff8663
Move forward bookmark main from 95cc152cd086 to 7f665ca27d4e
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: znkkpsqq 2e1adf47 (empty) (no description set)
Parent commit (@-) : yqosqzyt aa3058ff main | (empty) private 1
Working copy (@) now at: znkkpsqq 8227d51b (empty) (no description set)
Parent commit (@-) : yqosqzyt 7f665ca2 main | (empty) private 1
[EOF]
");
}
@@ -167,10 +167,10 @@ fn test_git_private_commits_are_not_checked_if_immutable() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move forward bookmark main from 7eb97bf230ad to aa3058ff8663
Move forward bookmark main from 95cc152cd086 to 7f665ca27d4e
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: yostqsxw dce4a15c (empty) (no description set)
Parent commit (@-) : yqosqzyt aa3058ff main | (empty) private 1
Working copy (@) now at: yostqsxw 17947f20 (empty) (no description set)
Parent commit (@-) : yqosqzyt 7f665ca2 main | (empty) private 1
[EOF]
");
}
@@ -195,8 +195,8 @@ fn test_git_private_commits_not_directly_in_line_block_pushing() {
let output = work_dir.run_jj(["git", "push", "--allow-new", "-b=bookmark1"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Won't push commit f1253a9b1ea9 since it is private
Hint: Rejected commit: yqosqzyt f1253a9b (empty) private 1
Error: Won't push commit 613114f44bdd since it is private
Hint: Rejected commit: yqosqzyt 613114f4 (empty) private 1
Hint: Configured git.private-commits: 'description(glob:'private*')'
[EOF]
[exit status: 1]
@@ -220,7 +220,7 @@ fn test_git_private_commits_descending_from_commits_pushed_do_not_block_pushing(
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move forward bookmark main from 7eb97bf230ad to 05ef53bc99ec
Move forward bookmark main from 95cc152cd086 to f0291dea729d
[EOF]
");
}
@@ -247,11 +247,11 @@ fn test_git_private_commits_already_on_the_remote_do_not_block_push() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move forward bookmark main from 7eb97bf230ad to fbb352762352
Add bookmark bookmark1 to 7eb97bf230ad
Move forward bookmark main from 95cc152cd086 to 03bc2bf271e0
Add bookmark bookmark1 to 95cc152cd086
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: kpqxywon a7b08364 (empty) (no description set)
Parent commit (@-) : yostqsxw fbb35276 main | (empty) public 3
Working copy (@) now at: kpqxywon 5308110d (empty) (no description set)
Parent commit (@-) : yostqsxw 03bc2bf2 main | (empty) public 3
[EOF]
");
@@ -265,7 +265,7 @@ fn test_git_private_commits_already_on_the_remote_do_not_block_push() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move forward bookmark bookmark1 from 7eb97bf230ad to fbb352762352
Move forward bookmark bookmark1 from 95cc152cd086 to 03bc2bf271e0
[EOF]
");
@@ -281,7 +281,7 @@ fn test_git_private_commits_already_on_the_remote_do_not_block_push() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark bookmark2 to ee5b808b0b95
Add bookmark bookmark2 to 987ee765174d
[EOF]
");
}
@@ -305,7 +305,7 @@ fn test_git_private_commits_are_evaluated_separately_for_each_remote() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move forward bookmark main from 7eb97bf230ad to d8632ce893ab
Move forward bookmark main from 95cc152cd086 to 7eb69d0eaf71
[EOF]
");
@@ -316,8 +316,8 @@ fn test_git_private_commits_are_evaluated_separately_for_each_remote() {
let output = work_dir.run_jj(["git", "push", "--remote=other", "-b=main"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Won't push commit 36b7ecd11ad9 since it is private
Hint: Rejected commit: znkkpsqq 36b7ecd1 (empty) private 1
Error: Won't push commit 469f044473ed since it is private
Hint: Rejected commit: znkkpsqq 469f0444 (empty) private 1
Hint: Configured git.private-commits: 'description(glob:'private*')'
[EOF]
[exit status: 1]

386
cli/tests/test_git_push.rs
View File

@@ -67,10 +67,10 @@ fn test_git_push_nothing() {
let work_dir = test_env.work_dir("local");
// Show the setup. `insta` has trouble if this is done inside `set_up()`
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark1: xtvrqkyv d13ecdbd (empty) description 1
@origin: xtvrqkyv d13ecdbd (empty) description 1
bookmark2: rlzusymt 8476341e (empty) description 2
@origin: rlzusymt 8476341e (empty) description 2
bookmark1: qpvuntsm 9b2e76de (empty) description 1
@origin: qpvuntsm 9b2e76de (empty) description 1
bookmark2: zsuskuln 38a20473 (empty) description 2
@origin: zsuskuln 38a20473 (empty) description 2
[EOF]
");
// No bookmarks to push yet
@@ -103,11 +103,11 @@ fn test_git_push_current_bookmark() {
work_dir.run_jj(["describe", "-m", "foo"]).success();
// Check the setup
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark1: xtvrqkyv 0f8dc656 (empty) modified bookmark1 commit
@origin (ahead by 1 commits, behind by 1 commits): xtvrqkyv hidden d13ecdbd (empty) description 1
bookmark2: yostqsxw bc7610b6 (empty) foo
@origin (behind by 1 commits): rlzusymt 8476341e (empty) description 2
my-bookmark: yostqsxw bc7610b6 (empty) foo
bookmark1: qpvuntsm e5ce6d9a (empty) modified bookmark1 commit
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 9b2e76de (empty) description 1
bookmark2: yostqsxw 88ca14a7 (empty) foo
@origin (behind by 1 commits): zsuskuln 38a20473 (empty) description 2
my-bookmark: yostqsxw 88ca14a7 (empty) foo
[EOF]
");
// First dry-run. `bookmark1` should not get pushed.
@@ -115,8 +115,8 @@ fn test_git_push_current_bookmark() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move forward bookmark bookmark2 from 8476341eb395 to bc7610b65a91
Add bookmark my-bookmark to bc7610b65a91
Move forward bookmark bookmark2 from 38a204733702 to 88ca14a7d46f
Add bookmark my-bookmark to 88ca14a7d46f
Dry-run requested, not pushing.
[EOF]
");
@@ -124,17 +124,17 @@ fn test_git_push_current_bookmark() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move forward bookmark bookmark2 from 8476341eb395 to bc7610b65a91
Add bookmark my-bookmark to bc7610b65a91
Move forward bookmark bookmark2 from 38a204733702 to 88ca14a7d46f
Add bookmark my-bookmark to 88ca14a7d46f
[EOF]
");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark1: xtvrqkyv 0f8dc656 (empty) modified bookmark1 commit
@origin (ahead by 1 commits, behind by 1 commits): xtvrqkyv hidden d13ecdbd (empty) description 1
bookmark2: yostqsxw bc7610b6 (empty) foo
@origin: yostqsxw bc7610b6 (empty) foo
my-bookmark: yostqsxw bc7610b6 (empty) foo
@origin: yostqsxw bc7610b6 (empty) foo
bookmark1: qpvuntsm e5ce6d9a (empty) modified bookmark1 commit
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 9b2e76de (empty) description 1
bookmark2: yostqsxw 88ca14a7 (empty) foo
@origin: yostqsxw 88ca14a7 (empty) foo
my-bookmark: yostqsxw 88ca14a7 (empty) foo
@origin: yostqsxw 88ca14a7 (empty) foo
[EOF]
");
@@ -162,7 +162,7 @@ fn test_git_push_current_bookmark() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move backward bookmark bookmark2 from bc7610b65a91 to 8476341eb395
Move backward bookmark bookmark2 from 88ca14a7d46f to 38a204733702
[EOF]
");
}
@@ -185,7 +185,7 @@ fn test_git_push_parent_bookmark() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move sideways bookmark bookmark1 from d13ecdbda2a2 to e612d524a5c6
Move sideways bookmark bookmark1 from 9b2e76de3920 to 80560a3e08e2
[EOF]
");
}
@@ -253,7 +253,7 @@ fn test_git_push_other_remote_has_bookmark() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move sideways bookmark bookmark1 from d13ecdbda2a2 to a657f1b61b94
Move sideways bookmark bookmark1 from 9b2e76de3920 to a843bfad2abb
[EOF]
");
// Since it's already pushed to origin, nothing will happen if push again
@@ -276,7 +276,7 @@ fn test_git_push_other_remote_has_bookmark() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to other:
Add bookmark bookmark1 to a657f1b61b94
Add bookmark bookmark1 to a843bfad2abb
[EOF]
");
}
@@ -310,7 +310,7 @@ fn test_git_push_forward_unexpectedly_moved() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move forward bookmark bookmark1 from d13ecdbda2a2 to 6750425ff51c
Move forward bookmark bookmark1 from 9b2e76de3920 to 624f94a35f00
Error: Failed to push some bookmarks
Hint: The following references unexpectedly moved on the remote:
refs/heads/bookmark1 (reason: stale info)
@@ -336,10 +336,10 @@ fn test_git_push_sideways_unexpectedly_moved() {
.run_jj(["bookmark", "set", "bookmark1", "-r@"])
.success();
insta::assert_snapshot!(get_bookmark_output(&origin_dir), @r"
bookmark1: vruxwmqv 80284bec remote
@git (behind by 1 commits): qpvuntsm d13ecdbd (empty) description 1
bookmark2: zsuskuln 8476341e (empty) description 2
@git: zsuskuln 8476341e (empty) description 2
bookmark1: vruxwmqv 7ce4029e remote
@git (behind by 1 commits): qpvuntsm 9b2e76de (empty) description 1
bookmark2: zsuskuln 38a20473 (empty) description 2
@git: zsuskuln 38a20473 (empty) description 2
[EOF]
");
origin_dir.run_jj(["git", "export"]).success();
@@ -351,10 +351,10 @@ fn test_git_push_sideways_unexpectedly_moved() {
.run_jj(["bookmark", "set", "bookmark1", "--allow-backwards", "-r@"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark1: kmkuslsw 0f8bf988 local
@origin (ahead by 1 commits, behind by 1 commits): xtvrqkyv d13ecdbd (empty) description 1
bookmark2: rlzusymt 8476341e (empty) description 2
@origin: rlzusymt 8476341e (empty) description 2
bookmark1: kmkuslsw 827b8a38 local
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm 9b2e76de (empty) description 1
bookmark2: zsuskuln 38a20473 (empty) description 2
@origin: zsuskuln 38a20473 (empty) description 2
[EOF]
");
@@ -362,7 +362,7 @@ fn test_git_push_sideways_unexpectedly_moved() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move sideways bookmark bookmark1 from d13ecdbda2a2 to 0f8bf988588e
Move sideways bookmark bookmark1 from 9b2e76de3920 to 827b8a385853
Error: Failed to push some bookmarks
Hint: The following references unexpectedly moved on the remote:
refs/heads/bookmark1 (reason: stale info)
@@ -390,10 +390,10 @@ fn test_git_push_deletion_unexpectedly_moved() {
.run_jj(["bookmark", "set", "bookmark1", "-r@"])
.success();
insta::assert_snapshot!(get_bookmark_output(&origin_dir), @r"
bookmark1: vruxwmqv 80284bec remote
@git (behind by 1 commits): qpvuntsm d13ecdbd (empty) description 1
bookmark2: zsuskuln 8476341e (empty) description 2
@git: zsuskuln 8476341e (empty) description 2
bookmark1: vruxwmqv 7ce4029e remote
@git (behind by 1 commits): qpvuntsm 9b2e76de (empty) description 1
bookmark2: zsuskuln 38a20473 (empty) description 2
@git: zsuskuln 38a20473 (empty) description 2
[EOF]
");
origin_dir.run_jj(["git", "export"]).success();
@@ -404,9 +404,9 @@ fn test_git_push_deletion_unexpectedly_moved() {
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark1 (deleted)
@origin: xtvrqkyv d13ecdbd (empty) description 1
bookmark2: rlzusymt 8476341e (empty) description 2
@origin: rlzusymt 8476341e (empty) description 2
@origin: qpvuntsm 9b2e76de (empty) description 1
bookmark2: zsuskuln 38a20473 (empty) description 2
@origin: zsuskuln 38a20473 (empty) description 2
[EOF]
");
@@ -414,7 +414,7 @@ fn test_git_push_deletion_unexpectedly_moved() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Delete bookmark bookmark1 from d13ecdbda2a2
Delete bookmark bookmark1 from 9b2e76de3920
Error: Failed to push some bookmarks
Hint: The following references unexpectedly moved on the remote:
refs/heads/bookmark1 (reason: stale info)
@@ -437,9 +437,9 @@ fn test_git_push_unexpectedly_deleted() {
.success();
insta::assert_snapshot!(get_bookmark_output(&origin_dir), @r"
bookmark1 (deleted)
@git: qpvuntsm d13ecdbd (empty) description 1
bookmark2: zsuskuln 8476341e (empty) description 2
@git: zsuskuln 8476341e (empty) description 2
@git: qpvuntsm 9b2e76de (empty) description 1
bookmark2: zsuskuln 38a20473 (empty) description 2
@git: zsuskuln 38a20473 (empty) description 2
[EOF]
");
origin_dir.run_jj(["git", "export"]).success();
@@ -451,10 +451,10 @@ fn test_git_push_unexpectedly_deleted() {
.run_jj(["bookmark", "set", "bookmark1", "--allow-backwards", "-r@"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark1: kpqxywon 1ebe27ba local
@origin (ahead by 1 commits, behind by 1 commits): xtvrqkyv d13ecdbd (empty) description 1
bookmark2: rlzusymt 8476341e (empty) description 2
@origin: rlzusymt 8476341e (empty) description 2
bookmark1: kpqxywon 09919fb0 local
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm 9b2e76de (empty) description 1
bookmark2: zsuskuln 38a20473 (empty) description 2
@origin: zsuskuln 38a20473 (empty) description 2
[EOF]
");
@@ -463,7 +463,7 @@ fn test_git_push_unexpectedly_deleted() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move sideways bookmark bookmark1 from d13ecdbda2a2 to 1ebe27ba04bf
Move sideways bookmark bookmark1 from 9b2e76de3920 to 09919fb051bf
Error: Failed to push some bookmarks
Hint: The following references unexpectedly moved on the remote:
refs/heads/bookmark1 (reason: stale info)
@@ -477,9 +477,9 @@ fn test_git_push_unexpectedly_deleted() {
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark1 (deleted)
@origin: xtvrqkyv d13ecdbd (empty) description 1
bookmark2: rlzusymt 8476341e (empty) description 2
@origin: rlzusymt 8476341e (empty) description 2
@origin: qpvuntsm 9b2e76de (empty) description 1
bookmark2: zsuskuln 38a20473 (empty) description 2
@origin: zsuskuln 38a20473 (empty) description 2
[EOF]
");
@@ -489,7 +489,7 @@ fn test_git_push_unexpectedly_deleted() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Delete bookmark bookmark1 from d13ecdbda2a2
Delete bookmark bookmark1 from 9b2e76de3920
Error: Failed to push some bookmarks
Hint: The following references unexpectedly moved on the remote:
refs/heads/bookmark1 (reason: stale info)
@@ -519,9 +519,9 @@ fn test_git_push_creation_unexpectedly_already_exists() {
.run_jj(["bookmark", "create", "-r@", "bookmark1"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark1: yostqsxw cb17dcdc new bookmark1
bookmark2: rlzusymt 8476341e (empty) description 2
@origin: rlzusymt 8476341e (empty) description 2
bookmark1: yostqsxw a43cb801 new bookmark1
bookmark2: zsuskuln 38a20473 (empty) description 2
@origin: zsuskuln 38a20473 (empty) description 2
[EOF]
");
@@ -529,7 +529,7 @@ fn test_git_push_creation_unexpectedly_already_exists() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark bookmark1 to cb17dcdc74d5
Add bookmark bookmark1 to a43cb8011c85
Error: Failed to push some bookmarks
Hint: The following references unexpectedly moved on the remote:
refs/heads/bookmark1 (reason: stale info)
@@ -565,7 +565,7 @@ fn test_git_push_locally_created_and_rewritten() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark my to fcc999921ce9
Add bookmark my to e0cba5e497ee
Dry-run requested, not pushing.
[EOF]
");
@@ -573,7 +573,7 @@ fn test_git_push_locally_created_and_rewritten() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark my to fcc999921ce9
Add bookmark my to e0cba5e497ee
[EOF]
");
@@ -581,19 +581,19 @@ fn test_git_push_locally_created_and_rewritten() {
// set to "tracking"
work_dir.run_jj(["describe", "-mlocal 2"]).success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark1: xtvrqkyv d13ecdbd (empty) description 1
@origin: xtvrqkyv d13ecdbd (empty) description 1
bookmark2: rlzusymt 8476341e (empty) description 2
@origin: rlzusymt 8476341e (empty) description 2
my: vruxwmqv 423bb660 (empty) local 2
@origin (ahead by 1 commits, behind by 1 commits): vruxwmqv hidden fcc99992 (empty) local 1
bookmark1: qpvuntsm 9b2e76de (empty) description 1
@origin: qpvuntsm 9b2e76de (empty) description 1
bookmark2: zsuskuln 38a20473 (empty) description 2
@origin: zsuskuln 38a20473 (empty) description 2
my: vruxwmqv 5eb416c1 (empty) local 2
@origin (ahead by 1 commits, behind by 1 commits): vruxwmqv hidden e0cba5e4 (empty) local 1
[EOF]
");
let output = work_dir.run_jj(["git", "push"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move sideways bookmark my from fcc999921ce9 to 423bb66069e7
Move sideways bookmark my from e0cba5e497ee to 5eb416c1ff97
[EOF]
");
}
@@ -616,10 +616,10 @@ fn test_git_push_multiple() {
// Check the setup
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark1 (deleted)
@origin: xtvrqkyv d13ecdbd (empty) description 1
bookmark2: yqosqzyt c4a3c310 (empty) foo
@origin (ahead by 1 commits, behind by 1 commits): rlzusymt 8476341e (empty) description 2
my-bookmark: yqosqzyt c4a3c310 (empty) foo
@origin: qpvuntsm 9b2e76de (empty) description 1
bookmark2: yqosqzyt 352fa187 (empty) foo
@origin (ahead by 1 commits, behind by 1 commits): zsuskuln 38a20473 (empty) description 2
my-bookmark: yqosqzyt 352fa187 (empty) foo
[EOF]
");
// First dry-run
@@ -627,9 +627,9 @@ fn test_git_push_multiple() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Delete bookmark bookmark1 from d13ecdbda2a2
Move sideways bookmark bookmark2 from 8476341eb395 to c4a3c3105d92
Add bookmark my-bookmark to c4a3c3105d92
Delete bookmark bookmark1 from 9b2e76de3920
Move sideways bookmark bookmark2 from 38a204733702 to 352fa1879f75
Add bookmark my-bookmark to 352fa1879f75
Dry-run requested, not pushing.
[EOF]
");
@@ -645,8 +645,8 @@ fn test_git_push_multiple() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Delete bookmark bookmark1 from d13ecdbda2a2
Add bookmark my-bookmark to c4a3c3105d92
Delete bookmark bookmark1 from 9b2e76de3920
Add bookmark my-bookmark to 352fa1879f75
Dry-run requested, not pushing.
[EOF]
");
@@ -664,8 +664,8 @@ fn test_git_push_multiple() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Delete bookmark bookmark1 from d13ecdbda2a2
Add bookmark my-bookmark to c4a3c3105d92
Delete bookmark bookmark1 from 9b2e76de3920
Add bookmark my-bookmark to 352fa1879f75
Dry-run requested, not pushing.
[EOF]
");
@@ -674,8 +674,8 @@ fn test_git_push_multiple() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Delete bookmark bookmark1 from d13ecdbda2a2
Move sideways bookmark bookmark2 from 8476341eb395 to c4a3c3105d92
Delete bookmark bookmark1 from 9b2e76de3920
Move sideways bookmark bookmark2 from 38a204733702 to 352fa1879f75
Dry-run requested, not pushing.
[EOF]
");
@@ -703,8 +703,8 @@ fn test_git_push_multiple() {
Warning: Refusing to push deleted bookmark bookmark1
Hint: Push deleted bookmarks with --deleted or forget the bookmark to suppress this warning.
Changes to push to origin:
Move sideways bookmark bookmark2 from 8476341eb395 to c4a3c3105d92
Add bookmark my-bookmark to c4a3c3105d92
Move sideways bookmark bookmark2 from 38a204733702 to 352fa1879f75
Add bookmark my-bookmark to 352fa1879f75
Dry-run requested, not pushing.
[EOF]
");
@@ -712,9 +712,9 @@ fn test_git_push_multiple() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Delete bookmark bookmark1 from d13ecdbda2a2
Move sideways bookmark bookmark2 from 8476341eb395 to c4a3c3105d92
Add bookmark my-bookmark to c4a3c3105d92
Delete bookmark bookmark1 from 9b2e76de3920
Move sideways bookmark bookmark2 from 38a204733702 to 352fa1879f75
Add bookmark my-bookmark to 352fa1879f75
Dry-run requested, not pushing.
[EOF]
");
@@ -723,25 +723,25 @@ fn test_git_push_multiple() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Delete bookmark bookmark1 from d13ecdbda2a2
Move sideways bookmark bookmark2 from 8476341eb395 to c4a3c3105d92
Add bookmark my-bookmark to c4a3c3105d92
Delete bookmark bookmark1 from 9b2e76de3920
Move sideways bookmark bookmark2 from 38a204733702 to 352fa1879f75
Add bookmark my-bookmark to 352fa1879f75
[EOF]
");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark2: yqosqzyt c4a3c310 (empty) foo
@origin: yqosqzyt c4a3c310 (empty) foo
my-bookmark: yqosqzyt c4a3c310 (empty) foo
@origin: yqosqzyt c4a3c310 (empty) foo
bookmark2: yqosqzyt 352fa187 (empty) foo
@origin: yqosqzyt 352fa187 (empty) foo
my-bookmark: yqosqzyt 352fa187 (empty) foo
@origin: yqosqzyt 352fa187 (empty) foo
[EOF]
");
let output = work_dir.run_jj(["log", "-rall()"]);
insta::assert_snapshot!(output, @r"
@ yqosqzyt test.user@example.com 2001-02-03 08:05:17 bookmark2 my-bookmark c4a3c310
@ yqosqzyt test.user@example.com 2001-02-03 08:05:17 bookmark2 my-bookmark 352fa187
│ (empty) foo
│ ○ rlzusymt test.user@example.com 2001-02-03 08:05:10 8476341e
│ ○ zsuskuln test.user@example.com 2001-02-03 08:05:10 38a20473
├─╯ (empty) description 2
│ ○ xtvrqkyv test.user@example.com 2001-02-03 08:05:08 d13ecdbd
│ ○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 9b2e76de
├─╯ (empty) description 1
◆ zzzzzzzz root() 00000000
[EOF]
@@ -763,7 +763,7 @@ fn test_git_push_changes() {
------- stderr -------
Creating bookmark push-yostqsxwqrlt for revision yostqsxwqrlt
Changes to push to origin:
Add bookmark push-yostqsxwqrlt to cf1a53a8800a
Add bookmark push-yostqsxwqrlt to 916414184c47
[EOF]
");
// test pushing two changes at once
@@ -773,8 +773,8 @@ fn test_git_push_changes() {
------- stderr -------
Error: Revset `(@|@-)` resolved to more than one revision
Hint: The revset `(@|@-)` resolved to these revisions:
yostqsxw 16c16966 push-yostqsxwqrlt* | bar
yqosqzyt a050abf4 foo
yostqsxw 2723f611 push-yostqsxwqrlt* | bar
yqosqzyt 0f8164cd foo
Hint: Prefix the expression with `all:` to allow any number of revisions (i.e. `all:(@|@-)`).
[EOF]
[exit status: 1]
@@ -785,8 +785,8 @@ fn test_git_push_changes() {
------- stderr -------
Creating bookmark push-yqosqzytrlsw for revision yqosqzytrlsw
Changes to push to origin:
Move sideways bookmark push-yostqsxwqrlt from cf1a53a8800a to 16c169664e9f
Add bookmark push-yqosqzytrlsw to a050abf4ff07
Move sideways bookmark push-yostqsxwqrlt from 916414184c47 to 2723f6111cb9
Add bookmark push-yqosqzytrlsw to 0f8164cd580b
[EOF]
");
// specifying the same change twice doesn't break things
@@ -795,7 +795,7 @@ fn test_git_push_changes() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move sideways bookmark push-yostqsxwqrlt from 16c169664e9f to ef6313d50ac1
Move sideways bookmark push-yostqsxwqrlt from 2723f6111cb9 to 7436a8a600a4
[EOF]
");
@@ -805,7 +805,7 @@ fn test_git_push_changes() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move sideways bookmark push-yostqsxwqrlt from ef6313d50ac1 to c1e65d3a64ce
Move sideways bookmark push-yostqsxwqrlt from 7436a8a600a4 to a8b93bdd0f68
[EOF]
");
@@ -824,8 +824,8 @@ fn test_git_push_changes() {
insta::assert_snapshot!(output, @r"
Working copy changes:
M file
Working copy (@) : yostqsxw 38cb417c bar
Parent commit (@-): yqosqzyt a050abf4 push-yostqsxwqrlt* push-yqosqzytrlsw | foo
Working copy (@) : yostqsxw 4b18f5ea bar
Parent commit (@-): yqosqzyt 0f8164cd push-yostqsxwqrlt* push-yqosqzytrlsw | foo
[EOF]
");
let output = work_dir.run_jj(["git", "push", "-c=@", "-b=push-yostqsxwqrlt"]);
@@ -840,8 +840,8 @@ fn test_git_push_changes() {
insta::assert_snapshot!(output, @r"
Working copy changes:
M file
Working copy (@) : yostqsxw 38cb417c bar
Parent commit (@-): yqosqzyt a050abf4 push-yostqsxwqrlt* push-yqosqzytrlsw | foo
Working copy (@) : yostqsxw 4b18f5ea bar
Parent commit (@-): yqosqzyt 0f8164cd push-yostqsxwqrlt* push-yqosqzytrlsw | foo
[EOF]
");
@@ -856,7 +856,7 @@ fn test_git_push_changes() {
------- stderr -------
Creating bookmark test-yostqsxwqrlt for revision yostqsxwqrlt
Changes to push to origin:
Add bookmark test-yostqsxwqrlt to 38cb417ce3a6
Add bookmark test-yostqsxwqrlt to 4b18f5ea2994
[EOF]
");
}
@@ -876,7 +876,7 @@ fn test_git_push_changes_with_name() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark b1 to 3e677c129c1d
Add bookmark b1 to 5f4f9a466c96
[EOF]
");
// Spaces before the = sign are treated like part of the bookmark name and such
@@ -958,8 +958,8 @@ fn test_git_push_changes_with_name() {
------- stderr -------
Error: Revset `all:(@|@-)` resolved to more than one revision
Hint: The revset `all:(@|@-)` resolved to these revisions:
yostqsxw 101e6730 b1* | pushed
yqosqzyt a050abf4 foo
yostqsxw 1b2bd869 b1* | pushed
yqosqzyt 0f8164cd foo
[EOF]
[exit status: 1]
");
@@ -970,7 +970,7 @@ fn test_git_push_changes_with_name() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark b2 to 477da21559d5
Add bookmark b2 to 95ba7bdacb38
[EOF]
");
}
@@ -1007,7 +1007,7 @@ fn test_git_push_changes_with_name_deleted_tracked() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark b1 to fd39fc9ddae4
Add bookmark b1 to 08f401c17d51
[EOF]
");
work_dir.run_jj(["bookmark", "delete", "b1"]).success();
@@ -1018,7 +1018,7 @@ fn test_git_push_changes_with_name_deleted_tracked() {
.success();
insta::assert_snapshot!(output, @r"
b1 (deleted)
@origin: kpqxywon fd39fc9d pushed
@origin: kpqxywon 08f401c1 pushed
[EOF]
------- stderr -------
Hint: Bookmarks marked as deleted can be *deleted permanently* on the remote by running `jj git push --deleted`. Use `jj bookmark forget` if you don't want that.
@@ -1053,23 +1053,23 @@ fn test_git_push_changes_with_name_deleted_tracked() {
.run_jj(["bookmark", "list", "--all", "b1"])
.success();
insta::assert_snapshot!(output, @r"
b1@origin: kpqxywon fd39fc9d pushed
b1@origin: kpqxywon 08f401c1 pushed
[EOF]
");
let output = work_dir.run_jj(["git", "push", "--named", "b1=@", "--remote=another_remote"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to another_remote:
Add bookmark b1 to fd39fc9ddae4
Add bookmark b1 to 08f401c17d51
[EOF]
");
let output = work_dir
.run_jj(["bookmark", "list", "--all", "b1"])
.success();
insta::assert_snapshot!(output, @r"
b1: kpqxywon fd39fc9d pushed
@another_remote: kpqxywon fd39fc9d pushed
b1@origin: kpqxywon fd39fc9d pushed
b1: kpqxywon 08f401c1 pushed
@another_remote: kpqxywon 08f401c1 pushed
b1@origin: kpqxywon 08f401c1 pushed
[EOF]
");
}
@@ -1107,9 +1107,9 @@ fn test_git_push_changes_with_name_untracked_or_forgotten() {
])
.success();
insta::assert_snapshot!(output, @r"
○ 08f child
@ ec9 b1@origin pushed_to_remote
○ 57e parent
○ 9a0 child
@ 767 b1@origin pushed_to_remote
○ aa9 parent
◆ 000
[EOF]
");
@@ -1117,7 +1117,7 @@ fn test_git_push_changes_with_name_untracked_or_forgotten() {
.run_jj(["bookmark", "list", "--all", "b1"])
.success();
insta::assert_snapshot!(output, @r"
b1@origin: yostqsxw ec992a1a pushed_to_remote
b1@origin: yostqsxw 767b63a5 pushed_to_remote
[EOF]
");
@@ -1155,7 +1155,7 @@ fn test_git_push_changes_with_name_untracked_or_forgotten() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark b1 to 57ec90f54125
Add bookmark b1 to aa9ad64cb4ce
Error: Failed to push some bookmarks
Hint: The following references unexpectedly moved on the remote:
refs/heads/b1 (reason: stale info)
@@ -1171,7 +1171,7 @@ fn test_git_push_changes_with_name_untracked_or_forgotten() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark b1 to 08fcdf4055ae
Add bookmark b1 to 9a0f76645905
Error: Failed to push some bookmarks
Hint: The following references unexpectedly moved on the remote:
refs/heads/b1 (reason: stale info)
@@ -1186,7 +1186,7 @@ fn test_git_push_changes_with_name_untracked_or_forgotten() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark b1 to ec992a1a9381
Add bookmark b1 to 767b63a598e1
[EOF]
");
}
@@ -1233,7 +1233,7 @@ fn test_git_push_revisions() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark bookmark-1 to 5f432a855e59
Add bookmark bookmark-1 to e76139e55e1e
Dry-run requested, not pushing.
[EOF]
");
@@ -1243,7 +1243,7 @@ fn test_git_push_revisions() {
------- stderr -------
Warning: No bookmarks point to the specified revisions: @--
Changes to push to origin:
Add bookmark bookmark-1 to 5f432a855e59
Add bookmark bookmark-1 to e76139e55e1e
Dry-run requested, not pushing.
[EOF]
");
@@ -1252,8 +1252,8 @@ fn test_git_push_revisions() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark bookmark-2a to 84f499037f5c
Add bookmark bookmark-2b to 84f499037f5c
Add bookmark bookmark-2a to 57d822f901bb
Add bookmark bookmark-2b to 57d822f901bb
Dry-run requested, not pushing.
[EOF]
");
@@ -1262,7 +1262,7 @@ fn test_git_push_revisions() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark bookmark-1 to 5f432a855e59
Add bookmark bookmark-1 to e76139e55e1e
Dry-run requested, not pushing.
[EOF]
");
@@ -1318,10 +1318,10 @@ fn test_git_push_mixed() {
------- stderr -------
Creating bookmark push-yqosqzytrlsw for revision yqosqzytrlsw
Changes to push to origin:
Add bookmark push-yqosqzytrlsw to a050abf4ff07
Add bookmark bookmark-1 to 5f432a855e59
Add bookmark bookmark-2a to 84f499037f5c
Add bookmark bookmark-2b to 84f499037f5c
Add bookmark push-yqosqzytrlsw to 0f8164cd580b
Add bookmark bookmark-1 to e76139e55e1e
Add bookmark bookmark-2a to 57d822f901bb
Add bookmark bookmark-2b to 57d822f901bb
[EOF]
");
}
@@ -1358,8 +1358,8 @@ fn test_git_push_conflict() {
let output = work_dir.run_jj(["git", "push", "--all"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Won't push commit e2221a796300 since it has conflicts
Hint: Rejected commit: yostqsxw e2221a79 my-bookmark | (conflict) third
Error: Won't push commit 654e715becca since it has conflicts
Hint: Rejected commit: yostqsxw 654e715b my-bookmark | (conflict) third
[EOF]
[exit status: 1]
");
@@ -1377,8 +1377,8 @@ fn test_git_push_no_description() {
let output = work_dir.run_jj(["git", "push", "--allow-new", "--bookmark", "my-bookmark"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Won't push commit 5b36783cd11c since it has no description
Hint: Rejected commit: yqosqzyt 5b36783c my-bookmark | (empty) (no description set)
Error: Won't push commit 8d23abddc924 since it has no description
Hint: Rejected commit: yqosqzyt 8d23abdd my-bookmark | (empty) (no description set)
[EOF]
[exit status: 1]
");
@@ -1418,8 +1418,8 @@ fn test_git_push_no_description_in_immutable() {
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Won't push commit 5b36783cd11c since it has no description
Hint: Rejected commit: yqosqzyt 5b36783c imm | (empty) (no description set)
Error: Won't push commit 8d23abddc924 since it has no description
Hint: Rejected commit: yqosqzyt 8d23abdd imm | (empty) (no description set)
[EOF]
[exit status: 1]
");
@@ -1435,7 +1435,7 @@ fn test_git_push_no_description_in_immutable() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark my-bookmark to ea7373507ad9
Add bookmark my-bookmark to 240e2e89abb2
Dry-run requested, not pushing.
[EOF]
");
@@ -1456,8 +1456,8 @@ fn test_git_push_missing_author() {
let output = work_dir.run_jj(["git", "push", "--allow-new", "--bookmark", "missing-name"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Won't push commit 944313939bbd since it has no author and/or committer set
Hint: Rejected commit: vruxwmqv 94431393 missing-name | (empty) initial
Error: Won't push commit 613adaba9d49 since it has no author and/or committer set
Hint: Rejected commit: vruxwmqv 613adaba missing-name | (empty) initial
[EOF]
[exit status: 1]
");
@@ -1466,8 +1466,8 @@ fn test_git_push_missing_author() {
let output = work_dir.run_jj(["git", "push", "--allow-new", "--bookmark=missing-email"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Won't push commit 59354714f789 since it has no author and/or committer set
Hint: Rejected commit: kpqxywon 59354714 missing-email | (empty) initial
Error: Won't push commit bb4ea60fc9ba since it has no author and/or committer set
Hint: Rejected commit: kpqxywon bb4ea60f missing-email | (empty) initial
[EOF]
[exit status: 1]
");
@@ -1503,8 +1503,8 @@ fn test_git_push_missing_author_in_immutable() {
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Won't push commit 011f740bf8b5 since it has no author and/or committer set
Hint: Rejected commit: yostqsxw 011f740b imm | (empty) no author email
Error: Won't push commit 5c3cc711907f since it has no author and/or committer set
Hint: Rejected commit: yostqsxw 5c3cc711 imm | (empty) no author email
[EOF]
[exit status: 1]
");
@@ -1520,7 +1520,7 @@ fn test_git_push_missing_author_in_immutable() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark my-bookmark to 68fdae89de4f
Add bookmark my-bookmark to 96080b93b4ce
Dry-run requested, not pushing.
[EOF]
");
@@ -1543,8 +1543,8 @@ fn test_git_push_missing_committer() {
let output = work_dir.run_jj(["git", "push", "--allow-new", "--bookmark=missing-name"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Won't push commit 4fd190283d1a since it has no author and/or committer set
Hint: Rejected commit: yqosqzyt 4fd19028 missing-name | (empty) no committer name
Error: Won't push commit e8a77cb24da9 since it has no author and/or committer set
Hint: Rejected commit: yqosqzyt e8a77cb2 missing-name | (empty) no committer name
[EOF]
[exit status: 1]
");
@@ -1556,8 +1556,8 @@ fn test_git_push_missing_committer() {
let output = work_dir.run_jj(["git", "push", "--allow-new", "--bookmark=missing-email"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Won't push commit eab97428a6ec since it has no author and/or committer set
Hint: Rejected commit: kpqxywon eab97428 missing-email | (empty) no committer email
Error: Won't push commit 971c50fd8d1d since it has no author and/or committer set
Hint: Rejected commit: kpqxywon 971c50fd missing-email | (empty) no committer email
[EOF]
[exit status: 1]
");
@@ -1568,8 +1568,8 @@ fn test_git_push_missing_committer() {
let output = work_dir.run_jj(["git", "push", "--allow-new", "--bookmark=missing-email"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Won't push commit 1143ed607f54 since it has no description and it has no author and/or committer set
Hint: Rejected commit: kpqxywon 1143ed60 missing-email | (empty) (no description set)
Error: Won't push commit 4bd3b55c7759 since it has no description and it has no author and/or committer set
Hint: Rejected commit: kpqxywon 4bd3b55c missing-email | (empty) (no description set)
[EOF]
[exit status: 1]
");
@@ -1606,8 +1606,8 @@ fn test_git_push_missing_committer_in_immutable() {
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Won't push commit 7e61dc727a8f since it has no author and/or committer set
Hint: Rejected commit: yostqsxw 7e61dc72 imm | (empty) no committer email
Error: Won't push commit ab230f98c812 since it has no author and/or committer set
Hint: Rejected commit: yostqsxw ab230f98 imm | (empty) no committer email
[EOF]
[exit status: 1]
");
@@ -1623,7 +1623,7 @@ fn test_git_push_missing_committer_in_immutable() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Add bookmark my-bookmark to c79f85e90b4a
Add bookmark my-bookmark to e0dff9c29479
Dry-run requested, not pushing.
[EOF]
");
@@ -1642,16 +1642,16 @@ fn test_git_push_deleted() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Delete bookmark bookmark1 from d13ecdbda2a2
Delete bookmark bookmark1 from 9b2e76de3920
[EOF]
");
let output = work_dir.run_jj(["log", "-rall()"]);
insta::assert_snapshot!(output, @r"
@ yqosqzyt test.user@example.com 2001-02-03 08:05:13 5b36783c
@ yqosqzyt test.user@example.com 2001-02-03 08:05:13 8d23abdd
│ (empty) (no description set)
│ ○ rlzusymt test.user@example.com 2001-02-03 08:05:10 bookmark2 8476341e
│ ○ zsuskuln test.user@example.com 2001-02-03 08:05:10 bookmark2 38a20473
├─╯ (empty) description 2
│ ○ xtvrqkyv test.user@example.com 2001-02-03 08:05:08 d13ecdbd
│ ○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 9b2e76de
├─╯ (empty) description 1
◆ zzzzzzzz root() 00000000
[EOF]
@@ -1691,12 +1691,12 @@ fn test_git_push_conflicting_bookmarks() {
.success();
work_dir.run_jj(["git", "fetch"]).success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark1: xtvrqkyv d13ecdbd (empty) description 1
@origin: xtvrqkyv d13ecdbd (empty) description 1
bookmark1: qpvuntsm 9b2e76de (empty) description 1
@origin: qpvuntsm 9b2e76de (empty) description 1
bookmark2 (conflicted):
+ yostqsxw 8e670e2d (empty) description 3
+ rlzusymt 8476341e (empty) description 2
@origin (behind by 1 commits): rlzusymt 8476341e (empty) description 2
+ yostqsxw ebedbe63 (empty) description 3
+ zsuskuln 38a20473 (empty) description 2
@origin (behind by 1 commits): zsuskuln 38a20473 (empty) description 2
[EOF]
");
@@ -1735,7 +1735,7 @@ fn test_git_push_conflicting_bookmarks() {
Warning: Bookmark bookmark2 is conflicted
Hint: Run `jj bookmark list` to inspect, and use `jj bookmark set` to fix it up.
Changes to push to origin:
Move forward bookmark bookmark1 from d13ecdbda2a2 to 8df52121b022
Move forward bookmark bookmark1 from 9b2e76de3920 to 749c2e6d999f
[EOF]
");
@@ -1747,7 +1747,7 @@ fn test_git_push_conflicting_bookmarks() {
Warning: Bookmark bookmark2 is conflicted
Hint: Run `jj bookmark list` to inspect, and use `jj bookmark set` to fix it up.
Changes to push to origin:
Move forward bookmark bookmark1 from 8df52121b022 to 345e1f64a64d
Move forward bookmark bookmark1 from 749c2e6d999f to 9bb0f427b517
[EOF]
");
}
@@ -1805,11 +1805,11 @@ fn test_git_push_tracked_vs_all() {
.run_jj(["bookmark", "create", "-r@", "bookmark3"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark1: vruxwmqv db059e3f (empty) moved bookmark1
bookmark1@origin: xtvrqkyv d13ecdbd (empty) description 1
bookmark1: vruxwmqv d7607a25 (empty) moved bookmark1
bookmark1@origin: qpvuntsm 9b2e76de (empty) description 1
bookmark2 (deleted)
@origin: rlzusymt 8476341e (empty) description 2
bookmark3: znkkpsqq 1aa4f1f2 (empty) moved bookmark2
@origin: zsuskuln 38a20473 (empty) description 2
bookmark3: znkkpsqq 0004a65e (empty) moved bookmark2
[EOF]
");
@@ -1828,7 +1828,7 @@ fn test_git_push_tracked_vs_all() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Delete bookmark bookmark2 from 8476341eb395
Delete bookmark bookmark2 from 38a204733702
Dry-run requested, not pushing.
[EOF]
");
@@ -1838,10 +1838,10 @@ fn test_git_push_tracked_vs_all() {
.run_jj(["bookmark", "untrack", "bookmark2@origin"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark1: vruxwmqv db059e3f (empty) moved bookmark1
bookmark1@origin: xtvrqkyv d13ecdbd (empty) description 1
bookmark2@origin: rlzusymt 8476341e (empty) description 2
bookmark3: znkkpsqq 1aa4f1f2 (empty) moved bookmark2
bookmark1: vruxwmqv d7607a25 (empty) moved bookmark1
bookmark1@origin: qpvuntsm 9b2e76de (empty) description 1
bookmark2@origin: zsuskuln 38a20473 (empty) description 2
bookmark3: znkkpsqq 0004a65e (empty) moved bookmark2
[EOF]
");
@@ -1875,7 +1875,7 @@ fn test_git_push_tracked_vs_all() {
Warning: Non-tracking remote bookmark bookmark1@origin exists
Hint: Run `jj bookmark track bookmark1@origin` to import the remote bookmark.
Changes to push to origin:
Add bookmark bookmark3 to 1aa4f1f2ef7f
Add bookmark bookmark3 to 0004a65e1d28
[EOF]
");
}
@@ -1946,8 +1946,8 @@ fn test_git_push_to_remote_named_git() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to git:
Add bookmark bookmark1 to d13ecdbda2a2
Add bookmark bookmark2 to 8476341eb395
Add bookmark bookmark1 to 9b2e76de3920
Add bookmark bookmark2 to 38a204733702
Error: Git remote named 'git' is reserved for local Git repository
Hint: Run `jj git remote rename` to give a different name.
[EOF]
@@ -1971,8 +1971,8 @@ fn test_git_push_to_remote_with_slashes() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to slash/origin:
Add bookmark bookmark1 to d13ecdbda2a2
Add bookmark bookmark2 to 8476341eb395
Add bookmark bookmark1 to 9b2e76de3920
Add bookmark bookmark2 to 38a204733702
Error: Git remotes with slashes are incompatible with jj: slash/origin
Hint: Run `jj git remote rename` to give a different name.
[EOF]
@@ -2036,7 +2036,7 @@ fn test_git_push_sign_on_push() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move forward bookmark bookmark2 from 8476341eb395 to 8710e91a14a1
Move forward bookmark bookmark2 from 38a204733702 to 3779ed7f18df
Dry-run requested, not pushing.
[EOF]
");
@@ -2059,9 +2059,9 @@ fn test_git_push_sign_on_push() {
Updated signatures of 2 commits
Rebased 2 descendant commits
Changes to push to origin:
Move forward bookmark bookmark2 from 8476341eb395 to a6259c482040
Working copy (@) now at: kmkuslsw b5f47345 (empty) commit which should not be signed 2
Parent commit (@-) : kpqxywon 90df08d3 (empty) commit which should not be signed 1
Move forward bookmark bookmark2 from 38a204733702 to d45e2adce0ad
Working copy (@) now at: kmkuslsw 3d5a9465 (empty) commit which should not be signed 2
Parent commit (@-) : kpqxywon 48ea83e9 (empty) commit which should not be signed 1
[EOF]
");
// Only commits which are being pushed should be signed
@@ -2090,13 +2090,13 @@ fn test_git_push_sign_on_push() {
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Created 1 bookmarks pointing to kpqxywon 90df08d3 bookmark3 | (empty) commit which should not be signed 1
Created 1 bookmarks pointing to kpqxywon 48ea83e9 bookmark3 | (empty) commit which should not be signed 1
[EOF]
");
let output = work_dir.run_jj(["bookmark", "move", "bookmark2", "--to", "bookmark3"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 1 bookmarks to kpqxywon 90df08d3 bookmark2* bookmark3 | (empty) commit which should not be signed 1
Moved 1 bookmarks to kpqxywon 48ea83e9 bookmark2* bookmark3 | (empty) commit which should not be signed 1
[EOF]
");
test_env.add_config(r#"revset-aliases."immutable_heads()" = "bookmark3""#);
@@ -2106,7 +2106,7 @@ fn test_git_push_sign_on_push() {
Warning: Refusing to create new remote bookmark bookmark3@origin
Hint: Use --allow-new to push new bookmark. Use --remote to specify the remote to push to.
Changes to push to origin:
Move forward bookmark bookmark2 from a6259c482040 to 90df08d3d612
Move forward bookmark bookmark2 from d45e2adce0ad to 48ea83e9499c
[EOF]
");
let output = work_dir.run_jj(["log", "-T", template, "-r", "::"]);
@@ -2132,10 +2132,10 @@ fn test_git_push_rejected_by_remote() {
let work_dir = test_env.work_dir("local");
// show repo state
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
bookmark1: xtvrqkyv d13ecdbd (empty) description 1
@origin: xtvrqkyv d13ecdbd (empty) description 1
bookmark2: rlzusymt 8476341e (empty) description 2
@origin: rlzusymt 8476341e (empty) description 2
bookmark1: qpvuntsm 9b2e76de (empty) description 1
@origin: qpvuntsm 9b2e76de (empty) description 1
bookmark2: zsuskuln 38a20473 (empty) description 2
@origin: zsuskuln 38a20473 (empty) description 2
[EOF]
");
@@ -2183,7 +2183,7 @@ fn test_git_push_rejected_by_remote() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Changes to push to origin:
Move forward bookmark bookmark1 from d13ecdbda2a2 to dd5c09b30f9f
Move forward bookmark bookmark1 from 9b2e76de3920 to 0fc4cf312e83
remote: error: hook declined to update refs/heads/bookmark1
Error: Failed to push some bookmarks
Hint: The remote rejected the following updates:

6
cli/tests/test_gitignores.rs
View File

@@ -133,12 +133,12 @@ fn test_gitignores_ignored_file_in_target_commit() {
let output = work_dir.run_jj(["edit", "with-file"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm 5ada929e with-file | (no description set)
Working copy (@) now at: qpvuntsm 3cf51c1a with-file | (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 1 files, modified 0 files, removed 0 files
Warning: 1 of those updates were skipped because there were conflicting changes in the working copy.
Hint: Inspect the changes compared to the intended target with `jj diff --from 5ada929e5d2e`.
Discard the conflicting changes with `jj restore --from 5ada929e5d2e`.
Hint: Inspect the changes compared to the intended target with `jj diff --from 3cf51c1acf24`.
Discard the conflicting changes with `jj restore --from 3cf51c1acf24`.
[EOF]
");
let output = work_dir.run_jj(["diff", "--git", "--from", &target_commit_id]);

52
cli/tests/test_global_opts.rs
View File

@@ -111,13 +111,13 @@ fn test_no_subcommand() {
.success();
// TODO: test_env.run_jj(["-r", "help"]).success()
insta::assert_snapshot!(work_dir.run_jj(["-r", "log"]), @r"
@ qpvuntsm test.user@example.com 2001-02-03 08:05:07 help log show 230dd059
@ qpvuntsm test.user@example.com 2001-02-03 08:05:07 help log show e8849ae1
│ (empty) (no description set)
~
[EOF]
");
insta::assert_snapshot!(work_dir.run_jj(["-r", "show"]), @r"
@ qpvuntsm test.user@example.com 2001-02-03 08:05:07 help log show 230dd059
@ qpvuntsm test.user@example.com 2001-02-03 08:05:07 help log show e8849ae1
│ (empty) (no description set)
~
[EOF]
@@ -130,8 +130,8 @@ fn test_no_subcommand() {
let output = work_dir.run_jj([""; 0]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kxryzmor 89c70edf (empty) (no description set)
Parent commit (@-) : lylxulpl 51bd3589 foo
Working copy (@) now at: kxryzmor 8db1ba9a (empty) (no description set)
Parent commit (@-) : lylxulpl 19f3adb2 foo
[EOF]
");
}
@@ -145,7 +145,7 @@ fn test_ignore_working_copy() {
work_dir.write_file("file", "initial");
let output = work_dir.run_jj(["log", "-T", "commit_id"]);
insta::assert_snapshot!(output, @r"
@ b15ef4cdd277d2c63cce6d67c1916f53a36141f7
@ 82a10a4d9ef783fd68b661f40ce10dd80d599d9e
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -159,7 +159,7 @@ fn test_ignore_working_copy() {
// But without --ignore-working-copy, we get a new commit ID.
let output = work_dir.run_jj(["log", "-T", "commit_id"]);
insta::assert_snapshot!(output, @r"
@ 4d2c49a8f8e2f1ba61f48ba79e5f4a5faa6512cf
@ 00fc09f48ccf5c8b025a0f93b0ec3b0e4294a598
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -200,7 +200,7 @@ fn test_resolve_workspace_directory() {
let output = sub_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r"
The working copy has no changes.
Working copy (@) : qpvuntsm 230dd059 (empty) (no description set)
Working copy (@) : qpvuntsm e8849ae1 (empty) (no description set)
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -218,7 +218,7 @@ fn test_resolve_workspace_directory() {
let output = sub_dir.run_jj(["status", "-R", "../.."]);
insta::assert_snapshot!(output, @r"
The working copy has no changes.
Working copy (@) : qpvuntsm 230dd059 (empty) (no description set)
Working copy (@) : qpvuntsm e8849ae1 (empty) (no description set)
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -424,7 +424,7 @@ fn test_color_config() {
// Test that --color=always is respected.
let output = work_dir.run_jj(["--color=always", "log", "-T", "commit_id"]);
insta::assert_snapshot!(output, @r"
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -433,7 +433,7 @@ fn test_color_config() {
test_env.add_config(r#"ui.color="always""#);
let output = work_dir.run_jj(["log", "-T", "commit_id"]);
insta::assert_snapshot!(output, @r"
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -441,7 +441,7 @@ fn test_color_config() {
// Test that --color=never overrides the config.
let output = work_dir.run_jj(["--color=never", "log", "-T", "commit_id"]);
insta::assert_snapshot!(output, @r"
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -449,7 +449,7 @@ fn test_color_config() {
// Test that --color=auto overrides the config.
let output = work_dir.run_jj(["--color=auto", "log", "-T", "commit_id"]);
insta::assert_snapshot!(output, @r"
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -457,7 +457,7 @@ fn test_color_config() {
// Test that --config 'ui.color=never' overrides the config.
let output = work_dir.run_jj(["--config=ui.color=never", "log", "-T", "commit_id"]);
insta::assert_snapshot!(output, @r"
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -472,7 +472,7 @@ fn test_color_config() {
"commit_id",
]);
insta::assert_snapshot!(output, @r"
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -482,7 +482,7 @@ fn test_color_config() {
let work_dir = test_env.work_dir("repo");
let output = work_dir.run_jj(["log", "-T", "commit_id"]);
insta::assert_snapshot!(output, @r"
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -491,7 +491,7 @@ fn test_color_config() {
work_dir.write_file(".jj/repo/config.toml", r#"ui.color = "never""#);
let output = work_dir.run_jj(["log", "-T", "commit_id"]);
insta::assert_snapshot!(output, @r"
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -573,7 +573,7 @@ fn test_color_ui_messages() {
"-Tdescription",
]);
insta::assert_snapshot!(output, @r"
167f90e7600a50f85c4f909b53eaf546faa82879
8afc18ff677d32e40043e1bc8c1683c2f9c2e916
<Error: No Commit available> (elided revisions)
0000000000000000000000000000000000000000
[EOF]
@@ -585,8 +585,8 @@ fn test_color_ui_messages() {
------- stderr -------
Error: Revset `..` resolved to more than one revision
Hint: The revset `..` resolved to these revisions:
 mzvwutvl 167f90e7 (empty) (no description set)
 qpvuntsm 230dd059 (empty) (no description set)
 mzvwutvl 8afc18ff (empty) (no description set)
 qpvuntsm e8849ae1 (empty) (no description set)
Hint: Prefix the expression with `all:` to allow any number of revisions (i.e. `all:..`).
[EOF]
[exit status: 1]
@@ -596,8 +596,8 @@ fn test_color_ui_messages() {
let output = work_dir.run_jj(["st", "--color", "debug"]);
insta::assert_snapshot!(output, @r"
The working copy has no changes.
Working copy (@) : <<working_copy change_id shortest prefix::m>><<working_copy change_id shortest rest::zvwutvl>><<working_copy:: >><<working_copy commit_id shortest prefix::1>><<working_copy commit_id shortest rest::67f90e7>><<working_copy:: >><<working_copy empty::(empty)>><<working_copy:: >><<working_copy empty description placeholder::(no description set)>>
Parent commit (@-): <<change_id shortest prefix::q>><<change_id shortest rest::pvuntsm>> <<commit_id shortest prefix::2>><<commit_id shortest rest::30dd059>> <<empty::(empty)>> <<empty description placeholder::(no description set)>>
Working copy (@) : <<working_copy change_id shortest prefix::m>><<working_copy change_id shortest rest::zvwutvl>><<working_copy:: >><<working_copy commit_id shortest prefix::8>><<working_copy commit_id shortest rest::afc18ff>><<working_copy:: >><<working_copy empty::(empty)>><<working_copy:: >><<working_copy empty description placeholder::(no description set)>>
Parent commit (@-): <<change_id shortest prefix::q>><<change_id shortest rest::pvuntsm>> <<commit_id shortest prefix::e>><<commit_id shortest rest::8849ae1>> <<empty::(empty)>> <<empty description placeholder::(no description set)>>
[EOF]
");
}
@@ -867,14 +867,14 @@ fn test_conditional_config() {
let output = test_env.run_jj_in(&test_env.home_dir().join("repo1"), ["foo"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: royxmykx 82899b03 (empty) repo1
Working copy (@) now at: royxmykx 7c486962 (empty) repo1
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
let output = test_env.run_jj_in(&test_env.home_dir().join("repo2"), ["foo"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: yqosqzyt 3bd315a9 (empty) home
Working copy (@) now at: yqosqzyt 072741b8 (empty) home
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -1003,7 +1003,7 @@ fn test_no_user_configured() {
});
insta::assert_snapshot!(output, @r#"
------- stderr -------
Working copy (@) now at: qpvuntsm 7a7d6016 (empty) without name
Working copy (@) now at: qpvuntsm 7e7014c2 (empty) without name
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Warning: Name not configured. Until configured, your commits will be created with the empty identity, and can't be pushed to remotes.
Hint: To configure, run:
@@ -1016,7 +1016,7 @@ fn test_no_user_configured() {
});
insta::assert_snapshot!(output, @r#"
------- stderr -------
Working copy (@) now at: qpvuntsm 906f8b89 (empty) without email
Working copy (@) now at: qpvuntsm 876580e3 (empty) without email
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Warning: Email not configured. Until configured, your commits will be created with the empty identity, and can't be pushed to remotes.
Hint: To configure, run:
@@ -1030,7 +1030,7 @@ fn test_no_user_configured() {
});
insta::assert_snapshot!(output, @r#"
------- stderr -------
Working copy (@) now at: qpvuntsm 57d3a489 (empty) without name and email
Working copy (@) now at: qpvuntsm f87356a1 (empty) without name and email
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Warning: Name and email not configured. Until configured, your commits will be created with the empty identity, and can't be pushed to remotes.
Hint: To configure, run:

134
cli/tests/test_immutable_commits.rs
View File

@@ -30,11 +30,11 @@ fn test_rewrite_immutable_generic() {
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 7adb43e8
@ 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 72e1b68c
│ ○ 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 b84b821b
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 c8c8515a
│ a
◆ zzzzzzzz root() 00000000
[EOF]
@@ -45,8 +45,8 @@ fn test_rewrite_immutable_generic() {
let output = work_dir.run_jj(["edit", "main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 72e1b68cbcf2 is immutable
Hint: Could not modify commit: kkmpptxz 72e1b68c main | b
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://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -59,8 +59,8 @@ fn test_rewrite_immutable_generic() {
let output = work_dir.run_jj(["edit", "main-"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit b84b821b8a2b is immutable
Hint: Could not modify commit: qpvuntsm b84b821b a
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://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -99,8 +99,8 @@ fn test_rewrite_immutable_generic() {
let output = work_dir.run_jj(["--ignore-immutable", "edit", "main"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz 72e1b68c main | b
Parent commit (@-) : qpvuntsm b84b821b a
Working copy (@) now at: kkmpptxz 9d190342 main | b
Parent commit (@-) : qpvuntsm c8c8515a a
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -120,8 +120,8 @@ fn test_rewrite_immutable_generic() {
let output = work_dir.run_jj(["new", "main"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: wqnwkozp fc921593 (empty) (no description set)
Parent commit (@-) : kkmpptxz 72e1b68c main | b
Working copy (@) now at: wqnwkozp 8fc35e6e (empty) (no description set)
Parent commit (@-) : kkmpptxz 9d190342 main | b
[EOF]
");
@@ -149,10 +149,10 @@ fn test_new_wc_commit_when_wc_immutable() {
let output = work_dir.run_jj(["bookmark", "set", "main", "-r@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 1 bookmarks to kkmpptxz a164195b main | (empty) a
Moved 1 bookmarks to kkmpptxz 28e8c405 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 ef5fa85b (empty) (no description set)
Parent commit (@-) : kkmpptxz a164195b main | (empty) a
Working copy (@) now at: zsuskuln e9901f56 (empty) (no description set)
Parent commit (@-) : kkmpptxz 28e8c405 main | (empty) a
[EOF]
");
}
@@ -170,8 +170,8 @@ fn test_immutable_heads_set_to_working_copy() {
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 7278b2d8 (empty) (no description set)
Parent commit (@-) : kkmpptxz a713ef56 (empty) a
Working copy (@) now at: pmmvwywv ca5945b4 (empty) (no description set)
Parent commit (@-) : kkmpptxz b693e0ee (empty) a
[EOF]
");
}
@@ -194,11 +194,11 @@ fn test_new_wc_commit_when_wc_immutable_multi_workspace() {
let output = work_dir.run_jj(["bookmark", "set", "main", "-r@"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Moved 1 bookmarks to kkmpptxz 7796c4df main | (empty) a
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 896465c4 (empty) (no description set)
Parent commit (@-) : kkmpptxz 7796c4df main | (empty) a
Working copy (@) now at: royxmykx cec19492 (empty) (no description set)
Parent commit (@-) : kkmpptxz e1cb4cf3 main | (empty) a
[EOF]
");
workspace1_dir
@@ -206,11 +206,11 @@ fn test_new_wc_commit_when_wc_immutable_multi_workspace() {
.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:11 workspace1@ ee0671fd
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@ 896465c4
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 7796c4df
kkmpptxz test.user@example.com 2001-02-03 08:05:09 main e1cb4cf3
(empty) a
zzzzzzzz root() 00000000
[EOF]
@@ -245,14 +245,14 @@ fn test_rewrite_immutable_commands() {
// 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 55641cc5
@ 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 bcab555f conflict
│ ◆ mzvwutvl test.user@example.com 2001-02-03 08:05:12 main 4397373a conflict
╭─┤ merge
│ │
│ ~
│
◆ kkmpptxz test.user@example.com 2001-02-03 08:05:10 72e1b68c
◆ kkmpptxz test.user@example.com 2001-02-03 08:05:10 9d190342
│ b
~
[EOF]
@@ -262,8 +262,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["abandon", "main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -276,8 +276,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["absorb", "--into=::@-"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 72e1b68cbcf2 is immutable
Hint: Could not modify commit: kkmpptxz 72e1b68c b
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://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -290,8 +290,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["file", "chmod", "-r=main", "x", "file"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -304,8 +304,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["describe", "main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -318,8 +318,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["diffedit", "-r=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -332,8 +332,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["edit", "main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -346,8 +346,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["new", "--insert-before", "main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -360,8 +360,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["new", "--insert-after", "description(b)"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -374,8 +374,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["parallelize", "description(b)", "main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -388,8 +388,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["rebase", "-s=main", "-d=@"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -402,8 +402,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["rebase", "-b=main", "-d=@"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 77cee210cbf5 is immutable
Hint: Could not modify commit: zsuskuln 77cee210 c
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://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -416,8 +416,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["rebase", "-r=main", "-d=@"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -430,8 +430,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["resolve", "-r=description(merge)", "file"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -444,8 +444,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["restore", "-c=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -458,8 +458,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["restore", "--into=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -472,8 +472,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["split", "-r=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -486,8 +486,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["squash", "-r=description(b)"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit 72e1b68cbcf2 is immutable
Hint: Could not modify commit: kkmpptxz 72e1b68c b
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://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -500,8 +500,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["squash", "--from=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -514,8 +514,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["squash", "--into=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -528,8 +528,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["sign", "-r=main", "--config=signing.backend=test"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits
@@ -542,8 +542,8 @@ fn test_rewrite_immutable_commands() {
let output = work_dir.run_jj(["unsign", "-r=main"]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: Commit bcab555fc80e is immutable
Hint: Could not modify commit: mzvwutvl bcab555f main | (conflict) merge
Error: Commit 4397373a0991 is immutable
Hint: Could not modify commit: mzvwutvl 4397373a main | (conflict) merge
Hint: Immutable commits are used to protect shared history.
Hint: For more information, see:
- https://jj-vcs.github.io/jj/latest/config/#set-of-immutable-commits

198
cli/tests/test_log_command.rs
View File

@@ -397,7 +397,7 @@ fn test_log_shortest_accessors() {
.success();
insta::assert_snapshot!(
render("original", r#"format_id(change_id) ++ " " ++ format_id(commit_id)"#),
@"q[pvuntsmwlqt] e[0e22b9fae75][EOF]");
@"q[pvuntsmwlqt] 8[216f646c36d][EOF]");
// Create a chain of 10 commits
for i in 1..10 {
@@ -415,36 +415,36 @@ fn test_log_shortest_accessors() {
insta::assert_snapshot!(
render("original", r#"format_id(change_id) ++ " " ++ format_id(commit_id)"#),
@"qpv[untsmwlqt] e0[e22b9fae75][EOF]");
@"qpv[untsmwlqt] 82[16f646c36d][EOF]");
insta::assert_snapshot!(
render("::@", r#"change_id.shortest() ++ " " ++ commit_id.shortest() ++ "\n""#), @r"
wq ed
km ef3
kp af
zn 23
yo b87
vr 1e
yq 34
ro cc
mz 1b
qpv e0
wq c2
km 74
kp 97
zn 78
yo 40
vr bc9
yq 28
ro af
mz 04
qpv 82
zzz 00
[EOF]
");
insta::assert_snapshot!(
render("::@", r#"format_id(change_id) ++ " " ++ format_id(commit_id) ++ "\n""#), @r"
wq[nwkozpkust] ed[e204633421]
km[kuslswpqwq] ef3[d013266cd]
kp[qxywonksrl] af[95b841712d]
zn[kkpsqqskkl] 23[c1103d3427]
yo[stqsxwqrlt] b87[aa9b24921]
vr[uxwmqvtpmx] 1e[a31a205ce9]
yq[osqzytrlsw] 34[befb94f4eb]
ro[yxmykxtrkr] cc[0c127948ef]
mz[vwutvlkqwt] 1b[7b715afc3f]
qpv[untsmwlqt] e0[e22b9fae75]
wq[nwkozpkust] c2[b4c0bb3362]
km[kuslswpqwq] 74[fcd50c0643]
kp[qxywonksrl] 97[dcaada9b8d]
zn[kkpsqqskkl] 78[c03ab2235b]
yo[stqsxwqrlt] 40[1119280761]
vr[uxwmqvtpmx] bc9[e8942b459]
yq[osqzytrlsw] 28[edbc9658ef]
ro[yxmykxtrkr] af[3e6a27a1d0]
mz[vwutvlkqwt] 04[6c6a1df762]
qpv[untsmwlqt] 82[16f646c36d]
zzz[zzzzzzzzz] 00[0000000000]
[EOF]
");
@@ -453,16 +453,16 @@ fn test_log_shortest_accessors() {
test_env.add_config(r#"revsets.short-prefixes = "(@----)::""#);
insta::assert_snapshot!(
render("::@", r#"format_id(change_id) ++ " " ++ format_id(commit_id) ++ "\n""#), @r"
w[qnwkozpkust] ed[e204633421]
km[kuslswpqwq] ef[3d013266cd]
kp[qxywonksrl] a[f95b841712d]
z[nkkpsqqskkl] 2[3c1103d3427]
y[ostqsxwqrlt] b[87aa9b24921]
vr[uxwmqvtpmx] 1e[a31a205ce9]
yq[osqzytrlsw] 34[befb94f4eb]
ro[yxmykxtrkr] cc[0c127948ef]
mz[vwutvlkqwt] 1b[7b715afc3f]
qpv[untsmwlqt] e0[e22b9fae75]
w[qnwkozpkust] c[2b4c0bb3362]
km[kuslswpqwq] 74[fcd50c0643]
kp[qxywonksrl] 9[7dcaada9b8d]
z[nkkpsqqskkl] 78[c03ab2235b]
y[ostqsxwqrlt] 4[01119280761]
vr[uxwmqvtpmx] bc9[e8942b459]
yq[osqzytrlsw] 28[edbc9658ef]
ro[yxmykxtrkr] af[3e6a27a1d0]
mz[vwutvlkqwt] 04[6c6a1df762]
qpv[untsmwlqt] 82[16f646c36d]
zzz[zzzzzzzzz] 00[0000000000]
[EOF]
");
@@ -471,16 +471,16 @@ fn test_log_shortest_accessors() {
test_env.add_config(r#"revsets.short-prefixes = """#);
insta::assert_snapshot!(
render("::@", r#"format_id(change_id) ++ " " ++ format_id(commit_id) ++ "\n""#), @r"
wq[nwkozpkust] ed[e204633421]
km[kuslswpqwq] ef3[d013266cd]
kp[qxywonksrl] af[95b841712d]
zn[kkpsqqskkl] 23c[1103d3427]
yo[stqsxwqrlt] b87[aa9b24921]
vr[uxwmqvtpmx] 1e[a31a205ce9]
yq[osqzytrlsw] 34[befb94f4eb]
ro[yxmykxtrkr] cc[0c127948ef]
mz[vwutvlkqwt] 1b[7b715afc3f]
qpv[untsmwlqt] e0[e22b9fae75]
wq[nwkozpkust] c2[b4c0bb3362]
km[kuslswpqwq] 74[fcd50c0643]
kp[qxywonksrl] 97[dcaada9b8d]
zn[kkpsqqskkl] 78[c03ab2235b]
yo[stqsxwqrlt] 401[119280761]
vr[uxwmqvtpmx] bc9[e8942b459]
yq[osqzytrlsw] 28[edbc9658ef]
ro[yxmykxtrkr] af[3e6a27a1d0]
mz[vwutvlkqwt] 04[6c6a1df762]
qpv[untsmwlqt] 82[16f646c36d]
zzz[zzzzzzzzz] 00[0000000000]
[EOF]
");
@@ -516,7 +516,7 @@ fn test_log_bad_short_prefixes() {
test_env.add_config("revsets.short-prefixes = 'missing'");
let output = work_dir.run_jj(["log", "-Tcommit_id.shortest()"]);
insta::assert_snapshot!(output, @r"
@ 2
@ e
◆ 0
[EOF]
------- stderr -------
@@ -572,7 +572,7 @@ fn test_log_prefix_highlight_styled() {
.success();
insta::assert_snapshot!(
work_dir.run_jj(["log", "-r", "original", "-T", &prefix_format(Some(12))]), @r"
@ Change qpvuntsmwlqt initial e0e22b9fae75 original
@ Change qpvuntsmwlqt initial 8216f646c36d original
│
~
[EOF]
@@ -594,7 +594,7 @@ fn test_log_prefix_highlight_styled() {
insta::assert_snapshot!(
work_dir.run_jj(["log", "-r", "original", "-T", &prefix_format(Some(12))]), @r"
○ Change qpvuntsmwlqt initial e0e22b9fae75 original
○ Change qpvuntsmwlqt initial 8216f646c36d original
│
~
[EOF]
@@ -608,16 +608,16 @@ fn test_log_prefix_highlight_styled() {
&prefix_format(Some(12)),
]);
insta::assert_snapshot!(output, @r"
@ Change wqnwkozpkust commit9 ede204633421
○ Change kmkuslswpqwq commit8 ef3d013266cd
○ Change kpqxywonksrl commit7 af95b841712d
○ Change znkkpsqqskkl commit6 23c1103d3427
○ Change yostqsxwqrlt commit5 b87aa9b24921
○ Change vruxwmqvtpmx commit4 1ea31a205ce9
○ Change yqosqzytrlsw commit3 34befb94f4eb
○ Change royxmykxtrkr commit2 cc0c127948ef
○ Change mzvwutvlkqwt commit1 1b7b715afc3f
○ Change qpvuntsmwlqt initial e0e22b9fae75 original
@ Change wqnwkozpkust commit9 c2b4c0bb3362
○ Change kmkuslswpqwq commit8 74fcd50c0643
○ Change kpqxywonksrl commit7 97dcaada9b8d
○ Change znkkpsqqskkl commit6 78c03ab2235b
○ Change yostqsxwqrlt commit5 401119280761
○ Change vruxwmqvtpmx commit4 bc9e8942b459
○ Change yqosqzytrlsw commit3 28edbc9658ef
○ Change royxmykxtrkr commit2 af3e6a27a1d0
○ Change mzvwutvlkqwt commit1 046c6a1df762
○ Change qpvuntsmwlqt initial 8216f646c36d original
◆ Change zzzzzzzzzzzz 000000000000
[EOF]
");
@@ -630,16 +630,16 @@ fn test_log_prefix_highlight_styled() {
&prefix_format(Some(3)),
]);
insta::assert_snapshot!(output, @r"
@ Change wqn commit9 ede
○ Change kmk commit8 ef3
○ Change kpq commit7 af9
○ Change znk commit6 23c
○ Change yos commit5 b87
○ Change vru commit4 1ea
○ Change yqo commit3 34b
○ Change roy commit2 cc0
○ Change mzv commit1 1b7
○ Change qpv initial e0e original
@ Change wqn commit9 c2b
○ Change kmk commit8 74f
○ Change kpq commit7 97d
○ Change znk commit6 78c
○ Change yos commit5 401
○ Change vru commit4 bc9
○ Change yqo commit3 28e
○ Change roy commit2 af3
○ Change mzv commit1 046
○ Change qpv initial 821 original
◆ Change zzz 000
[EOF]
");
@@ -652,16 +652,16 @@ fn test_log_prefix_highlight_styled() {
&prefix_format(None),
]);
insta::assert_snapshot!(output, @r"
@ Change wq commit9 ed
○ Change km commit8 ef3
○ Change kp commit7 af
○ Change zn commit6 23
○ Change yo commit5 b87
○ Change vr commit4 1e
○ Change yq commit3 34
○ Change ro commit2 cc
○ Change mz commit1 1b
○ Change qpv initial e0 original
@ Change wq commit9 c2
○ Change km commit8 74
○ Change kp commit7 97
○ Change zn commit6 78
○ Change yo commit5 40
○ Change vr commit4 bc9
○ Change yq commit3 28
○ Change ro commit2 af
○ Change mz commit1 04
○ Change qpv initial 82 original
◆ Change zzz 00
[EOF]
");
@@ -697,8 +697,8 @@ fn test_log_prefix_highlight_counts_hidden_commits() {
.run_jj(["bookmark", "c", "-r@", "original"])
.success();
insta::assert_snapshot!(work_dir.run_jj(["log", "-r", "all()", "-T", prefix_format]), @r"
@ Change q[pvuntsmwlqt] initial e0[e22b9fae75] original
◆ Change z[zzzzzzzzzzz] 0[00000000000]
@ Change q[pvuntsmwlqt] initial 8[216f646c36d] original
◆ Change z[zzzzzzzzzzz] 00[0000000000]
[EOF]
");
@@ -713,8 +713,8 @@ fn test_log_prefix_highlight_counts_hidden_commits() {
// The unique prefixes became longer.
insta::assert_snapshot!(work_dir.run_jj(["log", "-T", prefix_format]), @r"
@ Change wq[nwkozpkust] 44[4c3c5066d3]
│ ○ Change qpv[untsmwlqt] initial e0e[22b9fae75] original
@ Change wq[nwkozpkust] 88[e8407a4f0a]
│ ○ Change qpv[untsmwlqt] initial 82[16f646c36d] original
├─╯
◆ Change zzz[zzzzzzzzz] 00[0000000000]
[EOF]
@@ -726,10 +726,10 @@ fn test_log_prefix_highlight_counts_hidden_commits() {
[exit status: 1]
");
insta::assert_snapshot!(work_dir.run_jj(["log", "-r", "44", "-T", prefix_format]), @r"
@ Change wq[nwkozpkust] 44[4c3c5066d3]
│
~
------- stderr -------
Error: Revision `44` doesn't exist
[EOF]
[exit status: 1]
");
}
@@ -742,13 +742,13 @@ fn test_log_short_shortest_length_parameter() {
insta::assert_snapshot!(
render(r#"commit_id.short(0) ++ "|" ++ commit_id.shortest(0)"#), @r"
@ |2
@ |e
◆ |0
[EOF]
");
insta::assert_snapshot!(
render(r#"commit_id.short(-0) ++ "|" ++ commit_id.shortest(-0)"#), @r"
@ |2
@ |e
◆ |0
[EOF]
");
@@ -760,7 +760,7 @@ fn test_log_short_shortest_length_parameter() {
");
insta::assert_snapshot!(
render(r#"commit_id.short(100) ++ "|" ++ commit_id.shortest(100)"#), @r"
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22|230dd059e1b059aefc0da06a2e5a7dbf22362f22
@ e8849ae12c709f2321908879bc724fdb2ab8a781|e8849ae12c709f2321908879bc724fdb2ab8a781
◆ 0000000000000000000000000000000000000000|0000000000000000000000000000000000000000
[EOF]
");
@@ -773,7 +773,7 @@ fn test_log_author_format() {
let work_dir = test_env.work_dir("repo");
insta::assert_snapshot!(work_dir.run_jj(["log", "--revisions=@"]), @r"
@ qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059
@ qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
~
[EOF]
@@ -786,7 +786,7 @@ fn test_log_author_format() {
"log",
"--revisions=@",
]), @r"
@ qpvuntsm test.user 2001-02-03 08:05:07 230dd059
@ qpvuntsm test.user 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
~
[EOF]
@@ -1380,25 +1380,25 @@ fn test_log_word_wrap() {
// ui.log-word-wrap option applies to both graph/no-graph outputs
insta::assert_snapshot!(render(&["log", "-r@"], 40, false), @r"
@ mzvwutvl test.user@example.com 2001-02-03 08:05:11 f3efbd00
@ mzvwutvl test.user@example.com 2001-02-03 08:05:11 bafb1ee5
│ (empty) merge
~
[EOF]
");
insta::assert_snapshot!(render(&["log", "-r@"], 40, true), @r"
@ mzvwutvl test.user@example.com
│ 2001-02-03 08:05:11 f3efbd00
│ 2001-02-03 08:05:11 bafb1ee5
~ (empty) merge
[EOF]
");
insta::assert_snapshot!(render(&["log", "--no-graph", "-r@"], 40, false), @r"
mzvwutvl test.user@example.com 2001-02-03 08:05:11 f3efbd00
mzvwutvl test.user@example.com 2001-02-03 08:05:11 bafb1ee5
(empty) merge
[EOF]
");
insta::assert_snapshot!(render(&["log", "--no-graph", "-r@"], 40, true), @r"
mzvwutvl test.user@example.com
2001-02-03 08:05:11 f3efbd00
2001-02-03 08:05:11 bafb1ee5
(empty) merge
[EOF]
");
@@ -1406,7 +1406,7 @@ fn test_log_word_wrap() {
// Color labels should be preserved
insta::assert_snapshot!(render(&["log", "-r@", "--color=always"], 40, true), @r"
@ mzvwutvl test.user@example.com
│ 2001-02-03 08:05:11 f3efbd00
│ 2001-02-03 08:05:11 bafb1ee5
~ (empty) merge
[EOF]
");
@@ -1441,7 +1441,7 @@ fn test_log_word_wrap() {
│ test.user@example.com
~ 2001-02-03
08:05:11
f3efbd00
bafb1ee5
(empty)
merge
[EOF]
@@ -1451,7 +1451,7 @@ fn test_log_word_wrap() {
│ test.user@example.com
~ 2001-02-03
08:05:11
f3efbd00
bafb1ee5
(empty)
merge
[EOF]
@@ -1472,11 +1472,11 @@ fn test_log_diff_stat_width() {
work_dir.write_file("file2", "foo\n".repeat(100));
insta::assert_snapshot!(render(&["log", "--stat", "--no-graph"], 30), @r"
rlvkpnrz test.user@example.com 2001-02-03 08:05:09 287520bf
rlvkpnrz test.user@example.com 2001-02-03 08:05:09 9490cfd3
(no description set)
file2 | 100 +++++++++++++++
1 file changed, 100 insertions(+), 0 deletions(-)
qpvuntsm test.user@example.com 2001-02-03 08:05:08 e292def1
qpvuntsm test.user@example.com 2001-02-03 08:05:08 79f0968d
(no description set)
file1 | 100 +++++++++++++++
1 file changed, 100 insertions(+), 0 deletions(-)
@@ -1487,11 +1487,11 @@ fn test_log_diff_stat_width() {
// Graph width should be subtracted
insta::assert_snapshot!(render(&["log", "--stat"], 30), @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 287520bf
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 9490cfd3
│ (no description set)
│ file2 | 100 ++++++++++++
│ 1 file changed, 100 insertions(+), 0 deletions(-)
│ ○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 e292def1
│ ○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 79f0968d
├─╯ (no description set)
│ file1 | 100 ++++++++++
│ 1 file changed, 100 insertions(+), 0 deletions(-)
@@ -1697,7 +1697,7 @@ fn test_log_full_description_template() {
let output = work_dir.run_jj(["log", "-T", "builtin_log_compact_full_description"]);
insta::assert_snapshot!(output, @r"
@ qpvuntsm test.user@example.com 2001-02-03 08:05:08 1c504ec6
@ qpvuntsm test.user@example.com 2001-02-03 08:05:08 37b69cda
│ (empty) this is commit with a multiline description
│
│ <full description>

108
cli/tests/test_new_command.rs
View File

@@ -26,8 +26,8 @@ fn test_new() {
work_dir.run_jj(["new", "-m", "a new commit"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 34f3c770f1db22ac5c58df21d587aed1a030201f a new commit
○ bf8753cb48b860b68386c5c8cc997e8e37122485 add a file
@ 22aec45f30a36a2d244c70e131e369d79e400962 a new commit
○ 55eabcc47301440da7a71d5610d3db021d1925ca add a file
◆ 0000000000000000000000000000000000000000
[EOF]
");
@@ -37,9 +37,9 @@ fn test_new() {
.run_jj(["new", "-m", "off of root", "root()"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 026537ddb96b801b9cb909985d5443aab44616c1 off of root
│ ○ 34f3c770f1db22ac5c58df21d587aed1a030201f a new commit
│ ○ bf8753cb48b860b68386c5c8cc997e8e37122485 add a file
@ 8818c9ee28d00667cb3072a2114a67619ded7ceb off of root
│ ○ 22aec45f30a36a2d244c70e131e369d79e400962 a new commit
│ ○ 55eabcc47301440da7a71d5610d3db021d1925ca add a file
├─╯
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -50,10 +50,10 @@ fn test_new() {
.run_jj(["new", "--edit", "-m", "yet another commit"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 101cbec5cae8049cb9850a906ef3675631ed48fa yet another commit
○ 026537ddb96b801b9cb909985d5443aab44616c1 off of root
│ ○ 34f3c770f1db22ac5c58df21d587aed1a030201f a new commit
│ ○ bf8753cb48b860b68386c5c8cc997e8e37122485 add a file
@ 9629f035563a7d9fa86becc783ae71557bd25269 yet another commit
○ 8818c9ee28d00667cb3072a2114a67619ded7ceb off of root
│ ○ 22aec45f30a36a2d244c70e131e369d79e400962 a new commit
│ ○ 55eabcc47301440da7a71d5610d3db021d1925ca add a file
├─╯
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -92,10 +92,10 @@ fn test_new_merge() {
// Create a merge commit
work_dir.run_jj(["new", "main", "@"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 2f9a61ea1fef257eca52fcee2feec1cbd2e41660
@ fd495246497571ee53aa327ac3d1e7846a1eeefd
├─╮
│ ○ f399209d9dda06e8a25a0c8e9a0cde9f421ff35d add file2
○ │ 8d996e001c23e298d0d353ab455665c81bf2080c add file1
│ ○ 5bf404a038660799fae348cc31b9891349c128c1 add file2
○ │ 96ab002e5b86c39a661adc0524df211a3dac3f1b add file1
├─╯
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -110,14 +110,14 @@ fn test_new_merge() {
let output = work_dir.run_jj(["new", "main", "@", "--no-edit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Created new commit znkkpsqq 496490a6 (empty) (no description set)
Created new commit znkkpsqq bffdc06a (empty) (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
○ 496490a66cebb31730c4103b7b22a1098d49af91
○ bffdc06aa66a747b995371bf39a4ac640c9c4386
├─╮
│ @ f399209d9dda06e8a25a0c8e9a0cde9f421ff35d add file2
○ │ 8d996e001c23e298d0d353ab455665c81bf2080c add file1
│ @ 5bf404a038660799fae348cc31b9891349c128c1 add file2
○ │ 96ab002e5b86c39a661adc0524df211a3dac3f1b add file1
├─╯
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -127,10 +127,10 @@ fn test_new_merge() {
work_dir.run_jj(["undo"]).success();
work_dir.run_jj(["new", "main", "@"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 114023233c454e2eca22b8b209f9e42f755eb28c
@ e6e472a9b9caff61ab319a8fb8664db62c6e65af
├─╮
│ ○ f399209d9dda06e8a25a0c8e9a0cde9f421ff35d add file2
○ │ 8d996e001c23e298d0d353ab455665c81bf2080c add file1
│ ○ 5bf404a038660799fae348cc31b9891349c128c1 add file2
○ │ 96ab002e5b86c39a661adc0524df211a3dac3f1b add file1
├─╯
◆ 0000000000000000000000000000000000000000
[EOF]
@@ -148,8 +148,8 @@ fn test_new_merge() {
let output = work_dir.run_jj(["new", "@", "all:visible_heads()"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: nkmrtpmo ed2dc1d9 (empty) (no description set)
Parent commit (@-) : wqnwkozp 11402323 (empty) (no description set)
Working copy (@) now at: nkmrtpmo 24484bf7 (empty) (no description set)
Parent commit (@-) : wqnwkozp e6e472a9 (empty) (no description set)
[EOF]
");
@@ -188,9 +188,9 @@ fn test_new_insert_after() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Working copy (@) now at: kxryzmor 1fc93fd1 (empty) G
Parent commit (@-) : kkmpptxz bfd4157e B | (empty) B
Parent commit (@-) : vruxwmqv c9257eff D | (empty) D
Working copy (@) now at: kxryzmor 57acfedf (empty) G
Parent commit (@-) : kkmpptxz bb98b010 B | (empty) B
Parent commit (@-) : vruxwmqv 521674f5 D | (empty) D
[EOF]
");
insta::assert_snapshot!(get_short_log_output(&work_dir), @r"
@@ -213,8 +213,8 @@ fn test_new_insert_after() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 3 descendant commits
Working copy (@) now at: uyznsvlq fcf8281b (empty) H
Parent commit (@-) : vruxwmqv c9257eff D | (empty) D
Working copy (@) now at: uyznsvlq fd3f1413 (empty) H
Parent commit (@-) : vruxwmqv 521674f5 D | (empty) D
[EOF]
");
insta::assert_snapshot!(get_short_log_output(&work_dir), @r"
@@ -281,7 +281,7 @@ fn test_new_insert_after_children() {
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Refusing to create a loop: commit 83376b270925 would be both an ancestor and a descendant of the new commit
Error: Refusing to create a loop: commit d32ebe56a293 would be both an ancestor and a descendant of the new commit
[EOF]
[exit status: 1]
");
@@ -319,10 +319,10 @@ fn test_new_insert_before() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Working copy (@) now at: kxryzmor 7ed2d6ff (empty) G
Parent commit (@-) : kkmpptxz bfd4157e B | (empty) B
Parent commit (@-) : vruxwmqv c9257eff D | (empty) D
Parent commit (@-) : znkkpsqq 41a89ffc E | (empty) E
Working copy (@) now at: kxryzmor 2f16c40d (empty) G
Parent commit (@-) : kkmpptxz bb98b010 B | (empty) B
Parent commit (@-) : vruxwmqv 521674f5 D | (empty) D
Parent commit (@-) : znkkpsqq 56a33cd0 E | (empty) E
[EOF]
");
insta::assert_snapshot!(get_short_log_output(&work_dir), @r"
@@ -387,7 +387,7 @@ fn test_new_insert_before_root_successors() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 5 descendant commits
Working copy (@) now at: kxryzmor 36541977 (empty) G
Working copy (@) now at: kxryzmor 8c026b06 (empty) G
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -416,14 +416,14 @@ fn test_new_insert_before_no_loop() {
let template = r#"commit_id.short() ++ " " ++ if(description, description, "root")"#;
let output = work_dir.run_jj(["log", "-T", template]);
insta::assert_snapshot!(output, @r"
@ 7705d353bf5d F
@ a8176a8a5348 F
├─╮
│ ○ 41a89ffcbba2 E
○ │ c9257eff5bf9 D
│ ○ 56a33cd09d90 E
○ │ 521674f591a6 D
├─╯
│ ○ 83376b270925 C
│ ○ bfd4157e6ea4 B
│ ○ 5ef24e4bf2be A
│ ○ d32ebe56a293 C
│ ○ bb98b0102ef5 B
│ ○ 515354d01f1b A
├─╯
◆ 000000000000 root
[EOF]
@@ -440,7 +440,7 @@ fn test_new_insert_before_no_loop() {
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Refusing to create a loop: commit bfd4157e6ea4 would be both an ancestor and a descendant of the new commit
Error: Refusing to create a loop: commit bb98b0102ef5 would be both an ancestor and a descendant of the new commit
[EOF]
[exit status: 1]
");
@@ -536,8 +536,8 @@ fn test_new_insert_after_before() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: kxryzmor 78a97058 (empty) G
Parent commit (@-) : mzvwutvl 83376b27 C | (empty) C
Working copy (@) now at: kxryzmor 55a63f47 (empty) G
Parent commit (@-) : mzvwutvl d32ebe56 C | (empty) C
[EOF]
");
insta::assert_snapshot!(get_short_log_output(&work_dir), @r"
@@ -559,8 +559,8 @@ fn test_new_insert_after_before() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 4 descendant commits
Working copy (@) now at: uyznsvlq fcf8281b (empty) H
Parent commit (@-) : vruxwmqv c9257eff D | (empty) D
Working copy (@) now at: uyznsvlq fd3f1413 (empty) H
Parent commit (@-) : vruxwmqv 521674f5 D | (empty) D
[EOF]
");
insta::assert_snapshot!(get_short_log_output(&work_dir), @r"
@@ -591,14 +591,14 @@ fn test_new_insert_after_before_no_loop() {
let template = r#"commit_id.short() ++ " " ++ if(description, description, "root")"#;
let output = work_dir.run_jj(["log", "-T", template]);
insta::assert_snapshot!(output, @r"
@ 7705d353bf5d F
@ a8176a8a5348 F
├─╮
│ ○ 41a89ffcbba2 E
○ │ c9257eff5bf9 D
│ ○ 56a33cd09d90 E
○ │ 521674f591a6 D
├─╯
│ ○ 83376b270925 C
│ ○ bfd4157e6ea4 B
│ ○ 5ef24e4bf2be A
│ ○ d32ebe56a293 C
│ ○ bb98b0102ef5 B
│ ○ 515354d01f1b A
├─╯
◆ 000000000000 root
[EOF]
@@ -615,7 +615,7 @@ fn test_new_insert_after_before_no_loop() {
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Refusing to create a loop: commit 83376b270925 would be both an ancestor and a descendant of the new commit
Error: Refusing to create a loop: commit d32ebe56a293 would be both an ancestor and a descendant of the new commit
[EOF]
[exit status: 1]
");
@@ -652,8 +652,8 @@ fn test_new_conflicting_bookmarks() {
Error: Revset `foo` resolved to more than one revision
Hint: Bookmark foo resolved to multiple revisions because it's conflicted.
It resolved to these revisions:
kkmpptxz 66c6502d foo?? | (empty) two
qpvuntsm 876f4b7e foo?? | (empty) one
kkmpptxz 96948328 foo?? | (empty) two
qpvuntsm 401ea16f foo?? | (empty) one
Hint: Set which revision the bookmark points to with `jj bookmark set foo -r <REVISION>`.
[EOF]
[exit status: 1]
@@ -679,8 +679,8 @@ fn test_new_conflicting_change_ids() {
------- stderr -------
Error: Revset `qpvuntsm` resolved to more than one revision
Hint: The revset `qpvuntsm` resolved to these revisions:
qpvuntsm?? 66c6502d (empty) two
qpvuntsm?? 876f4b7e (empty) one
qpvuntsm?? 2f175dfc (empty) two
qpvuntsm?? 401ea16f (empty) one
Hint: Some of these commits have the same change id. Abandon one of them with `jj abandon -r <REVISION>`.
[EOF]
[exit status: 1]

148
cli/tests/test_next_prev_commands.rs
View File

@@ -59,8 +59,8 @@ fn test_next_simple() {
let output = work_dir.run_jj(["next"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: vruxwmqv 0c7d7732 (empty) (no description set)
Parent commit (@-) : kkmpptxz 30056b0c (empty) third
Working copy (@) now at: vruxwmqv 01f06d39 (empty) (no description set)
Parent commit (@-) : kkmpptxz 7576de42 (empty) third
[EOF]
");
@@ -101,8 +101,8 @@ fn test_next_multiple() {
let output = work_dir.run_jj(["next", "2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: vruxwmqv 41cc776d (empty) (no description set)
Parent commit (@-) : zsuskuln 9d7e5e99 (empty) fourth
Working copy (@) now at: vruxwmqv a53dd783 (empty) (no description set)
Parent commit (@-) : zsuskuln c5025ce1 (empty) fourth
[EOF]
");
@@ -138,8 +138,8 @@ fn test_prev_simple() {
let output = work_dir.run_jj(["prev"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: royxmykx 6db74f64 (empty) (no description set)
Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
Working copy (@) now at: royxmykx 539f176b (empty) (no description set)
Parent commit (@-) : rlvkpnrz 9439bf06 (empty) second
[EOF]
");
@@ -177,8 +177,8 @@ fn test_prev_multiple_without_root() {
let output = work_dir.run_jj(["prev", "2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: yqosqzyt 794ffd20 (empty) (no description set)
Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
Working copy (@) now at: yqosqzyt a4d3accb (empty) (no description set)
Parent commit (@-) : rlvkpnrz 9439bf06 (empty) second
[EOF]
");
@@ -218,7 +218,7 @@ fn test_next_exceeding_history() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: No other descendant found 3 commit(s) forward from the working copy parent(s)
Hint: Working copy parent: qpvuntsm fa15625b (empty) first
Hint: Working copy parent: qpvuntsm 68a50538 (empty) first
[EOF]
[exit status: 1]
");
@@ -250,8 +250,8 @@ fn test_next_parent_has_multiple_descendants() {
let output = work_dir.run_jj(["next", "--edit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: mzvwutvl 1b8531ce (empty) 4
Parent commit (@-) : zsuskuln b1394455 (empty) 3
Working copy (@) now at: mzvwutvl e5543950 (empty) 4
Parent commit (@-) : zsuskuln 83df6e43 (empty) 3
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@@ -294,8 +294,8 @@ fn test_next_with_merge_commit_parent() {
let output = work_dir.run_jj(["next"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: vruxwmqv e2cefcb7 (empty) (no description set)
Parent commit (@-) : mzvwutvl b54bbdea (empty) 4
Working copy (@) now at: vruxwmqv 7a09c355 (empty) (no description set)
Parent commit (@-) : mzvwutvl f02c921e (empty) 4
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@@ -338,8 +338,8 @@ fn test_next_on_merge_commit() {
let output = work_dir.run_jj(["next", "--edit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: mzvwutvl b54bbdea (empty) 4
Parent commit (@-) : zsuskuln 5542f0b4 (empty) 3
Working copy (@) now at: mzvwutvl f02c921e (empty) 4
Parent commit (@-) : zsuskuln d2500577 (empty) 3
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@@ -381,8 +381,8 @@ fn test_next_fails_on_bookmarking_children_no_stdin() {
insta::assert_snapshot!(output, @r"
------- stderr -------
ambiguous next commit, choose one to target:
1: zsuskuln 5f24490d (empty) third
2: rlvkpnrz 9ed53a4a (empty) second
1: zsuskuln 6fc6af46 (empty) third
2: rlvkpnrz 9439bf06 (empty) second
q: quit the prompt
Error: Cannot prompt for input since the output is not connected to a terminal
[EOF]
@@ -417,8 +417,8 @@ fn test_next_fails_on_bookmarking_children_quit_prompt() {
insta::assert_snapshot!(output, @r"
------- stderr -------
ambiguous next commit, choose one to target:
1: zsuskuln 5f24490d (empty) third
2: rlvkpnrz 9ed53a4a (empty) second
1: zsuskuln 6fc6af46 (empty) third
2: rlvkpnrz 9439bf06 (empty) second
q: quit the prompt
enter the index of the commit you want to target: Error: ambiguous target commit
[EOF]
@@ -443,12 +443,12 @@ fn test_next_choose_bookmarking_child() {
insta::assert_snapshot!(output, @r"
------- stderr -------
ambiguous next commit, choose one to target:
1: royxmykx d00fe885 (empty) fourth
2: zsuskuln 5f24490d (empty) third
3: rlvkpnrz 9ed53a4a (empty) second
1: royxmykx 3522c887 (empty) fourth
2: zsuskuln 6fc6af46 (empty) third
3: rlvkpnrz 9439bf06 (empty) second
q: quit the prompt
enter the index of the commit you want to target: Working copy (@) now at: yostqsxw 5c8fa96d (empty) (no description set)
Parent commit (@-) : zsuskuln 5f24490d (empty) third
enter the index of the commit you want to target: Working copy (@) now at: yostqsxw 683938a4 (empty) (no description set)
Parent commit (@-) : zsuskuln 6fc6af46 (empty) third
[EOF]
");
}
@@ -478,7 +478,7 @@ fn test_prev_on_merge_commit() {
let output = work_dir.run_jj(["prev"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: vruxwmqv 41658cf4 (empty) (no description set)
Working copy (@) now at: vruxwmqv b64f323d (empty) (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -492,10 +492,10 @@ fn test_prev_on_merge_commit() {
insta::assert_snapshot!(output, @r"
------- stderr -------
ambiguous prev commit, choose one to target:
1: zsuskuln b0d21db3 right | (empty) second
2: qpvuntsm fa15625b left | (empty) first
1: zsuskuln 22a08bc0 right | (empty) second
2: qpvuntsm 68a50538 left | (empty) first
q: quit the prompt
enter the index of the commit you want to target: Working copy (@) now at: qpvuntsm fa15625b left | (empty) first
enter the index of the commit you want to target: Working copy (@) now at: qpvuntsm 68a50538 left | (empty) first
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -535,12 +535,12 @@ fn test_prev_on_merge_commit_with_parent_merge() {
insta::assert_snapshot!(output, @r"
------- stderr -------
ambiguous prev commit, choose one to target:
1: kkmpptxz 146d5c67 (empty) y
2: qpvuntsm 6799aaa2 (empty) x
1: kkmpptxz ab947132 (empty) y
2: qpvuntsm 007e88d2 (empty) x
3: zzzzzzzz 00000000 (empty) (no description set)
q: quit the prompt
enter the index of the commit you want to target: Working copy (@) now at: vruxwmqv e5a6794c (empty) (no description set)
Parent commit (@-) : qpvuntsm 6799aaa2 (empty) x
enter the index of the commit you want to target: Working copy (@) now at: vruxwmqv ff8922ba (empty) (no description set)
Parent commit (@-) : qpvuntsm 007e88d2 (empty) x
[EOF]
");
@@ -553,12 +553,12 @@ fn test_prev_on_merge_commit_with_parent_merge() {
insta::assert_snapshot!(output, @r"
------- stderr -------
ambiguous prev commit, choose one to target:
1: mzvwutvl 89b8a355 (empty) 1
2: zsuskuln a83fc061 (empty) z
1: mzvwutvl 0e8fc48c (empty) 1
2: zsuskuln e7382ca4 (empty) z
q: quit the prompt
enter the index of the commit you want to target: Working copy (@) now at: zsuskuln a83fc061 (empty) z
Parent commit (@-) : qpvuntsm 6799aaa2 (empty) x
Parent commit (@-) : kkmpptxz 146d5c67 (empty) y
enter the index of the commit you want to target: Working copy (@) now at: zsuskuln e7382ca4 (empty) z
Parent commit (@-) : qpvuntsm 007e88d2 (empty) x
Parent commit (@-) : kkmpptxz ab947132 (empty) y
[EOF]
");
}
@@ -602,12 +602,12 @@ fn test_prev_prompts_on_multiple_parents() {
insta::assert_snapshot!(output, @r"
------- stderr -------
ambiguous prev commit, choose one to target:
1: mzvwutvl bc4f4fe3 (empty) third
2: kkmpptxz b0d21db3 (empty) second
3: qpvuntsm fa15625b (empty) first
1: mzvwutvl 5ec63817 (empty) third
2: kkmpptxz e8959fbd (empty) second
3: qpvuntsm 68a50538 (empty) first
q: quit the prompt
enter the index of the commit you want to target: Working copy (@) now at: kpqxywon ddac00b0 (empty) (no description set)
Parent commit (@-) : qpvuntsm fa15625b (empty) first
enter the index of the commit you want to target: Working copy (@) now at: kpqxywon 5448803a (empty) (no description set)
Parent commit (@-) : qpvuntsm 68a50538 (empty) first
[EOF]
");
@@ -645,9 +645,9 @@ fn test_prev_prompts_on_multiple_parents() {
insta::assert_snapshot!(output,@r"
------- stderr -------
Error: No other descendant found 1 commit(s) forward from the working copy parent(s)
Hint: Working copy parent: mzvwutvl bc4f4fe3 (empty) third
Hint: Working copy parent: kkmpptxz b0d21db3 (empty) second
Hint: Working copy parent: qpvuntsm fa15625b (empty) first
Hint: Working copy parent: mzvwutvl 5ec63817 (empty) third
Hint: Working copy parent: kkmpptxz e8959fbd (empty) second
Hint: Working copy parent: qpvuntsm 68a50538 (empty) first
[EOF]
[exit status: 1]
");
@@ -676,7 +676,7 @@ fn test_prev_beyond_root_fails() {
insta::assert_snapshot!(output,@r"
------- stderr -------
Error: No ancestor found 5 commit(s) back from the working copy parents(s)
Hint: Working copy parent: zsuskuln 9d7e5e99 (empty) fourth
Hint: Working copy parent: zsuskuln c5025ce1 (empty) fourth
[EOF]
[exit status: 1]
");
@@ -707,8 +707,8 @@ fn test_prev_editing() {
let output = work_dir.run_jj(["prev", "--edit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz 30056b0c (empty) third
Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
Working copy (@) now at: kkmpptxz 7576de42 (empty) third
Parent commit (@-) : rlvkpnrz 9439bf06 (empty) second
[EOF]
");
@@ -746,8 +746,8 @@ fn test_next_editing() {
let output = work_dir.run_jj(["next", "--edit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz 30056b0c (empty) third
Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
Working copy (@) now at: kkmpptxz 7576de42 (empty) third
Parent commit (@-) : rlvkpnrz 9439bf06 (empty) second
[EOF]
");
@@ -936,7 +936,7 @@ fn test_next_conflict_head() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: The working copy has no descendants with conflicts
Hint: Working copy: rlvkpnrz 0273eeab (conflict) (no description set)
Hint: Working copy: rlvkpnrz 5f088cac (conflict) (no description set)
[EOF]
[exit status: 1]
");
@@ -975,8 +975,8 @@ fn test_movement_edit_mode_true() {
let output = work_dir.run_jj(["prev"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: rlvkpnrz 9ed53a4a (empty) second
Parent commit (@-) : qpvuntsm fa15625b (empty) first
Working copy (@) now at: rlvkpnrz 9439bf06 (empty) second
Parent commit (@-) : qpvuntsm 68a50538 (empty) first
[EOF]
");
@@ -991,7 +991,7 @@ fn test_movement_edit_mode_true() {
let output = work_dir.run_jj(["prev"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: qpvuntsm fa15625b (empty) first
Working copy (@) now at: qpvuntsm 68a50538 (empty) first
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -1015,8 +1015,8 @@ fn test_movement_edit_mode_true() {
let output = work_dir.run_jj(["next"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: rlvkpnrz 9ed53a4a (empty) second
Parent commit (@-) : qpvuntsm fa15625b (empty) first
Working copy (@) now at: rlvkpnrz 9439bf06 (empty) second
Parent commit (@-) : qpvuntsm 68a50538 (empty) first
[EOF]
");
@@ -1031,8 +1031,8 @@ fn test_movement_edit_mode_true() {
let output = work_dir.run_jj(["next"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz 30056b0c (empty) third
Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
Working copy (@) now at: kkmpptxz 7576de42 (empty) third
Parent commit (@-) : rlvkpnrz 9439bf06 (empty) second
[EOF]
");
@@ -1047,8 +1047,8 @@ fn test_movement_edit_mode_true() {
let output = work_dir.run_jj(["prev", "--no-edit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: uyznsvlq 7ad57fb8 (empty) (no description set)
Parent commit (@-) : qpvuntsm fa15625b (empty) first
Working copy (@) now at: uyznsvlq 1062d305 (empty) (no description set)
Parent commit (@-) : qpvuntsm 68a50538 (empty) first
[EOF]
");
@@ -1065,8 +1065,8 @@ fn test_movement_edit_mode_true() {
let output = work_dir.run_jj(["next", "--no-edit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: xtnwkqum 7ac7a1c4 (empty) (no description set)
Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
Working copy (@) now at: xtnwkqum ccbc5bff (empty) (no description set)
Parent commit (@-) : rlvkpnrz 9439bf06 (empty) second
[EOF]
");
@@ -1084,7 +1084,7 @@ fn test_movement_edit_mode_true() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: No descendant found 1 commit(s) forward from the working copy
Hint: Working copy: xtnwkqum 7ac7a1c4 (empty) (no description set)
Hint: Working copy: xtnwkqum ccbc5bff (empty) (no description set)
[EOF]
[exit status: 1]
");
@@ -1125,8 +1125,8 @@ fn test_movement_edit_mode_false() {
let output = work_dir.run_jj(["prev", "--no-edit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: vruxwmqv 087a65b1 (empty) (no description set)
Parent commit (@-) : qpvuntsm fa15625b (empty) first
Working copy (@) now at: vruxwmqv 1a9aa547 (empty) (no description set)
Parent commit (@-) : qpvuntsm 68a50538 (empty) first
[EOF]
");
@@ -1144,7 +1144,7 @@ fn test_movement_edit_mode_false() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: No ancestor found 3 commit(s) back from the working copy parents(s)
Hint: Working copy parent: qpvuntsm fa15625b (empty) first
Hint: Working copy parent: qpvuntsm 68a50538 (empty) first
[EOF]
[exit status: 1]
");
@@ -1152,8 +1152,8 @@ fn test_movement_edit_mode_false() {
let output = work_dir.run_jj(["next"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kpqxywon d06750fb (empty) (no description set)
Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
Working copy (@) now at: kpqxywon 97dd6a5a (empty) (no description set)
Parent commit (@-) : rlvkpnrz 9439bf06 (empty) second
[EOF]
");
@@ -1170,16 +1170,16 @@ fn test_movement_edit_mode_false() {
let output = work_dir.run_jj(["next", "--no-edit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: wqnwkozp 10fa181f (empty) (no description set)
Parent commit (@-) : kkmpptxz 30056b0c (empty) third
Working copy (@) now at: wqnwkozp 525e0f84 (empty) (no description set)
Parent commit (@-) : kkmpptxz 7576de42 (empty) third
[EOF]
");
let output = work_dir.run_jj(["prev", "--edit", "2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: rlvkpnrz 9ed53a4a (empty) second
Parent commit (@-) : qpvuntsm fa15625b (empty) first
Working copy (@) now at: rlvkpnrz 9439bf06 (empty) second
Parent commit (@-) : qpvuntsm 68a50538 (empty) first
[EOF]
");
@@ -1194,8 +1194,8 @@ fn test_movement_edit_mode_false() {
let output = work_dir.run_jj(["next", "--edit"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz 30056b0c (empty) third
Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
Working copy (@) now at: kkmpptxz 7576de42 (empty) third
Parent commit (@-) : rlvkpnrz 9439bf06 (empty) second
[EOF]
");

754
cli/tests/test_operations.rs
View File

File diff suppressed because it is too large Load Diff

322
cli/tests/test_parallelize_command.rs
View File

@@ -27,12 +27,12 @@ fn test_parallelize_no_descendants() {
}
work_dir.run_jj(["describe", "-m=6"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 02b7709cc4e9 6 parents: 5
○ 1b2f08d76b66 5 parents: 4
○ e5c4cf44e237 4 parents: 3
○ 4cd999dfaac0 3 parents: 2
○ d3902619fade 2 parents: 1
○ 8b64ddff700d 1 parents:
@ e12cca0818cd 6 parents: 5
○ 44f4686efbe9 5 parents: 4
○ 6858f6e16a6c 4 parents: 3
○ 8cfb27e238c8 3 parents: 2
○ 320daf48ba58 2 parents: 1
○ 884fe9b9c656 1 parents:
◆ 000000000000 parents:
[EOF]
");
@@ -41,16 +41,16 @@ fn test_parallelize_no_descendants() {
.run_jj(["parallelize", "description(1)::"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 4850b4629edb 6 parents:
│ ○ 87627fbb7d29 5 parents:
@ 22b8a32d1949 6 parents:
│ ○ 436e81ced43f 5 parents:
├─╯
│ ○ 5b9815e28fae 4 parents:
│ ○ 823bf930aefb 4 parents:
├─╯
│ ○ bb1bb465ccc2 3 parents:
│ ○ 3b6586259aa9 3 parents:
├─╯
│ ○ 337eca1ef3a8 2 parents:
│ ○ dfd927ce07c0 2 parents:
├─╯
│ ○ 8b64ddff700d 1 parents:
│ ○ 884fe9b9c656 1 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -69,12 +69,12 @@ fn test_parallelize_with_descendants_simple() {
}
work_dir.run_jj(["describe", "-m=6"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 02b7709cc4e9 6 parents: 5
○ 1b2f08d76b66 5 parents: 4
○ e5c4cf44e237 4 parents: 3
○ 4cd999dfaac0 3 parents: 2
○ d3902619fade 2 parents: 1
○ 8b64ddff700d 1 parents:
@ e12cca0818cd 6 parents: 5
○ 44f4686efbe9 5 parents: 4
○ 6858f6e16a6c 4 parents: 3
○ 8cfb27e238c8 3 parents: 2
○ 320daf48ba58 2 parents: 1
○ 884fe9b9c656 1 parents:
◆ 000000000000 parents:
[EOF]
");
@@ -83,15 +83,15 @@ fn test_parallelize_with_descendants_simple() {
.run_jj(["parallelize", "description(1)::description(4)"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 9bc057f8b6e3 6 parents: 5
○ 9e36a8afe793 5 parents: 1 2 3 4
@ 75ac07d7dedc 6 parents: 5
○ 39791a4c42c5 5 parents: 1 2 3 4
├─┬─┬─╮
│ │ │ ○ 5b9815e28fae 4 parents:
│ │ ○ │ bb1bb465ccc2 3 parents:
│ │ │ ○ 823bf930aefb 4 parents:
│ │ ○ │ 3b6586259aa9 3 parents:
│ │ ├─╯
│ ○ │ 337eca1ef3a8 2 parents:
│ ○ │ dfd927ce07c0 2 parents:
│ ├─╯
○ │ 8b64ddff700d 1 parents:
○ │ 884fe9b9c656 1 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -115,14 +115,14 @@ fn test_parallelize_where_interior_has_non_target_children() {
.success();
work_dir.run_jj(["new", "description(5)", "-m=6"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 2508ea92308a 6 parents: 5
○ 1b2f08d76b66 5 parents: 4
○ e5c4cf44e237 4 parents: 3
○ 4cd999dfaac0 3 parents: 2
│ ○ 3e7571e62c87 2c parents: 2
@ 9554e07afe42 6 parents: 5
○ 44f4686efbe9 5 parents: 4
○ 6858f6e16a6c 4 parents: 3
○ 8cfb27e238c8 3 parents: 2
│ ○ a5a460ad9943 2c parents: 2
├─╯
○ d3902619fade 2 parents: 1
○ 8b64ddff700d 1 parents:
○ 320daf48ba58 2 parents: 1
○ 884fe9b9c656 1 parents:
◆ 000000000000 parents:
[EOF]
");
@@ -131,17 +131,17 @@ fn test_parallelize_where_interior_has_non_target_children() {
.run_jj(["parallelize", "description(1)::description(4)"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ c9525dff9d03 6 parents: 5
○ b3ad09518546 5 parents: 1 2 3 4
@ 8bbff9ba415a 6 parents: 5
○ 3bfb6f7542f6 5 parents: 1 2 3 4
├─┬─┬─╮
│ │ │ ○ 3b125ed6a683 4 parents:
│ │ ○ │ 1ed8c0c5be30 3 parents:
│ │ │ ○ 486dfbb53401 4 parents:
│ │ ○ │ 71c114f0dd4d 3 parents:
│ │ ├─╯
│ │ │ ○ c01d8e85ea96 2c parents: 1 2
│ │ │ ○ 154d3801414a 2c parents: 1 2
╭─┬───╯
│ ○ │ 7efea6c89b60 2 parents:
│ ○ │ 7c8f6e529b52 2 parents:
│ ├─╯
○ │ 8b64ddff700d 1 parents:
○ │ 884fe9b9c656 1 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -162,12 +162,12 @@ fn test_parallelize_where_root_has_non_target_children() {
.success();
work_dir.run_jj(["new", "description(3)", "-m=4"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 9132691e6256 4 parents: 3
○ 4cd999dfaac0 3 parents: 2
○ d3902619fade 2 parents: 1
│ ○ 6c64110df0a5 1c parents: 1
@ 4c392c2965f0 4 parents: 3
○ 8cfb27e238c8 3 parents: 2
○ 320daf48ba58 2 parents: 1
│ ○ 2935e6f82e54 1c parents: 1
├─╯
○ 8b64ddff700d 1 parents:
○ 884fe9b9c656 1 parents:
◆ 000000000000 parents:
[EOF]
");
@@ -175,14 +175,14 @@ fn test_parallelize_where_root_has_non_target_children() {
.run_jj(["parallelize", "description(1)::description(3)"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 3397916989e7 4 parents: 1 2 3
@ a5d4e90a54bf 4 parents: 1 2 3
├─┬─╮
│ │ ○ 1f768c1bc591 3 parents:
│ ○ │ 12ef12b4640e 2 parents:
│ │ ○ 1d9fa9e05929 3 parents:
│ ○ │ f773cf087413 2 parents:
│ ├─╯
│ │ ○ 6c64110df0a5 1c parents: 1
│ │ ○ 2935e6f82e54 1c parents: 1
├───╯
○ │ 8b64ddff700d 1 parents:
○ │ 884fe9b9c656 1 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -208,13 +208,13 @@ fn test_parallelize_with_merge_commit_child() {
.run_jj(["new", "description(3)", "-m", "4"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 99ffaf5b3984 4 parents: 3
○ 4cd999dfaac0 3 parents: 2
│ ○ 4313cc3b476f 2a-c parents: 2 a
@ e6a543fcc5d8 4 parents: 3
○ 8cfb27e238c8 3 parents: 2
│ ○ af7ad8059bf1 2a-c parents: 2 a
╭─┤
│ ○ 1eb902150bb9 a parents:
○ │ d3902619fade 2 parents: 1
○ │ 8b64ddff700d 1 parents:
│ ○ 8fa549442479 a parents:
○ │ 320daf48ba58 2 parents: 1
○ │ 884fe9b9c656 1 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -225,16 +225,16 @@ fn test_parallelize_with_merge_commit_child() {
.run_jj(["parallelize", "description(1)::description(3)"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 3ee9279847a6 4 parents: 1 2 3
@ 431d5005bab0 4 parents: 1 2 3
├─┬─╮
│ │ ○ bb1bb465ccc2 3 parents:
│ │ │ ○ c70ee196514b 2a-c parents: 1 2 a
│ │ ○ 3b6586259aa9 3 parents:
│ │ │ ○ 67b28b5cc688 2a-c parents: 1 2 a
╭─┬───┤
│ │ │ ○ 1eb902150bb9 a parents:
│ │ │ ○ 8fa549442479 a parents:
│ │ ├─╯
│ ○ │ 337eca1ef3a8 2 parents:
│ ○ │ dfd927ce07c0 2 parents:
│ ├─╯
○ │ 8b64ddff700d 1 parents:
○ │ 884fe9b9c656 1 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -252,9 +252,9 @@ fn test_parallelize_disconnected_target_commits() {
}
work_dir.run_jj(["describe", "-m=3"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 4cd999dfaac0 3 parents: 2
○ d3902619fade 2 parents: 1
○ 8b64ddff700d 1 parents:
@ 8cfb27e238c8 3 parents: 2
○ 320daf48ba58 2 parents: 1
○ 884fe9b9c656 1 parents:
◆ 000000000000 parents:
[EOF]
");
@@ -266,9 +266,9 @@ fn test_parallelize_disconnected_target_commits() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 4cd999dfaac0 3 parents: 2
○ d3902619fade 2 parents: 1
○ 8b64ddff700d 1 parents:
@ 8cfb27e238c8 3 parents: 2
○ 320daf48ba58 2 parents: 1
○ 884fe9b9c656 1 parents:
◆ 000000000000 parents:
[EOF]
");
@@ -289,13 +289,13 @@ fn test_parallelize_head_is_a_merge() {
.run_jj(["new", "description(2)", "description(b)", "-m=merged-head"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 1fb53c45237e merged-head parents: 2 b
@ c634925e6ac2 merged-head parents: 2 b
├─╮
│ ○ a7bf5001cfd8 b parents: a
│ ○ 6ca0450a05f5 a parents:
○ │ 1f81bd465ed0 2 parents: 1
○ │ 0c058af014a6 1 parents: 0
○ │ 745bea8029c1 0 parents:
│ ○ 448c6310957c b parents: a
│ ○ 07fb6466f0cd a parents:
○ │ 1ae5c538c8ef 2 parents: 1
○ │ 42fc76489fb1 1 parents: 0
○ │ fc8a812f1b99 0 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -305,15 +305,15 @@ fn test_parallelize_head_is_a_merge() {
.run_jj(["parallelize", "description(1)::"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 82131a679769 merged-head parents: 0 b
@ f97b547cdca0 merged-head parents: 0 b
├─╮
│ ○ a7bf5001cfd8 b parents: a
│ ○ 6ca0450a05f5 a parents:
│ │ ○ daef04bc3fae 2 parents: 0
│ ○ 448c6310957c b parents: a
│ ○ 07fb6466f0cd a parents:
│ │ ○ b240f5a52f77 2 parents: 0
├───╯
│ │ ○ 0c058af014a6 1 parents: 0
│ │ ○ 42fc76489fb1 1 parents: 0
├───╯
○ │ 745bea8029c1 0 parents:
○ │ fc8a812f1b99 0 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -333,12 +333,12 @@ fn test_parallelize_interior_target_is_a_merge() {
.success();
work_dir.run_jj(["new", "-m=3"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 9b77792c77ac 3 parents: 2
○ 1e29145c95fd 2 parents: 1 a
@ d84d604297c3 3 parents: 2
○ 5684656729e6 2 parents: 1 a
├─╮
│ ○ 427890ea3f2b a parents:
○ │ 0c058af014a6 1 parents: 0
○ │ 745bea8029c1 0 parents:
│ ○ 55fc07cbd79b a parents:
○ │ 42fc76489fb1 1 parents: 0
○ │ fc8a812f1b99 0 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -348,14 +348,14 @@ fn test_parallelize_interior_target_is_a_merge() {
.run_jj(["parallelize", "description(1)::"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 042fc3f4315c 3 parents: 0 a
@ d0dae190124d 3 parents: 0 a
├─╮
│ │ ○ 80603361bb48 2 parents: 0 a
│ │ ○ d5756d591190 2 parents: 0 a
╭─┬─╯
│ ○ 427890ea3f2b a parents:
│ │ ○ 0c058af014a6 1 parents: 0
│ ○ 55fc07cbd79b a parents:
│ │ ○ 42fc76489fb1 1 parents: 0
├───╯
○ │ 745bea8029c1 0 parents:
○ │ fc8a812f1b99 0 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -375,12 +375,12 @@ fn test_parallelize_root_is_a_merge() {
work_dir.run_jj(["new", "-m=2"]).success();
work_dir.run_jj(["new", "-m=3"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ cc239b744d01 3 parents: 2
○ 2bf00c2ad44c 2 parents: 1
○ 1c6853121f3c 1 parents: y x
@ ce0ec2d2d844 3 parents: 2
○ 44681d919431 2 parents: 1
○ 8a06bcc06aad 1 parents: y x
├─╮
│ ○ 4035b23c8f72 x parents:
○ │ ca57511e158f y parents:
│ ○ 2d5d6dbc7e1f x parents:
○ │ 1ecf47f2262c y parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -390,14 +390,14 @@ fn test_parallelize_root_is_a_merge() {
.run_jj(["parallelize", "description(1)::description(2)"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 2c7fdfa00b38 3 parents: 1 2
@ 2949bc60f108 3 parents: 1 2
├─╮
│ ○ 3acbd32944d6 2 parents: y x
│ ○ bf222a0e51d4 2 parents: y x
│ ├─╮
○ │ │ 1c6853121f3c 1 parents: y x
○ │ │ 8a06bcc06aad 1 parents: y x
╰─┬─╮
│ ○ 4035b23c8f72 x parents:
○ │ ca57511e158f y parents:
│ ○ 2d5d6dbc7e1f x parents:
○ │ 1ecf47f2262c y parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -413,10 +413,10 @@ fn test_parallelize_multiple_heads() {
work_dir.run_jj(["describe", "-m=1"]).success();
work_dir.run_jj(["new", "description(0)", "-m=2"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 97d7522f40e8 2 parents: 0
│ ○ 0c058af014a6 1 parents: 0
@ 96d58e6cf428 2 parents: 0
│ ○ 42fc76489fb1 1 parents: 0
├─╯
○ 745bea8029c1 0 parents:
○ fc8a812f1b99 0 parents:
◆ 000000000000 parents:
[EOF]
");
@@ -425,10 +425,10 @@ fn test_parallelize_multiple_heads() {
.run_jj(["parallelize", "description(0)::"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ e84481c26195 2 parents:
│ ○ 6270540ee067 1 parents:
@ fefea56b23ab 2 parents:
│ ○ c4b1ea1106d1 1 parents:
├─╯
│ ○ 745bea8029c1 0 parents:
│ ○ fc8a812f1b99 0 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -447,10 +447,10 @@ fn test_parallelize_multiple_heads_with_and_without_children() {
work_dir.run_jj(["describe", "-m=1"]).success();
work_dir.run_jj(["new", "description(0)", "-m=2"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 97d7522f40e8 2 parents: 0
│ ○ 0c058af014a6 1 parents: 0
@ 96d58e6cf428 2 parents: 0
│ ○ 42fc76489fb1 1 parents: 0
├─╯
○ 745bea8029c1 0 parents:
○ fc8a812f1b99 0 parents:
◆ 000000000000 parents:
[EOF]
");
@@ -459,9 +459,9 @@ fn test_parallelize_multiple_heads_with_and_without_children() {
.run_jj(["parallelize", "description(0)", "description(1)"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 97d7522f40e8 2 parents: 0
○ 745bea8029c1 0 parents:
│ ○ 6270540ee067 1 parents:
@ 96d58e6cf428 2 parents: 0
○ fc8a812f1b99 0 parents:
│ ○ c4b1ea1106d1 1 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -480,11 +480,11 @@ fn test_parallelize_multiple_roots() {
.success();
work_dir.run_jj(["new", "-m=3"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 34da938ad94a 3 parents: 2
○ 85d5043b881d 2 parents: 1 a
@ 9653da1c76e9 3 parents: 2
○ 248a57e1c968 2 parents: 1 a
├─╮
│ ○ 6d37472c632c a parents:
○ │ 8b64ddff700d 1 parents:
│ ○ 3ce82963438f a parents:
○ │ 884fe9b9c656 1 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -493,12 +493,12 @@ fn test_parallelize_multiple_roots() {
// Succeeds because the roots have the same parents.
work_dir.run_jj(["parallelize", "root().."]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 3c90598481cd 3 parents:
│ ○ b96aa55582e5 2 parents:
@ 0c77dac691b5 3 parents:
│ ○ 1a23775d87d5 2 parents:
├─╯
│ ○ 6d37472c632c a parents:
│ ○ 3ce82963438f a parents:
├─╯
│ ○ 8b64ddff700d 1 parents:
│ ○ 884fe9b9c656 1 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -518,13 +518,13 @@ fn test_parallelize_multiple_heads_with_different_children() {
work_dir.run_jj(["commit", "-m=b"]).success();
work_dir.run_jj(["commit", "-m=c"]).success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 4bc4dace0e65 parents: c
○ 63b0da9212c0 c parents: b
○ a7bf5001cfd8 b parents: a
○ 6ca0450a05f5 a parents:
│ ○ 4cd999dfaac0 3 parents: 2
│ ○ d3902619fade 2 parents: 1
│ ○ 8b64ddff700d 1 parents:
@ afa59494cb01 parents: c
○ 8897bad1837f c parents: b
○ 448c6310957c b parents: a
○ 07fb6466f0cd a parents:
│ ○ 8cfb27e238c8 3 parents: 2
│ ○ 320daf48ba58 2 parents: 1
│ ○ 884fe9b9c656 1 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -538,17 +538,17 @@ fn test_parallelize_multiple_heads_with_different_children() {
])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ f6c9d9ee3db8 parents: c
○ 62661d5f0c77 c parents: a b
@ 7d3e76dfbc7b parents: c
○ 6dbfcf648fad c parents: a b
├─╮
│ ○ c9ea9058f5c7 b parents:
○ │ 6ca0450a05f5 a parents:
│ ○ 8e5c55acd419 b parents:
○ │ 07fb6466f0cd a parents:
├─╯
│ ○ dac1be696563 3 parents: 1 2
│ ○ abdef66ee7e9 3 parents: 1 2
│ ├─╮
│ │ ○ 7efea6c89b60 2 parents:
│ │ ○ 7c8f6e529b52 2 parents:
├───╯
│ ○ 8b64ddff700d 1 parents:
│ ○ 884fe9b9c656 1 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -569,12 +569,12 @@ fn test_parallelize_multiple_roots_with_different_parents() {
.run_jj(["new", "description(2)", "description(b)", "-m=merged-head"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ ba4297d53c1a merged-head parents: 2 b
@ 4e5f16f52b5e merged-head parents: 2 b
├─╮
│ ○ 6577defaca2d b parents: a
│ ○ 1eb902150bb9 a parents:
○ │ d3902619fade 2 parents: 1
○ │ 8b64ddff700d 1 parents:
│ ○ 7686d0ce4f97 b parents: a
│ ○ 331119737aad a parents:
○ │ 320daf48ba58 2 parents: 1
○ │ 884fe9b9c656 1 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -584,14 +584,14 @@ fn test_parallelize_multiple_roots_with_different_parents() {
.run_jj(["parallelize", "description(2)::", "description(b)::"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 0943ed52b3ed merged-head parents: 1 a
@ 180840c2f967 merged-head parents: 1 a
├─╮
│ │ ○ 6577defaca2d b parents: a
│ │ ○ 7686d0ce4f97 b parents: a
│ ├─╯
│ ○ 1eb902150bb9 a parents:
│ │ ○ d3902619fade 2 parents: 1
│ ○ 331119737aad a parents:
│ │ ○ 320daf48ba58 2 parents: 1
├───╯
○ │ 8b64ddff700d 1 parents:
○ │ 884fe9b9c656 1 parents:
├─╯
◆ 000000000000 parents:
[EOF]
@@ -618,19 +618,19 @@ fn test_parallelize_complex_nonlinear_target() {
.run_jj(["new", "-m=3c", "description(3)"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ b043eb81416c 3c parents: 3
│ ○ 48277ee9afe0 4 parents: 3 2 1
@ 5cca06f145b2 3c parents: 3
│ ○ 095be6de6f23 4 parents: 3 2 1
╭─┼─╮
○ │ │ 944922f0c69f 3 parents: 0
│ │ │ ○ 9d28e8e38435 2c parents: 2
○ │ │ 46cc2c450bba 3 parents: 0
│ │ │ ○ 24113692de1e 2c parents: 2
│ ├───╯
│ ○ │ 97d7522f40e8 2 parents: 0
│ ○ │ 5664a1d6ac8f 2 parents: 0
├─╯ │
│ ○ │ 6c82c22a5e35 1c parents: 1
│ ○ │ 6d578e6cbc1a 1c parents: 1
│ ├─╯
│ ○ 0c058af014a6 1 parents: 0
│ ○ 883b398bc1fd 1 parents: 0
├─╯
○ 745bea8029c1 0 parents:
○ 973f85cf2550 0 parents:
◆ 000000000000 parents:
[EOF]
");
@@ -638,26 +638,26 @@ fn test_parallelize_complex_nonlinear_target() {
let output = work_dir.run_jj(["parallelize", "description(0)::description(4)"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: yostqsxw 59a216e5 (empty) 3c
Parent commit (@-) : rlvkpnrz 745bea80 (empty) 0
Parent commit (@-) : mzvwutvl cb944786 (empty) 3
Working copy (@) now at: yostqsxw d6bb6520 (empty) 3c
Parent commit (@-) : rlvkpnrz 973f85cf (empty) 0
Parent commit (@-) : mzvwutvl 47ec86fe (empty) 3
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 59a216e537c4 3c parents: 0 3
@ d6bb652004e4 3c parents: 0 3
├─╮
│ ○ cb9447869bf0 3 parents:
│ │ ○ 248ce1ffd76b 2c parents: 0 2
│ ○ 47ec86fe7334 3 parents:
│ │ ○ 79e22ba7b736 2c parents: 0 2
╭───┤
│ │ ○ 8f4b8ef68676 2 parents:
│ │ ○ 9d6818f73e0d 2 parents:
│ ├─╯
│ │ ○ 55c626d090e2 1c parents: 0 1
│ │ ○ bbeb29b59bee 1c parents: 0 1
╭───┤
│ │ ○ 82918d78c984 1 parents:
│ │ ○ ea96e6d5bb04 1 parents:
│ ├─╯
○ │ 745bea8029c1 0 parents:
○ │ 973f85cf2550 0 parents:
├─╯
│ ○ 14ca4df576b3 4 parents:
│ ○ 0f9aae95edbe 4 parents:
├─╯
◆ 000000000000 parents:
[EOF]

394
cli/tests/test_rebase_command.rs
View File

@@ -96,7 +96,7 @@ fn test_rebase_invalid() {
let output = work_dir.run_jj(["rebase", "-r", "a", "-d", "a"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Cannot rebase 2443ea76b0b1 onto itself
Error: Cannot rebase 7d980be7a1d4 onto itself
[EOF]
[exit status: 1]
");
@@ -114,7 +114,7 @@ fn test_rebase_invalid() {
let output = work_dir.run_jj(["rebase", "-s", "a", "-d", "b"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Cannot rebase 2443ea76b0b1 onto descendant 1394f625cbbd
Error: Cannot rebase 7d980be7a1d4 onto descendant 123b4d91f6e5
[EOF]
[exit status: 1]
");
@@ -207,8 +207,8 @@ fn test_rebase_bookmark() {
------- stderr -------
Skipped rebase of 1 commits that were already in place
Rebased 1 commits onto destination
Working copy (@) now at: znkkpsqq 9ca2a154 e | e
Parent commit (@-) : zsuskuln 1394f625 b | b
Working copy (@) now at: znkkpsqq bbfb8557 e | e
Parent commit (@-) : zsuskuln 123b4d91 b | b
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -231,8 +231,8 @@ fn test_rebase_bookmark() {
------- stderr -------
Error: Revset `e|d` resolved to more than one revision
Hint: The revset `e|d` resolved to these revisions:
znkkpsqq e52756c8 e | e
vruxwmqv 514fa6b2 d | d
znkkpsqq 03affc89 e | e
vruxwmqv 01a5f35e d | d
Hint: Prefix the expression with `all:` to allow any number of revisions (i.e. `all:e|d`).
[EOF]
[exit status: 1]
@@ -242,8 +242,8 @@ fn test_rebase_bookmark() {
------- stderr -------
Skipped rebase of 1 commits that were already in place
Rebased 1 commits onto destination
Working copy (@) now at: znkkpsqq 817e3fb0 e | e
Parent commit (@-) : zsuskuln 1394f625 b | b
Working copy (@) now at: znkkpsqq 4ab6a2d1 e | e
Parent commit (@-) : zsuskuln 123b4d91 b | b
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -289,9 +289,9 @@ fn test_rebase_bookmark_with_merge() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 3 commits onto destination
Working copy (@) now at: znkkpsqq 5f8a3db2 e | e
Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Parent commit (@-) : vruxwmqv 1677f795 d | d
Working copy (@) now at: znkkpsqq d5360d09 e | e
Parent commit (@-) : rlvkpnrz 7d980be7 a | a
Parent commit (@-) : vruxwmqv 85a741d7 d | d
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -312,9 +312,9 @@ fn test_rebase_bookmark_with_merge() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 3 commits onto destination
Working copy (@) now at: znkkpsqq a331ac11 e | e
Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Parent commit (@-) : vruxwmqv 3d0f3644 d | d
Working copy (@) now at: znkkpsqq d3091c0f e | e
Parent commit (@-) : rlvkpnrz 7d980be7 a | a
Parent commit (@-) : vruxwmqv 485905a3 d | d
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -362,8 +362,8 @@ fn test_rebase_single_revision() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 2 descendant commits
Working copy (@) now at: znkkpsqq 2668ffbe e | e
Parent commit (@-) : vruxwmqv 7b370c85 d | d
Working copy (@) now at: znkkpsqq 2baedee4 e | e
Parent commit (@-) : vruxwmqv 45142a83 d | d
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -388,9 +388,9 @@ fn test_rebase_single_revision() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 1 descendant commits
Working copy (@) now at: znkkpsqq ed210c15 e | e
Parent commit (@-) : zsuskuln 1394f625 b | b
Parent commit (@-) : royxmykx c0cb3a0b c | c
Working copy (@) now at: znkkpsqq b981a2bc e | e
Parent commit (@-) : zsuskuln 123b4d91 b | b
Parent commit (@-) : royxmykx 991a7501 c | c
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -437,9 +437,9 @@ fn test_rebase_single_revision_merge_parent() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 1 descendant commits
Working copy (@) now at: vruxwmqv a37531e8 d | d
Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Parent commit (@-) : zsuskuln d370aee1 b | b
Working copy (@) now at: vruxwmqv 0bb15a0f d | d
Parent commit (@-) : rlvkpnrz 7d980be7 a | a
Parent commit (@-) : zsuskuln d18ca3e8 b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -495,8 +495,8 @@ fn test_rebase_multiple_revisions() {
------- stderr -------
Rebased 2 commits onto destination
Rebased 4 descendant commits
Working copy (@) now at: xznxytkn 016685dc i | i
Parent commit (@-) : kmkuslsw e04d3932 f | f
Working copy (@) now at: xznxytkn 15078fab i | i
Parent commit (@-) : kmkuslsw d8579ed7 f | f
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -528,8 +528,8 @@ fn test_rebase_multiple_revisions() {
------- stderr -------
Rebased 2 commits onto destination
Rebased 4 descendant commits
Working copy (@) now at: xznxytkn 94538385 i | i
Parent commit (@-) : kmkuslsw dae8d293 f | f
Working copy (@) now at: xznxytkn 4dec544d i | i
Parent commit (@-) : kmkuslsw b22816c9 f | f
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -562,9 +562,9 @@ fn test_rebase_multiple_revisions() {
------- stderr -------
Rebased 3 commits onto destination
Rebased 2 descendant commits
Working copy (@) now at: xznxytkn 1868ded4 i | i
Parent commit (@-) : royxmykx 7e4fbf4f c | c
Parent commit (@-) : vruxwmqv 4cc44fbf d | d
Working copy (@) now at: xznxytkn e73a0787 i | i
Parent commit (@-) : royxmykx dffaa0d4 c | c
Parent commit (@-) : vruxwmqv 6354123d d | d
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -598,9 +598,9 @@ fn test_rebase_multiple_revisions() {
------- stderr -------
Rebased 3 commits onto destination
Rebased 3 descendant commits
Working copy (@) now at: xznxytkn 9cfd1635 i | i
Parent commit (@-) : royxmykx 7e4fbf4f c | c
Parent commit (@-) : znkkpsqq ecf9a1d5 e | e
Working copy (@) now at: xznxytkn f7c62b49 i | i
Parent commit (@-) : royxmykx dffaa0d4 c | c
Parent commit (@-) : znkkpsqq 1c3676c4 e | e
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -630,8 +630,8 @@ fn test_rebase_multiple_revisions() {
------- stderr -------
Rebased 2 commits onto destination
Rebased 4 descendant commits
Working copy (@) now at: xznxytkn 5d911e5c i | i
Parent commit (@-) : kmkuslsw d1bfda8c f | f
Working copy (@) now at: xznxytkn b4ece7ad i | i
Parent commit (@-) : kmkuslsw 1a05fe0d f | f
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -682,9 +682,9 @@ fn test_rebase_revision_onto_descendant() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 3 descendant commits
Working copy (@) now at: vruxwmqv bff4a4eb merge | merge
Parent commit (@-) : royxmykx c84e900d b | b
Parent commit (@-) : zsuskuln d57db87b a | a
Working copy (@) now at: vruxwmqv c6955993 merge | merge
Parent commit (@-) : royxmykx c5c326af b | b
Parent commit (@-) : zsuskuln 0209b42d a | a
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -704,10 +704,10 @@ fn test_rebase_revision_onto_descendant() {
let output = work_dir.run_jj(["op", "restore", &setup_opid]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Restored to operation: 60e340690be6 (2001-02-03 08:05:15) create bookmark merge pointing to commit b05964d109522cd06e48f1a2661e1a0f58be0984
Working copy (@) now at: vruxwmqv b05964d1 merge | merge
Parent commit (@-) : royxmykx cea87a87 b | b
Parent commit (@-) : zsuskuln 2c5b7858 a | a
Restored to operation: e386a698bc2d (2001-02-03 08:05:15) create bookmark merge pointing to commit 08c0951bf69d0362708a5223a78446d664823b50
Working copy (@) now at: vruxwmqv 08c0951b merge | merge
Parent commit (@-) : royxmykx 6a7081ef b | b
Parent commit (@-) : zsuskuln 68fbc443 a | a
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -716,9 +716,9 @@ fn test_rebase_revision_onto_descendant() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 3 descendant commits
Working copy (@) now at: vruxwmqv 986b7a49 merge | merge
Parent commit (@-) : royxmykx c07c677c b | b
Parent commit (@-) : zsuskuln abc90087 a | a
Working copy (@) now at: vruxwmqv 0107ef56 merge | merge
Parent commit (@-) : royxmykx 308bc577 b | b
Parent commit (@-) : zsuskuln 787e95a3 a | a
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -778,8 +778,8 @@ fn test_rebase_multiple_destinations() {
------- stderr -------
Error: Revset `b|c` resolved to more than one revision
Hint: The revset `b|c` resolved to these revisions:
royxmykx fe2e8e8b c | c
zsuskuln d370aee1 b | b
royxmykx c12952d9 c | c
zsuskuln d18ca3e8 b | b
Hint: Prefix the expression with `all:` to allow any number of revisions (i.e. `all:b|c`).
[EOF]
[exit status: 1]
@@ -825,7 +825,7 @@ fn test_rebase_multiple_destinations() {
let output = work_dir.run_jj(["rebase", "-r", "a", "-d", "b", "-d", "b"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: More than one revset resolved to revision d370aee184ba
Error: More than one revset resolved to revision d18ca3e87135
[EOF]
[exit status: 1]
");
@@ -834,7 +834,7 @@ fn test_rebase_multiple_destinations() {
let output = work_dir.run_jj(["rebase", "-r", "a", "-d", "all:b|c", "-d", "b"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: More than one revset resolved to revision d370aee184ba
Error: More than one revset resolved to revision d18ca3e87135
[EOF]
[exit status: 1]
");
@@ -874,8 +874,8 @@ fn test_rebase_with_descendants() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 3 commits onto destination
Working copy (@) now at: vruxwmqv 705832bd d | d
Parent commit (@-) : royxmykx 57c7246a c | c
Working copy (@) now at: vruxwmqv 7a9837e3 d | d
Parent commit (@-) : royxmykx ee1edcc0 c | c
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@@ -895,8 +895,8 @@ fn test_rebase_with_descendants() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 commits onto destination
Working copy (@) now at: vruxwmqv 92c2bc9a d | d
Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Working copy (@) now at: vruxwmqv e7720369 d | d
Parent commit (@-) : rlvkpnrz 7d980be7 a | a
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -930,8 +930,8 @@ fn test_rebase_with_descendants() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 3 commits onto destination
Working copy (@) now at: vruxwmqv f1e71cb7 d | d
Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Working copy (@) now at: vruxwmqv 7186427a d | d
Parent commit (@-) : rlvkpnrz 7d980be7 a | a
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -953,8 +953,8 @@ fn test_rebase_with_descendants() {
------- stderr -------
Error: Revset `b|d` resolved to more than one revision
Hint: The revset `b|d` resolved to these revisions:
vruxwmqv df54a9fd d | d
zsuskuln d370aee1 b | b
vruxwmqv 2619e864 d | d
zsuskuln d18ca3e8 b | b
Hint: Prefix the expression with `all:` to allow any number of revisions (i.e. `all:b|d`).
[EOF]
[exit status: 1]
@@ -963,8 +963,8 @@ fn test_rebase_with_descendants() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 3 commits onto destination
Working copy (@) now at: vruxwmqv d17539f7 d | d
Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Working copy (@) now at: vruxwmqv 743c3f26 d | d
Parent commit (@-) : rlvkpnrz 7d980be7 a | a
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -1083,8 +1083,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 3 commits onto destination
Working copy (@) now at: znkkpsqq cf8ecff5 c | c
Parent commit (@-) : vruxwmqv 24e1a270 b | b
Working copy (@) now at: znkkpsqq 18654225 c | c
Parent commit (@-) : vruxwmqv 0692b190 b | b
[EOF]
");
// Commit "a" should be rebased onto the root commit. Commit "b" should have
@@ -1142,8 +1142,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 commits onto destination
Working copy (@) now at: znkkpsqq 76914dcc c | c
Parent commit (@-) : vruxwmqv f73f03c7 b | b
Working copy (@) now at: znkkpsqq 9c2125ec c | c
Parent commit (@-) : vruxwmqv 4e0e4f65 b | b
[EOF]
");
// The commits in roots(a..c), i.e. commit "b" should be rebased onto "a",
@@ -1199,8 +1199,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 3 descendant commits
Working copy (@) now at: znkkpsqq 45371aaf c | c
Parent commit (@-) : vruxwmqv c0a76bf4 b | b
Working copy (@) now at: znkkpsqq ad824411 c | c
Parent commit (@-) : vruxwmqv 00fef98f b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -1226,8 +1226,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 3 descendant commits
Working copy (@) now at: znkkpsqq e28fa972 c | c
Parent commit (@-) : vruxwmqv 8d0eeb6a b | b
Working copy (@) now at: znkkpsqq 90fa9696 c | c
Parent commit (@-) : vruxwmqv 879a9415 b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -1252,8 +1252,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 3 descendant commits
Working copy (@) now at: znkkpsqq a9da974c c | c
Parent commit (@-) : vruxwmqv 0072139c b | b
Working copy (@) now at: znkkpsqq 8a117fcc c | c
Parent commit (@-) : vruxwmqv 317e1465 b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -1289,8 +1289,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 2 descendant commits
Working copy (@) now at: znkkpsqq 7210b05e c | c
Parent commit (@-) : vruxwmqv da3f7511 b | b
Working copy (@) now at: znkkpsqq 4eb7e0f2 c | c
Parent commit (@-) : vruxwmqv cb7405be b | b
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -1313,9 +1313,9 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 1 descendant commits
Working copy (@) now at: znkkpsqq f280545e c | c
Parent commit (@-) : zsuskuln 0a7fb8f6 base | base
Parent commit (@-) : royxmykx 86a06598 a | a
Working copy (@) now at: znkkpsqq 213edff9 c | c
Parent commit (@-) : zsuskuln 3a2d0837 base | base
Parent commit (@-) : royxmykx c7aebf99 a | a
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -1341,9 +1341,9 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 1 descendant commits
Working copy (@) now at: znkkpsqq c0a7cd80 c | c
Parent commit (@-) : zsuskuln 0a7fb8f6 base | base
Parent commit (@-) : royxmykx 86a06598 a | a
Working copy (@) now at: znkkpsqq b2ebd194 c | c
Parent commit (@-) : zsuskuln 3a2d0837 base | base
Parent commit (@-) : royxmykx c7aebf99 a | a
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -1366,8 +1366,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 commits onto destination
Working copy (@) now at: znkkpsqq 7a3bc050 c | c
Parent commit (@-) : royxmykx 86a06598 a | a
Working copy (@) now at: znkkpsqq c5bfb6cd c | c
Parent commit (@-) : royxmykx c7aebf99 a | a
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -1475,8 +1475,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 3 descendant commits
Working copy (@) now at: xznxytkn e0e873c8 f | f
Parent commit (@-) : kmkuslsw 754793f3 c | c
Working copy (@) now at: xznxytkn 97cc6077 f | f
Parent commit (@-) : kmkuslsw 5dbb2427 c | c
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@@ -1503,8 +1503,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 1 descendant commits
Working copy (@) now at: xznxytkn 9804b742 f | f
Parent commit (@-) : kmkuslsw cd86b3e4 c | c
Working copy (@) now at: xznxytkn d8eb20c6 f | f
Parent commit (@-) : kmkuslsw ed86d82a c | c
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -1532,8 +1532,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 4 descendant commits
Working copy (@) now at: xznxytkn 80c27408 f | f
Parent commit (@-) : zsuskuln 072d5ae1 b1 | b1
Working copy (@) now at: xznxytkn 5fd4cd2f f | f
Parent commit (@-) : zsuskuln 62634b59 b1 | b1
Added 0 files, modified 0 files, removed 5 files
[EOF]
");
@@ -1561,8 +1561,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 3 descendant commits
Working copy (@) now at: xznxytkn ebbc24b1 f | f
Parent commit (@-) : royxmykx 2b8e1148 b2 | b2
Working copy (@) now at: xznxytkn 2d5daf12 f | f
Parent commit (@-) : royxmykx 40646d19 b2 | b2
Added 0 files, modified 0 files, removed 4 files
[EOF]
");
@@ -1592,8 +1592,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 2 descendant commits
Working copy (@) now at: xznxytkn 8f8c91d3 f | f
Parent commit (@-) : kmkuslsw cd86b3e4 c | c
Working copy (@) now at: xznxytkn 8e643676 f | f
Parent commit (@-) : kmkuslsw ed86d82a c | c
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -1620,9 +1620,9 @@ fn test_rebase_after() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 commits onto destination
Working copy (@) now at: xznxytkn 7784e5a0 f | f
Parent commit (@-) : nkmrtpmo 858693f7 e | e
Parent commit (@-) : lylxulpl 7d0512e5 d | d
Working copy (@) now at: xznxytkn 2f0981e9 f | f
Parent commit (@-) : nkmrtpmo 50d9bd5d e | e
Parent commit (@-) : lylxulpl 610f541b d | d
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -1651,8 +1651,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 2 commits onto destination
Rebased 6 descendant commits
Working copy (@) now at: xznxytkn 0b53613e f | f
Parent commit (@-) : kmkuslsw 193687bb c | c
Working copy (@) now at: xznxytkn 21d27649 f | f
Parent commit (@-) : kmkuslsw 92f2c98c c | c
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -1682,8 +1682,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 3 commits onto destination
Rebased 3 descendant commits
Working copy (@) now at: xznxytkn eaf1d6b8 f | f
Parent commit (@-) : nkmrtpmo 0d7e4ce9 e | e
Working copy (@) now at: xznxytkn 9a8f2c96 f | f
Parent commit (@-) : nkmrtpmo 820c8b34 e | e
Added 0 files, modified 0 files, removed 3 files
[EOF]
");
@@ -1713,8 +1713,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 4 commits onto destination
Rebased 2 descendant commits
Working copy (@) now at: xznxytkn 9bc7e54c f | f
Parent commit (@-) : nkmrtpmo 0f80251b e | e
Working copy (@) now at: xznxytkn d07fb785 f | f
Parent commit (@-) : nkmrtpmo aa71eb43 e | e
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -1744,8 +1744,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 3 commits onto destination
Rebased 6 descendant commits
Working copy (@) now at: xznxytkn 0875aabc f | f
Parent commit (@-) : nkmrtpmo d429661b e | e
Working copy (@) now at: xznxytkn f9826fef f | f
Parent commit (@-) : nkmrtpmo b81b7ce9 e | e
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -1773,8 +1773,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 2 commits onto destination
Rebased 3 descendant commits
Working copy (@) now at: xznxytkn 3238a418 f | f
Parent commit (@-) : kmkuslsw 6a51bd41 c | c
Working copy (@) now at: xznxytkn d78db4b3 f | f
Parent commit (@-) : kmkuslsw 993282fd c | c
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -1828,8 +1828,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 4 commits onto destination
Rebased 2 descendant commits
Working copy (@) now at: xznxytkn a4ace41c f | f
Parent commit (@-) : nkmrtpmo c7744d08 e | e
Working copy (@) now at: xznxytkn 7487eccf f | f
Parent commit (@-) : nkmrtpmo 8ad5c1e5 e | e
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -1861,8 +1861,8 @@ fn test_rebase_after() {
------- stderr -------
Rebased 6 commits onto destination
Rebased 1 descendant commits
Working copy (@) now at: xznxytkn b4078b57 f | f
Parent commit (@-) : nkmrtpmo 1b95558f e | e
Working copy (@) now at: xznxytkn 082a50a2 f | f
Parent commit (@-) : nkmrtpmo 2480a543 e | e
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -1887,7 +1887,7 @@ fn test_rebase_after() {
let output = work_dir.run_jj(["rebase", "-r", "e", "--after", "a", "--after", "b2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Refusing to create a loop: commit 2b8e1148290f would be both an ancestor and a descendant of the rebased commits
Error: Refusing to create a loop: commit 40646d195680 would be both an ancestor and a descendant of the rebased commits
[EOF]
[exit status: 1]
");
@@ -1993,8 +1993,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 8 descendant commits
Working copy (@) now at: xznxytkn 24335685 f | f
Parent commit (@-) : nkmrtpmo e9a28d4b e | e
Working copy (@) now at: xznxytkn 98c82067 f | f
Parent commit (@-) : nkmrtpmo 41089a93 e | e
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@@ -2021,8 +2021,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 1 descendant commits
Working copy (@) now at: xznxytkn 8e3b728a f | f
Parent commit (@-) : kmkuslsw cd86b3e4 c | c
Working copy (@) now at: xznxytkn ffa5832a f | f
Parent commit (@-) : kmkuslsw ed86d82a c | c
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -2050,8 +2050,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 4 descendant commits
Working copy (@) now at: xznxytkn 2b4f48f8 f | f
Parent commit (@-) : zsuskuln 072d5ae1 b1 | b1
Working copy (@) now at: xznxytkn 545fc926 f | f
Parent commit (@-) : zsuskuln 62634b59 b1 | b1
Added 0 files, modified 0 files, removed 5 files
[EOF]
");
@@ -2079,8 +2079,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 5 descendant commits
Working copy (@) now at: xznxytkn 488ebb95 f | f
Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Working copy (@) now at: xznxytkn 1ae90146 f | f
Parent commit (@-) : rlvkpnrz 7d980be7 a | a
Added 0 files, modified 0 files, removed 6 files
[EOF]
");
@@ -2110,9 +2110,9 @@ fn test_rebase_before() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 3 descendant commits
Working copy (@) now at: xznxytkn aae1bc10 f | f
Parent commit (@-) : royxmykx 2b8e1148 b2 | b2
Parent commit (@-) : znkkpsqq a52a83a4 b4 | b4
Working copy (@) now at: xznxytkn 2847f9cb f | f
Parent commit (@-) : royxmykx 40646d19 b2 | b2
Parent commit (@-) : znkkpsqq 256ac307 b4 | b4
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -2140,8 +2140,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 5 descendant commits
Working copy (@) now at: xznxytkn 8268ec4d f | f
Parent commit (@-) : nkmrtpmo fd26fbd4 e | e
Working copy (@) now at: xznxytkn 79a6976d f | f
Parent commit (@-) : nkmrtpmo 0dab325c e | e
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@@ -2169,9 +2169,9 @@ fn test_rebase_before() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 5 descendant commits
Working copy (@) now at: xznxytkn 7ba8014f f | f
Parent commit (@-) : zsuskuln 072d5ae1 b1 | b1
Parent commit (@-) : vruxwmqv 523e6a8b b3 | b3
Working copy (@) now at: xznxytkn af3763c8 f | f
Parent commit (@-) : zsuskuln 62634b59 b1 | b1
Parent commit (@-) : vruxwmqv a1d9eeb3 b3 | b3
Added 0 files, modified 0 files, removed 4 files
[EOF]
");
@@ -2202,8 +2202,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 2 commits onto destination
Rebased 7 descendant commits
Working copy (@) now at: xznxytkn fabd8dd7 f | f
Parent commit (@-) : nkmrtpmo b5933877 e | e
Working copy (@) now at: xznxytkn eca1985d f | f
Parent commit (@-) : nkmrtpmo 74d26317 e | e
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@@ -2232,8 +2232,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 3 commits onto destination
Rebased 3 descendant commits
Working copy (@) now at: xznxytkn cbe2be58 f | f
Parent commit (@-) : nkmrtpmo e31053d1 e | e
Working copy (@) now at: xznxytkn b8d7a20d f | f
Parent commit (@-) : nkmrtpmo 018b2dea e | e
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@@ -2263,8 +2263,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 2 commits onto destination
Rebased 7 descendant commits
Working copy (@) now at: xznxytkn 1c48b514 f | f
Parent commit (@-) : kmkuslsw c0fd979a c | c
Working copy (@) now at: xznxytkn d8064481 f | f
Parent commit (@-) : kmkuslsw 8a86363c c | c
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@@ -2293,8 +2293,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 3 commits onto destination
Rebased 6 descendant commits
Working copy (@) now at: xznxytkn f5991dc7 f | f
Parent commit (@-) : nkmrtpmo 37894e3c e | e
Working copy (@) now at: xznxytkn 80f586ab f | f
Parent commit (@-) : nkmrtpmo 2a584ab8 e | e
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -2323,8 +2323,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 3 commits onto destination
Rebased 6 descendant commits
Working copy (@) now at: xznxytkn 308a31e9 f | f
Parent commit (@-) : nkmrtpmo 538444a5 e | e
Working copy (@) now at: xznxytkn 5ec39fd4 f | f
Parent commit (@-) : nkmrtpmo 3e5ae779 e | e
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -2378,8 +2378,8 @@ fn test_rebase_before() {
------- stderr -------
Rebased 4 commits onto destination
Rebased 2 descendant commits
Working copy (@) now at: xznxytkn 84704387 f | f
Parent commit (@-) : nkmrtpmo cff61821 e | e
Working copy (@) now at: xznxytkn 5ef0b783 f | f
Parent commit (@-) : nkmrtpmo 893af621 e | e
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -2412,8 +2412,8 @@ fn test_rebase_before() {
Skipped rebase of 2 commits that were already in place
Rebased 4 commits onto destination
Rebased 2 descendant commits
Working copy (@) now at: xznxytkn 16422f85 f | f
Parent commit (@-) : nkmrtpmo ef9dea83 e | e
Working copy (@) now at: xznxytkn a20aa8c4 f | f
Parent commit (@-) : nkmrtpmo 878800c4 e | e
Added 0 files, modified 0 files, removed 2 files
[EOF]
");
@@ -2438,7 +2438,7 @@ fn test_rebase_before() {
let output = work_dir.run_jj(["rebase", "-r", "e", "--before", "b2", "--before", "c"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Refusing to create a loop: commit 2b8e1148290f would be both an ancestor and a descendant of the rebased commits
Error: Refusing to create a loop: commit 40646d195680 would be both an ancestor and a descendant of the rebased commits
[EOF]
[exit status: 1]
");
@@ -2488,8 +2488,8 @@ fn test_rebase_after_before() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 1 descendant commits
Working copy (@) now at: nmzmmopx 56c81c6d f | f
Parent commit (@-) : nkmrtpmo ff196f69 d | d
Working copy (@) now at: nmzmmopx 8ef73923 f | f
Parent commit (@-) : nkmrtpmo 49b3d9d8 d | d
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -2519,9 +2519,9 @@ fn test_rebase_after_before() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 1 descendant commits
Working copy (@) now at: nmzmmopx 398173ed f | f
Parent commit (@-) : xznxytkn b3e6aadf e | e
Parent commit (@-) : nkmrtpmo db529447 d | d
Working copy (@) now at: nmzmmopx 00bf3e5b f | f
Parent commit (@-) : xznxytkn d4334f29 e | e
Parent commit (@-) : nkmrtpmo 26362358 d | d
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -2555,8 +2555,8 @@ fn test_rebase_after_before() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 3 descendant commits
Working copy (@) now at: nmzmmopx 2be98daf f | f
Parent commit (@-) : xznxytkn 911fc846 e | e
Working copy (@) now at: nmzmmopx f386d88f f | f
Parent commit (@-) : xznxytkn 0ad4a454 e | e
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -2591,11 +2591,11 @@ fn test_rebase_after_before() {
------- stderr -------
Rebased 3 commits onto destination
Rebased 1 descendant commits
Working copy (@) now at: nmzmmopx bee09b10 f | f
Parent commit (@-) : znkkpsqq 9167144b b1 | b1
Parent commit (@-) : kmkuslsw 87fed139 b2 | b2
Parent commit (@-) : nkmrtpmo 4a8ca156 d | d
Parent commit (@-) : xznxytkn 0cc1825e e | e
Working copy (@) now at: nmzmmopx 8407e497 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
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
@@ -2626,8 +2626,8 @@ fn test_rebase_after_before() {
------- stderr -------
Rebased 4 commits onto destination
Rebased 1 descendant commits
Working copy (@) now at: nmzmmopx 951204cf f | f
Parent commit (@-) : xznxytkn fe8ec4e2 e | e
Working copy (@) now at: nmzmmopx 64331877 f | f
Parent commit (@-) : xznxytkn 59635051 e | e
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -2659,8 +2659,8 @@ fn test_rebase_after_before() {
------- stderr -------
Rebased 3 commits onto destination
Rebased 4 descendant commits
Working copy (@) now at: nmzmmopx 4496f88e f | f
Parent commit (@-) : xznxytkn a85404a6 e | e
Working copy (@) now at: nmzmmopx f78e66eb f | f
Parent commit (@-) : xznxytkn 4ca68c7c e | e
Added 3 files, modified 0 files, removed 0 files
[EOF]
");
@@ -2688,7 +2688,7 @@ fn test_rebase_after_before() {
let output = work_dir.run_jj(["rebase", "-r", "e", "--after", "c", "--before", "a"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Refusing to create a loop: commit 31b84afe1c8f would be both an ancestor and a descendant of the rebased commits
Error: Refusing to create a loop: commit 0c9da0df7f7c would be both an ancestor and a descendant of the rebased commits
[EOF]
[exit status: 1]
");
@@ -2729,8 +2729,8 @@ fn test_rebase_skip_emptied() {
------- stderr -------
Rebased 2 commits onto destination
Abandoned 1 newly emptied commits
Working copy (@) now at: yostqsxw bc4222f2 (empty) also already empty
Parent commit (@-) : vruxwmqv 6b41ecb2 (empty) already empty
Working copy (@) now at: yostqsxw f2f45f17 (empty) also already empty
Parent commit (@-) : vruxwmqv fe22a09e (empty) already empty
[EOF]
");
@@ -2768,8 +2768,8 @@ fn test_rebase_skip_emptied() {
------- stderr -------
Rebased 2 descendant commits
Abandoned 1 newly emptied commits
Working copy (@) now at: yostqsxw 74149b9b (empty) also already empty
Parent commit (@-) : vruxwmqv 3bdb2801 (empty) already empty
Working copy (@) now at: yostqsxw a9d31081 (empty) also already empty
Parent commit (@-) : vruxwmqv 39722460 (empty) already empty
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
@@ -2824,8 +2824,8 @@ fn test_rebase_skip_emptied_descendants() {
------- stderr -------
Skipped rebase of 1 commits that were already in place
Rebased 3 descendant commits
Working copy (@) now at: znkkpsqq 353bac5c (empty) also already empty
Parent commit (@-) : yostqsxw 0a3f76fd (empty) already empty
Working copy (@) now at: znkkpsqq 6d024ab4 (empty) also already empty
Parent commit (@-) : yostqsxw bb87e185 (empty) already empty
[EOF]
");
@@ -2857,16 +2857,16 @@ fn test_rebase_skip_if_on_destination() {
create_commit(&work_dir, "f", &["e"]);
// Test the setup
insta::assert_snapshot!(get_long_log_output(&work_dir), @r"
@ f lylxulpl 88f778c5: e
○ e kmkuslsw 48dd9e3f: c
│ ○ d znkkpsqq 92438fc9: c
@ f lylxulpl cf8edc20: e
○ e kmkuslsw 65f1083b: c
│ ○ d znkkpsqq f91a8202: c
├─╯
○ c vruxwmqv c41e416e: b1 b2
○ c vruxwmqv 86997ac2: b1 b2
├─╮
│ ○ b2 royxmykx 903ab0d6: a
○ │ b1 zsuskuln 072d5ae1: a
│ ○ b2 royxmykx 1d9f22d8: a
○ │ b1 zsuskuln 62634b59: a
├─╯
○ a rlvkpnrz 2443ea76
○ a rlvkpnrz 7d980be7
◆ zzzzzzzz 00000000
[EOF]
");
@@ -2880,16 +2880,16 @@ fn test_rebase_skip_if_on_destination() {
[EOF]
");
insta::assert_snapshot!(get_long_log_output(&work_dir), @r"
@ f lylxulpl 88f778c5: e
○ e kmkuslsw 48dd9e3f: c
│ ○ d znkkpsqq 92438fc9: c
@ f lylxulpl cf8edc20: e
○ e kmkuslsw 65f1083b: c
│ ○ d znkkpsqq f91a8202: c
├─╯
○ c vruxwmqv c41e416e: b1 b2
○ c vruxwmqv 86997ac2: b1 b2
├─╮
│ ○ b2 royxmykx 903ab0d6: a
○ │ b1 zsuskuln 072d5ae1: a
│ ○ b2 royxmykx 1d9f22d8: a
○ │ b1 zsuskuln 62634b59: a
├─╯
○ a rlvkpnrz 2443ea76
○ a rlvkpnrz 7d980be7
◆ zzzzzzzz 00000000
[EOF]
");
@@ -2903,16 +2903,16 @@ fn test_rebase_skip_if_on_destination() {
[EOF]
");
insta::assert_snapshot!(get_long_log_output(&work_dir), @r"
@ f lylxulpl 88f778c5: e
○ e kmkuslsw 48dd9e3f: c
│ ○ d znkkpsqq 92438fc9: c
@ f lylxulpl cf8edc20: e
○ e kmkuslsw 65f1083b: c
│ ○ d znkkpsqq f91a8202: c
├─╯
○ c vruxwmqv c41e416e: b1 b2
○ c vruxwmqv 86997ac2: b1 b2
├─╮
│ ○ b2 royxmykx 903ab0d6: a
○ │ b1 zsuskuln 072d5ae1: a
│ ○ b2 royxmykx 1d9f22d8: a
○ │ b1 zsuskuln 62634b59: a
├─╯
○ a rlvkpnrz 2443ea76
○ a rlvkpnrz 7d980be7
◆ zzzzzzzz 00000000
[EOF]
");
@@ -2926,16 +2926,16 @@ fn test_rebase_skip_if_on_destination() {
[EOF]
");
insta::assert_snapshot!(get_long_log_output(&work_dir), @r"
@ f lylxulpl 88f778c5: e
○ e kmkuslsw 48dd9e3f: c
│ ○ d znkkpsqq 92438fc9: c
@ f lylxulpl cf8edc20: e
○ e kmkuslsw 65f1083b: c
│ ○ d znkkpsqq f91a8202: c
├─╯
○ c vruxwmqv c41e416e: b1 b2
○ c vruxwmqv 86997ac2: b1 b2
├─╮
│ ○ b2 royxmykx 903ab0d6: a
○ │ b1 zsuskuln 072d5ae1: a
│ ○ b2 royxmykx 1d9f22d8: a
○ │ b1 zsuskuln 62634b59: a
├─╯
○ a rlvkpnrz 2443ea76
○ a rlvkpnrz 7d980be7
◆ zzzzzzzz 00000000
[EOF]
");
@@ -2946,23 +2946,23 @@ fn test_rebase_skip_if_on_destination() {
------- stderr -------
Skipped rebase of 1 commits that were already in place
Rebased 1 descendant commits
Working copy (@) now at: lylxulpl 77cb229f f | f
Parent commit (@-) : vruxwmqv c41e416e c | c
Working copy (@) now at: lylxulpl f2015644 f | f
Parent commit (@-) : vruxwmqv 86997ac2 c | c
Added 0 files, modified 0 files, removed 1 files
[EOF]
");
insta::assert_snapshot!(get_long_log_output(&work_dir), @r"
@ f lylxulpl 77cb229f: c
│ ○ e kmkuslsw 48dd9e3f: c
@ f lylxulpl f2015644: c
│ ○ e kmkuslsw 65f1083b: c
├─╯
│ ○ d znkkpsqq 92438fc9: c
│ ○ d znkkpsqq f91a8202: c
├─╯
○ c vruxwmqv c41e416e: b1 b2
○ c vruxwmqv 86997ac2: b1 b2
├─╮
│ ○ b2 royxmykx 903ab0d6: a
○ │ b1 zsuskuln 072d5ae1: a
│ ○ b2 royxmykx 1d9f22d8: a
○ │ b1 zsuskuln 62634b59: a
├─╯
○ a rlvkpnrz 2443ea76
○ a rlvkpnrz 7d980be7
◆ zzzzzzzz 00000000
[EOF]
");

60
cli/tests/test_repo_change_report.rs
View File

@@ -31,14 +31,14 @@ fn test_report_conflicts() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 3 commits onto destination
Working copy (@) now at: zsuskuln f8a2c4e0 (conflict) (empty) (no description set)
Parent commit (@-) : kkmpptxz 2271a49e (conflict) C
Working copy (@) now at: zsuskuln dd37d4a5 (conflict) (empty) (no description set)
Parent commit (@-) : kkmpptxz c7f5d6e5 (conflict) C
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict including 1 deletion
New conflicts appeared in 2 commits:
kkmpptxz 2271a49e (conflict) C
rlvkpnrz b7d83633 (conflict) B
kkmpptxz c7f5d6e5 (conflict) C
rlvkpnrz 032a8668 (conflict) B
Hint: To resolve the conflicts, start by updating to the first one:
jj new rlvkpnrz
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -51,8 +51,8 @@ fn test_report_conflicts() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 3 commits onto destination
Working copy (@) now at: zsuskuln d70c003d (empty) (no description set)
Parent commit (@-) : kkmpptxz 43e94449 C
Working copy (@) now at: zsuskuln bad741db (empty) (no description set)
Parent commit (@-) : kkmpptxz cec3d034 C
Added 0 files, modified 1 files, removed 0 files
Existing conflicts were resolved or abandoned from 2 commits.
[EOF]
@@ -64,14 +64,14 @@ fn test_report_conflicts() {
------- stderr -------
Rebased 1 commits onto destination
Rebased 2 descendant commits
Working copy (@) now at: zsuskuln 588bd15c (conflict) (empty) (no description set)
Parent commit (@-) : kkmpptxz 331a2fce (conflict) C
Working copy (@) now at: zsuskuln 5b511768 (conflict) (empty) (no description set)
Parent commit (@-) : kkmpptxz 0252a7f0 (conflict) C
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict
New conflicts appeared in 2 commits:
kkmpptxz 331a2fce (conflict) C
rlvkpnrz b42f84eb (conflict) B
kkmpptxz 0252a7f0 (conflict) C
rlvkpnrz fcfd7304 (conflict) B
Hint: To resolve the conflicts, start by updating to one of the first ones:
jj new kkmpptxz
jj new rlvkpnrz
@@ -85,8 +85,8 @@ fn test_report_conflicts() {
let output = work_dir.run_jj(["new", "rlvkpnrzqnoo"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: vruxwmqv 0485e30f (conflict) (empty) (no description set)
Parent commit (@-) : rlvkpnrz b42f84eb (conflict) B
Working copy (@) now at: vruxwmqv 55514f4e (conflict) (empty) (no description set)
Parent commit (@-) : rlvkpnrz fcfd7304 (conflict) B
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict including 1 deletion
@@ -96,8 +96,8 @@ fn test_report_conflicts() {
let output = work_dir.run_jj(["squash"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: yostqsxw f5a0cf8c (empty) (no description set)
Parent commit (@-) : rlvkpnrz 87370844 B
Working copy (@) now at: yostqsxw 350a6e50 (empty) (no description set)
Parent commit (@-) : rlvkpnrz 1aa1004b B
Existing conflicts were resolved or abandoned from 1 commits.
[EOF]
");
@@ -125,15 +125,15 @@ fn test_report_conflicts_with_divergent_commits() {
------- stderr -------
Concurrent modification detected, resolving automatically.
Rebased 3 commits onto destination
Working copy (@) now at: zsuskuln?? 4ca807ad (conflict) C2
Parent commit (@-) : kkmpptxz b42f84eb (conflict) B
Working copy (@) now at: zsuskuln?? 08a31f4f (conflict) C2
Parent commit (@-) : kkmpptxz 099d6624 (conflict) B
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict including 1 deletion
New conflicts appeared in 3 commits:
zsuskuln?? 1db43f23 (conflict) C3
zsuskuln?? 4ca807ad (conflict) C2
kkmpptxz b42f84eb (conflict) B
zsuskuln?? df34134a (conflict) C3
zsuskuln?? 08a31f4f (conflict) C2
kkmpptxz 099d6624 (conflict) B
Hint: To resolve the conflicts, start by updating to the first one:
jj new kkmpptxz
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -146,8 +146,8 @@ fn test_report_conflicts_with_divergent_commits() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 3 commits onto destination
Working copy (@) now at: zsuskuln?? f2d7a228 C2
Parent commit (@-) : kkmpptxz db069a22 B
Working copy (@) now at: zsuskuln?? 27ef05d9 C2
Parent commit (@-) : kkmpptxz 9039ed49 B
Added 0 files, modified 1 files, removed 0 files
Existing conflicts were resolved or abandoned from 3 commits.
[EOF]
@@ -158,13 +158,13 @@ fn test_report_conflicts_with_divergent_commits() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 commits onto destination
Working copy (@) now at: zsuskuln?? 3c36afc9 (conflict) C2
Working copy (@) now at: zsuskuln?? dfe73891 (conflict) C2
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict including 1 deletion
New conflicts appeared in 1 commits:
zsuskuln?? 3c36afc9 (conflict) C2
zsuskuln?? dfe73891 (conflict) C2
Hint: To resolve the conflicts, start by updating to it:
jj new zsuskuln
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -178,7 +178,7 @@ fn test_report_conflicts_with_divergent_commits() {
------- stderr -------
Rebased 1 commits onto destination
New conflicts appeared in 1 commits:
zsuskuln?? e3ff827e (conflict) C3
zsuskuln?? 02834578 (conflict) C3
Hint: To resolve the conflicts, start by updating to it:
jj new zsuskuln
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -191,8 +191,8 @@ fn test_report_conflicts_with_divergent_commits() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 commits onto destination
Working copy (@) now at: zsuskuln?? 1f9680bd C2
Parent commit (@-) : kkmpptxz db069a22 B
Working copy (@) now at: zsuskuln?? 3fcf2fd2 C2
Parent commit (@-) : kkmpptxz 9039ed49 B
Added 0 files, modified 1 files, removed 0 files
Existing conflicts were resolved or abandoned from 1 commits.
[EOF]
@@ -229,14 +229,14 @@ fn test_report_conflicts_with_resolving_conflicts_hint_disabled() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 3 commits onto destination
Working copy (@) now at: zsuskuln f8a2c4e0 (conflict) (empty) (no description set)
Parent commit (@-) : kkmpptxz 2271a49e (conflict) C
Working copy (@) now at: zsuskuln dd37d4a5 (conflict) (empty) (no description set)
Parent commit (@-) : kkmpptxz c7f5d6e5 (conflict) C
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict including 1 deletion
New conflicts appeared in 2 commits:
kkmpptxz 2271a49e (conflict) C
rlvkpnrz b7d83633 (conflict) B
kkmpptxz c7f5d6e5 (conflict) C
rlvkpnrz 032a8668 (conflict) B
[EOF]
");
}

168
cli/tests/test_resolve_command.rs
View File

@@ -72,9 +72,9 @@ fn test_resolution() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Resolving conflicts in: file
Working copy (@) now at: vruxwmqv e069f073 conflict | conflict
Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit (@-) : royxmykx db6a4daf b | b
Working copy (@) now at: vruxwmqv 741263c9 conflict | conflict
Parent commit (@-) : zsuskuln 45537d53 a | a
Parent commit (@-) : royxmykx 89d1b299 b | b
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -114,9 +114,9 @@ fn test_resolution() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Resolving conflicts in: file
Working copy (@) now at: vruxwmqv 1a70c7c6 conflict | conflict
Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit (@-) : royxmykx db6a4daf b | b
Working copy (@) now at: vruxwmqv 1f8a36f7 conflict | conflict
Parent commit (@-) : zsuskuln 45537d53 a | a
Parent commit (@-) : royxmykx 89d1b299 b | b
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -214,14 +214,14 @@ fn test_resolution() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Resolving conflicts in: file
Working copy (@) now at: vruxwmqv 608a2310 conflict | (conflict) conflict
Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit (@-) : royxmykx db6a4daf b | b
Working copy (@) now at: vruxwmqv 0d40d2b8 conflict | (conflict) conflict
Parent commit (@-) : zsuskuln 45537d53 a | a
Parent commit (@-) : royxmykx 89d1b299 b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict
New conflicts appeared in 1 commits:
vruxwmqv 608a2310 conflict | (conflict) conflict
vruxwmqv 0d40d2b8 conflict | (conflict) conflict
Hint: To resolve the conflicts, start by updating to it:
jj new vruxwmqv
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -289,9 +289,9 @@ fn test_resolution() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Resolving conflicts in: file
Working copy (@) now at: vruxwmqv 3166dfd2 conflict | conflict
Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit (@-) : royxmykx db6a4daf b | b
Working copy (@) now at: vruxwmqv 2cc7f5e3 conflict | conflict
Parent commit (@-) : zsuskuln 45537d53 a | a
Parent commit (@-) : royxmykx 89d1b299 b | b
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
@@ -357,14 +357,14 @@ fn test_resolution() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Resolving conflicts in: file
Working copy (@) now at: vruxwmqv 8e03fefa conflict | (conflict) conflict
Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit (@-) : royxmykx db6a4daf b | b
Working copy (@) now at: vruxwmqv d5f058ec conflict | (conflict) conflict
Parent commit (@-) : zsuskuln 45537d53 a | a
Parent commit (@-) : royxmykx 89d1b299 b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict
New conflicts appeared in 1 commits:
vruxwmqv 8e03fefa conflict | (conflict) conflict
vruxwmqv d5f058ec conflict | (conflict) conflict
Hint: To resolve the conflicts, start by updating to it:
jj new vruxwmqv
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -435,14 +435,14 @@ fn test_resolution() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Resolving conflicts in: file
Working copy (@) now at: vruxwmqv a786ac2f conflict | (conflict) conflict
Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit (@-) : royxmykx db6a4daf b | b
Working copy (@) now at: vruxwmqv 6c205356 conflict | (conflict) conflict
Parent commit (@-) : zsuskuln 45537d53 a | a
Parent commit (@-) : royxmykx 89d1b299 b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict
New conflicts appeared in 1 commits:
vruxwmqv a786ac2f conflict | (conflict) conflict
vruxwmqv 6c205356 conflict | (conflict) conflict
Hint: To resolve the conflicts, start by updating to it:
jj new vruxwmqv
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -738,15 +738,15 @@ fn test_simplify_conflict_sides() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Resolving conflicts in: fileB
Working copy (@) now at: nkmrtpmo 69cc0c2d conflict | (conflict) conflict
Parent commit (@-) : kmkuslsw 4601566f conflictA | (conflict) (empty) conflictA
Parent commit (@-) : lylxulpl 6f8d8381 conflictB | (conflict) (empty) conflictB
Working copy (@) now at: nkmrtpmo 25c5dd0b conflict | (conflict) conflict
Parent commit (@-) : kmkuslsw ccb05364 conflictA | (conflict) (empty) conflictA
Parent commit (@-) : lylxulpl d9bc60cb conflictB | (conflict) (empty) conflictB
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
fileA 2-sided conflict
fileB 2-sided conflict
New conflicts appeared in 1 commits:
nkmrtpmo 69cc0c2d conflict | (conflict) conflict
nkmrtpmo 25c5dd0b conflict | (conflict) conflict
Hint: To resolve the conflicts, start by updating to it:
jj new nkmrtpmo
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -970,14 +970,14 @@ fn test_resolve_conflicts_with_executable() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Resolving conflicts in: file1
Working copy (@) now at: znkkpsqq eb159d56 conflict | (conflict) conflict
Parent commit (@-) : mzvwutvl 08932848 a | a
Parent commit (@-) : yqosqzyt b69b3de6 b | b
Working copy (@) now at: znkkpsqq 8ab9c54e conflict | (conflict) conflict
Parent commit (@-) : mzvwutvl 86f7f0e3 a | a
Parent commit (@-) : yqosqzyt 36361412 b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file2 2-sided conflict including an executable
New conflicts appeared in 1 commits:
znkkpsqq eb159d56 conflict | (conflict) conflict
znkkpsqq 8ab9c54e conflict | (conflict) conflict
Hint: To resolve the conflicts, start by updating to it:
jj new znkkpsqq
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -1013,14 +1013,14 @@ fn test_resolve_conflicts_with_executable() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Resolving conflicts in: file2
Working copy (@) now at: znkkpsqq 4dccbb3c conflict | (conflict) conflict
Parent commit (@-) : mzvwutvl 08932848 a | a
Parent commit (@-) : yqosqzyt b69b3de6 b | b
Working copy (@) now at: znkkpsqq d47830a6 conflict | (conflict) conflict
Parent commit (@-) : mzvwutvl 86f7f0e3 a | a
Parent commit (@-) : yqosqzyt 36361412 b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file1 2-sided conflict including an executable
New conflicts appeared in 1 commits:
znkkpsqq 4dccbb3c conflict | (conflict) conflict
znkkpsqq d47830a6 conflict | (conflict) conflict
Hint: To resolve the conflicts, start by updating to it:
jj new znkkpsqq
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -1054,9 +1054,9 @@ fn test_resolve_conflicts_with_executable() {
let output = work_dir.run_jj(["resolve", "--tool=:ours"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: znkkpsqq 5b59d7f0 conflict | conflict
Parent commit (@-) : mzvwutvl 08932848 a | a
Parent commit (@-) : yqosqzyt b69b3de6 b | b
Working copy (@) now at: znkkpsqq d902c14b conflict | conflict
Parent commit (@-) : mzvwutvl 86f7f0e3 a | a
Parent commit (@-) : yqosqzyt 36361412 b | b
Added 0 files, modified 2 files, removed 0 files
[EOF]
");
@@ -1095,9 +1095,9 @@ fn test_resolve_conflicts_with_executable() {
let output = work_dir.run_jj(["resolve", "--tool=:theirs"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: znkkpsqq 087b8637 conflict | conflict
Parent commit (@-) : mzvwutvl 08932848 a | a
Parent commit (@-) : yqosqzyt b69b3de6 b | b
Working copy (@) now at: znkkpsqq a340ca5f conflict | conflict
Parent commit (@-) : mzvwutvl 86f7f0e3 a | a
Parent commit (@-) : yqosqzyt 36361412 b | b
Added 0 files, modified 2 files, removed 0 files
[EOF]
");
@@ -1195,9 +1195,9 @@ fn test_resolve_change_delete_executable() {
[EOF]
");
insta::assert_snapshot!(work_dir.run_jj(["log", "--git"]), @r"
@ kmkuslsw test.user@example.com 2001-02-03 08:05:18 conflict 5db5dbdf conflict
@ kmkuslsw test.user@example.com 2001-02-03 08:05:18 conflict 7a7ac759 conflict
├─╮ (empty) conflict
│ ○ vruxwmqv test.user@example.com 2001-02-03 08:05:17 b 19e7d2ff
│ ○ vruxwmqv test.user@example.com 2001-02-03 08:05:17 b 888b6cc3
│ │ b
│ │ diff --git a/file1 b/file1
│ │ deleted file mode 100644
@@ -1222,7 +1222,7 @@ fn test_resolve_change_delete_executable() {
│ │ +++ b/file5
│ │ @@ -0,0 +1,1 @@
│ │ +b5
○ │ mzvwutvl test.user@example.com 2001-02-03 08:05:13 a 4a44e1a9
○ │ mzvwutvl test.user@example.com 2001-02-03 08:05:13 a e2d3924b
├─╯ a
│ diff --git a/file1 b/file1
│ old mode 100644
@@ -1242,7 +1242,7 @@ fn test_resolve_change_delete_executable() {
│ diff --git a/file5 b/file5
│ deleted file mode 100755
│ index e69de29bb2..0000000000
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 base dd88cb4a
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 base f747aa1f
│ base
│ diff --git a/file1 b/file1
│ new file mode 100644
@@ -1296,9 +1296,9 @@ fn test_resolve_change_delete_executable() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Resolving conflicts in: file2
Working copy (@) now at: kmkuslsw cab8be9b conflict | (conflict) conflict
Parent commit (@-) : mzvwutvl 4a44e1a9 a | a
Parent commit (@-) : vruxwmqv 19e7d2ff b | b
Working copy (@) now at: kmkuslsw 1323520e conflict | (conflict) conflict
Parent commit (@-) : mzvwutvl e2d3924b a | a
Parent commit (@-) : vruxwmqv 888b6cc3 b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file3 2-sided conflict including an executable
@@ -1327,9 +1327,9 @@ fn test_resolve_change_delete_executable() {
let output = work_dir.run_jj(["resolve", "file4", "--tool=:ours"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kmkuslsw 14b5c3d2 conflict | (conflict) conflict
Parent commit (@-) : mzvwutvl 4a44e1a9 a | a
Parent commit (@-) : vruxwmqv 19e7d2ff b | b
Working copy (@) now at: kmkuslsw 630e8689 conflict | (conflict) conflict
Parent commit (@-) : mzvwutvl e2d3924b a | a
Parent commit (@-) : vruxwmqv 888b6cc3 b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file5 2-sided conflict including 1 deletion and an executable
@@ -1340,9 +1340,9 @@ fn test_resolve_change_delete_executable() {
let output = work_dir.run_jj(["resolve", "file5", "--tool=:theirs"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kmkuslsw 5de68577 conflict | conflict
Parent commit (@-) : mzvwutvl 4a44e1a9 a | a
Parent commit (@-) : vruxwmqv 19e7d2ff b | b
Working copy (@) now at: kmkuslsw 7337267a conflict | conflict
Parent commit (@-) : mzvwutvl e2d3924b a | a
Parent commit (@-) : vruxwmqv 888b6cc3 b | b
Added 0 files, modified 1 files, removed 0 files
Existing conflicts were resolved or abandoned from 1 commits.
[EOF]
@@ -1412,14 +1412,14 @@ fn test_resolve_long_conflict_markers() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Resolving conflicts in: file
Working copy (@) now at: vruxwmqv 2b985546 conflict | (conflict) conflict
Parent commit (@-) : zsuskuln 64177fd4 a | a
Parent commit (@-) : royxmykx db442c1e b | b
Working copy (@) now at: vruxwmqv 1e254ee3 conflict | (conflict) conflict
Parent commit (@-) : zsuskuln 10d994ef a | a
Parent commit (@-) : royxmykx 7f215575 b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict
New conflicts appeared in 1 commits:
vruxwmqv 2b985546 conflict | (conflict) conflict
vruxwmqv 1e254ee3 conflict | (conflict) conflict
Hint: To resolve the conflicts, start by updating to it:
jj new vruxwmqv
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -1481,14 +1481,14 @@ fn test_resolve_long_conflict_markers() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Resolving conflicts in: file
Working copy (@) now at: vruxwmqv fac9406d conflict | (conflict) conflict
Parent commit (@-) : zsuskuln 64177fd4 a | a
Parent commit (@-) : royxmykx db442c1e b | b
Working copy (@) now at: vruxwmqv 2481a401 conflict | (conflict) conflict
Parent commit (@-) : zsuskuln 10d994ef a | a
Parent commit (@-) : royxmykx 7f215575 b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict
New conflicts appeared in 1 commits:
vruxwmqv fac9406d conflict | (conflict) conflict
vruxwmqv 2481a401 conflict | (conflict) conflict
Hint: To resolve the conflicts, start by updating to it:
jj new vruxwmqv
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -1556,14 +1556,14 @@ fn test_resolve_long_conflict_markers() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Resolving conflicts in: file
Working copy (@) now at: vruxwmqv 1b29631a conflict | (conflict) conflict
Parent commit (@-) : zsuskuln 64177fd4 a | a
Parent commit (@-) : royxmykx db442c1e b | b
Working copy (@) now at: vruxwmqv 2cf0bfd3 conflict | (conflict) conflict
Parent commit (@-) : zsuskuln 10d994ef a | a
Parent commit (@-) : royxmykx 7f215575 b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict
New conflicts appeared in 1 commits:
vruxwmqv 1b29631a conflict | (conflict) conflict
vruxwmqv 2cf0bfd3 conflict | (conflict) conflict
Hint: To resolve the conflicts, start by updating to it:
jj new vruxwmqv
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -1687,14 +1687,14 @@ fn test_multiple_conflicts() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Resolving conflicts in: another_file
Working copy (@) now at: vruxwmqv 309e981c conflict | (conflict) conflict
Parent commit (@-) : zsuskuln de7553ef a | a
Parent commit (@-) : royxmykx f68bc2f0 b | b
Working copy (@) now at: vruxwmqv d3584f6e conflict | (conflict) conflict
Parent commit (@-) : zsuskuln 2c821f70 a | a
Parent commit (@-) : royxmykx 4c2029de b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
this_file_has_a_very_long_name_to_test_padding 2-sided conflict
New conflicts appeared in 1 commits:
vruxwmqv 309e981c conflict | (conflict) conflict
vruxwmqv d3584f6e conflict | (conflict) conflict
Hint: To resolve the conflicts, start by updating to it:
jj new vruxwmqv
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -1857,14 +1857,14 @@ fn test_multiple_conflicts_with_error() {
------- stderr -------
Resolving conflicts in: file1
Resolving conflicts in: file2
Working copy (@) now at: vruxwmqv d2f3f858 conflict | (conflict) conflict
Parent commit (@-) : zsuskuln 9db7fdfb a | a
Parent commit (@-) : royxmykx d67e26e4 b | b
Working copy (@) now at: vruxwmqv 98296abe conflict | (conflict) conflict
Parent commit (@-) : zsuskuln 6c31698c a | a
Parent commit (@-) : royxmykx ba0a5538 b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file2 2-sided conflict
New conflicts appeared in 1 commits:
vruxwmqv d2f3f858 conflict | (conflict) conflict
vruxwmqv 98296abe conflict | (conflict) conflict
Hint: To resolve the conflicts, start by updating to it:
jj new vruxwmqv
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -1908,14 +1908,14 @@ fn test_multiple_conflicts_with_error() {
------- stderr -------
Resolving conflicts in: file1
Resolving conflicts in: file2
Working copy (@) now at: vruxwmqv 0a54e8ed conflict | (conflict) conflict
Parent commit (@-) : zsuskuln 9db7fdfb a | a
Parent commit (@-) : royxmykx d67e26e4 b | b
Working copy (@) now at: vruxwmqv 7daa6406 conflict | (conflict) conflict
Parent commit (@-) : zsuskuln 6c31698c a | a
Parent commit (@-) : royxmykx ba0a5538 b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file2 2-sided conflict
New conflicts appeared in 1 commits:
vruxwmqv 0a54e8ed conflict | (conflict) conflict
vruxwmqv 7daa6406 conflict | (conflict) conflict
Hint: To resolve the conflicts, start by updating to it:
jj new vruxwmqv
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -2040,10 +2040,10 @@ fn test_resolve_with_contents_of_side() {
let output = work_dir.run_jj(["resolve", "--tool", ":ours"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: znkkpsqq c83edc52 conflict | conflict
Parent commit (@-) : zsuskuln 83b81681 a | a
Parent commit (@-) : royxmykx 4f6eff49 b | b
Parent commit (@-) : vruxwmqv 1e360aff c | c
Working copy (@) now at: znkkpsqq 5410a03a conflict | conflict
Parent commit (@-) : zsuskuln 72dced6e a | a
Parent commit (@-) : royxmykx e5747f42 b | b
Parent commit (@-) : vruxwmqv dd35236a c | c
Added 0 files, modified 2 files, removed 0 files
[EOF]
");
@@ -2062,10 +2062,10 @@ fn test_resolve_with_contents_of_side() {
let output = work_dir.run_jj(["resolve", "--tool", ":theirs"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: znkkpsqq baf3a71d conflict | conflict
Parent commit (@-) : zsuskuln 83b81681 a | a
Parent commit (@-) : royxmykx 4f6eff49 b | b
Parent commit (@-) : vruxwmqv 1e360aff c | c
Working copy (@) now at: znkkpsqq c07b2e9e conflict | conflict
Parent commit (@-) : zsuskuln 72dced6e a | a
Parent commit (@-) : royxmykx e5747f42 b | b
Parent commit (@-) : vruxwmqv dd35236a c | c
Added 0 files, modified 2 files, removed 0 files
[EOF]
");

104
cli/tests/test_restore_command.rs
View File

@@ -46,8 +46,8 @@ fn test_restore() {
let output = work_dir.run_jj(["restore"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz 370d81ea (empty) (no description set)
Parent commit (@-) : rlvkpnrz ef160660 (no description set)
Working copy (@) now at: kkmpptxz 17c14d1e (empty) (no description set)
Parent commit (@-) : rlvkpnrz 1d3e40a3 (no description set)
Added 1 files, modified 1 files, removed 1 files
[EOF]
");
@@ -65,13 +65,13 @@ fn test_restore() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: kkmpptxz 5b361547 (conflict) (no description set)
Parent commit (@-) : rlvkpnrz b9b6011e (empty) (no description set)
Working copy (@) now at: kkmpptxz c1d65a0f (conflict) (no description set)
Parent commit (@-) : rlvkpnrz c1c000ff (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file2 2-sided conflict including 1 deletion
New conflicts appeared in 1 commits:
kkmpptxz 5b361547 (conflict) (no description set)
kkmpptxz c1d65a0f (conflict) (no description set)
Hint: To resolve the conflicts, start by updating to it:
jj new kkmpptxz
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -87,8 +87,8 @@ fn test_restore() {
let output = work_dir.run_jj(["restore", "--from", "@--"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz 1154634b (no description set)
Parent commit (@-) : rlvkpnrz ef160660 (no description set)
Working copy (@) now at: kkmpptxz c1acd0d0 (no description set)
Parent commit (@-) : rlvkpnrz 1d3e40a3 (no description set)
Added 1 files, modified 0 files, removed 2 files
[EOF]
");
@@ -104,8 +104,8 @@ fn test_restore() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: kkmpptxz 3fcdcbf2 (empty) (no description set)
Parent commit (@-) : rlvkpnrz ad805965 (no description set)
Working copy (@) now at: kkmpptxz dae0b693 (empty) (no description set)
Parent commit (@-) : rlvkpnrz fee0934c (no description set)
[EOF]
");
let output = work_dir.run_jj(["diff", "-s"]);
@@ -124,8 +124,8 @@ fn test_restore() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: kkmpptxz 9c6f2083 (empty) (no description set)
Parent commit (@-) : rlvkpnrz f256040a (no description set)
Working copy (@) now at: kkmpptxz 9091b582 (empty) (no description set)
Parent commit (@-) : rlvkpnrz 77d86105 (no description set)
[EOF]
");
let output = work_dir.run_jj(["diff", "-s"]);
@@ -143,8 +143,8 @@ fn test_restore() {
let output = work_dir.run_jj(["restore", "file2", "file3"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz 4ad35a2f (no description set)
Parent commit (@-) : rlvkpnrz ef160660 (no description set)
Working copy (@) now at: kkmpptxz 28a274ee (no description set)
Parent commit (@-) : rlvkpnrz 1d3e40a3 (no description set)
Added 0 files, modified 1 files, removed 1 files
[EOF]
");
@@ -206,9 +206,9 @@ fn test_restore_conflicted_merge() {
let output = work_dir.run_jj(["restore", "file"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: vruxwmqv 25a37060 conflict | (conflict) (empty) conflict
Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit (@-) : royxmykx db6a4daf b | b
Working copy (@) now at: vruxwmqv f587c5e5 conflict | (conflict) (empty) conflict
Parent commit (@-) : zsuskuln 45537d53 a | a
Parent commit (@-) : royxmykx 89d1b299 b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict
@@ -245,9 +245,9 @@ fn test_restore_conflicted_merge() {
let output = work_dir.run_jj(["restore"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: vruxwmqv f2c82b9c conflict | (conflict) (empty) conflict
Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit (@-) : royxmykx db6a4daf b | b
Working copy (@) now at: vruxwmqv 846bb35c conflict | (conflict) (empty) conflict
Parent commit (@-) : zsuskuln 45537d53 a | a
Parent commit (@-) : royxmykx 89d1b299 b | b
Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict
@@ -298,9 +298,9 @@ fn test_restore_restore_descendants() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits (while preserving their content)
Working copy (@) now at: vruxwmqv bf5491a0 ab | ab
Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit (@-) : royxmykx 3fd5aa05 b | b
Working copy (@) now at: vruxwmqv 14c0c336 ab | ab
Parent commit (@-) : zsuskuln 45537d53 a | a
Parent commit (@-) : royxmykx 5fd3f8c5 b | b
[EOF]
");
@@ -351,12 +351,12 @@ fn test_restore_interactive() {
);
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:11 b c0745ce2
@ zsuskuln test.user@example.com 2001-02-03 08:05:11 b 38153274
│ b
│ M file1
│ M file2
│ A file3
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 186caaef
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 6c8d5b87
│ a
│ A file1
│ A file2
@@ -377,16 +377,16 @@ fn test_restore_interactive() {
let output = work_dir.run_jj(["restore", "-i", "--from=@-"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: zsuskuln bccde490 b | b
Parent commit (@-) : rlvkpnrz 186caaef a | a
Working copy (@) now at: zsuskuln 7cd0a341 b | b
Parent commit (@-) : rlvkpnrz 6c8d5b87 a | a
Added 0 files, modified 1 files, removed 1 files
[EOF]
");
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("instrs")).unwrap(), @r"
You are restoring changes from: rlvkpnrz 186caaef a | a
to commit: zsuskuln c0745ce2 b | b
You are restoring changes from: rlvkpnrz 6c8d5b87 a | a
to commit: zsuskuln 38153274 b | b
The diff initially shows all changes restored. Adjust the right side until it
shows the contents you want for the destination commit.
@@ -394,10 +394,10 @@ fn test_restore_interactive() {
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:13 b bccde490
@ zsuskuln test.user@example.com 2001-02-03 08:05:13 b 7cd0a341
│ b
│ M file2
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 186caaef
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 6c8d5b87
│ a
│ A file1
│ A file2
@@ -410,18 +410,18 @@ fn test_restore_interactive() {
let output = work_dir.run_jj(["restore", "--tool=fake-diff-editor"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: zsuskuln 5921de19 b | b
Parent commit (@-) : rlvkpnrz 186caaef a | a
Working copy (@) now at: zsuskuln 0f1263f5 b | b
Parent commit (@-) : rlvkpnrz 6c8d5b87 a | a
Added 0 files, modified 1 files, removed 1 files
[EOF]
");
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:16 b 5921de19
@ zsuskuln test.user@example.com 2001-02-03 08:05:16 b 0f1263f5
│ b
│ M file2
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 186caaef
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 6c8d5b87
│ a
│ A file1
│ A file2
@@ -447,15 +447,15 @@ fn test_restore_interactive_merge() {
);
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ royxmykx test.user@example.com 2001-02-03 08:05:13 c 34042291
@ royxmykx test.user@example.com 2001-02-03 08:05:13 c e37470c3
├─╮ c
│ │ M file1
│ │ M file2
│ │ A file3
│ ○ zsuskuln test.user@example.com 2001-02-03 08:05:11 b 29e70804
│ ○ zsuskuln test.user@example.com 2001-02-03 08:05:11 b ca7e57cd
│ │ b
│ │ A file2
○ │ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 79c1b823
○ │ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 78059355
├─╯ a
│ A file1
◆ zzzzzzzz root() 00000000
@@ -475,18 +475,18 @@ fn test_restore_interactive_merge() {
let output = work_dir.run_jj(["restore", "-i"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: royxmykx 72e0cbf4 c | c
Parent commit (@-) : rlvkpnrz 79c1b823 a | a
Parent commit (@-) : zsuskuln 29e70804 b | b
Working copy (@) now at: royxmykx 196af27b c | c
Parent commit (@-) : rlvkpnrz 78059355 a | a
Parent commit (@-) : zsuskuln ca7e57cd b | b
Added 0 files, modified 1 files, removed 1 files
[EOF]
");
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("instrs")).unwrap(), @r"
You are restoring changes from: rlvkpnrz 79c1b823 a | a
zsuskuln 29e70804 b | b
to commit: royxmykx 34042291 c | c
You are restoring changes from: rlvkpnrz 78059355 a | a
zsuskuln ca7e57cd b | b
to commit: royxmykx e37470c3 c | c
The diff initially shows all changes restored. Adjust the right side until it
shows the contents you want for the destination commit.
@@ -494,13 +494,13 @@ fn test_restore_interactive_merge() {
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ royxmykx test.user@example.com 2001-02-03 08:05:15 c 72e0cbf4
@ royxmykx test.user@example.com 2001-02-03 08:05:15 c 196af27b
├─╮ c
│ │ M file2
│ ○ zsuskuln test.user@example.com 2001-02-03 08:05:11 b 29e70804
│ ○ zsuskuln test.user@example.com 2001-02-03 08:05:11 b ca7e57cd
│ │ b
│ │ A file2
○ │ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 79c1b823
○ │ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 78059355
├─╯ a
│ A file1
◆ zzzzzzzz root() 00000000
@@ -524,12 +524,12 @@ fn test_restore_interactive_with_paths() {
);
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:11 b c0745ce2
@ zsuskuln test.user@example.com 2001-02-03 08:05:11 b 38153274
│ b
│ M file1
│ M file2
│ A file3
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 186caaef
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 6c8d5b87
│ a
│ A file1
│ A file2
@@ -549,19 +549,19 @@ fn test_restore_interactive_with_paths() {
let output = work_dir.run_jj(["restore", "-i", "file1", "file2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: zsuskuln 7187da33 b | b
Parent commit (@-) : rlvkpnrz 186caaef a | a
Working copy (@) now at: zsuskuln 8b2f997d b | b
Parent commit (@-) : rlvkpnrz 6c8d5b87 a | a
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:13 b 7187da33
@ zsuskuln test.user@example.com 2001-02-03 08:05:13 b 8b2f997d
│ b
│ M file2
│ A file3
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 186caaef
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 6c8d5b87
│ a
│ A file1
│ A file2

154
cli/tests/test_revert_command.rs
View File

@@ -29,10 +29,10 @@ fn test_revert() {
create_commit_with_files(&work_dir, "d", &["c"], &[]);
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ cf3ddd838fd1 d
○ 14e954305d4b c
○ aa48676d4a49 b
○ 2443ea76b0b1 a
@ 98fb6151f954 d
○ 96ff42270bbc c
○ 58aaf278bf58 b
○ 7d980be7a1d4 a
◆ 000000000000
[EOF]
");
@@ -62,17 +62,17 @@ fn test_revert() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Reverted 1 commits as follows:
lylxulpl f844336e Revert "a"
lylxulpl bd658e04 Revert "a"
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
○ f844336ef2a5 Revert "a"
○ bd658e0413c5 Revert "a"
│
│ This reverts commit 2443ea76b0b1c531326908326aab7020abab8e6c.
@ cf3ddd838fd1 d
○ 14e954305d4b c
○ aa48676d4a49 b
○ 2443ea76b0b1 a
│ This reverts commit 7d980be7a1d499e4d316ab4c01242885032f7eaf.
@ 98fb6151f954 d
○ 96ff42270bbc c
○ 58aaf278bf58 b
○ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);
@@ -87,20 +87,20 @@ fn test_revert() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Reverted 1 commits as follows:
uyznsvlq 57fb197b Revert "Revert "a""
uyznsvlq fee69440 Revert "Revert "a""
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
○ 57fb197b953f Revert "Revert "a""
○ fee69440c3d9 Revert "Revert "a""
│
│ This reverts commit f844336ef2a54f4499a5efefa1a9549451276316.
○ f844336ef2a5 Revert "a"
│ This reverts commit bd658e0413c590b93dcbabec38fc5d15258469a1.
○ bd658e0413c5 Revert "a"
│
│ This reverts commit 2443ea76b0b1c531326908326aab7020abab8e6c.
@ cf3ddd838fd1 d
○ 14e954305d4b c
○ aa48676d4a49 b
○ 2443ea76b0b1 a
│ This reverts commit 7d980be7a1d499e4d316ab4c01242885032f7eaf.
@ 98fb6151f954 d
○ 96ff42270bbc c
○ 58aaf278bf58 b
○ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);
@@ -116,21 +116,21 @@ fn test_revert() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Reverted 1 commits as follows:
tlkvzzqu ff67400f Revert "a"
tlkvzzqu ccdc971f Revert "a"
Rebased 2 descendant commits
Working copy (@) now at: vruxwmqv 37ad0315 d | (empty) d
Parent commit (@-) : royxmykx ca80e93f c | (empty) c
Working copy (@) now at: vruxwmqv c114bcab d | (empty) d
Parent commit (@-) : royxmykx 59e91fd2 c | (empty) c
Added 0 files, modified 0 files, removed 1 files
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ 37ad03151aa7 d
○ ca80e93fdef9 c
○ ff67400f3e1f Revert "a"
@ c114bcabdf5e d
○ 59e91fd21873 c
○ ccdc971f590b Revert "a"
│
│ This reverts commit 2443ea76b0b1c531326908326aab7020abab8e6c.
○ aa48676d4a49 b
○ 2443ea76b0b1 a
│ This reverts commit 7d980be7a1d499e4d316ab4c01242885032f7eaf.
○ 58aaf278bf58 b
○ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);
@@ -146,21 +146,21 @@ fn test_revert() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Reverted 1 commits as follows:
xlzxqlsl 0b91fe42 Revert "a"
xlzxqlsl afc1d158 Revert "a"
Rebased 1 descendant commits
Working copy (@) now at: vruxwmqv 3a8a8069 d | (empty) d
Parent commit (@-) : xlzxqlsl 0b91fe42 Revert "a"
Working copy (@) now at: vruxwmqv cdc45e62 d | (empty) d
Parent commit (@-) : xlzxqlsl afc1d158 Revert "a"
Added 0 files, modified 0 files, removed 1 files
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ 3a8a80692ac3 d
○ 0b91fe42616d Revert "a"
@ cdc45e62ac5b d
○ afc1d15825d2 Revert "a"
│
│ This reverts commit 2443ea76b0b1c531326908326aab7020abab8e6c.
○ 14e954305d4b c
○ aa48676d4a49 b
○ 2443ea76b0b1 a
│ This reverts commit 7d980be7a1d499e4d316ab4c01242885032f7eaf.
○ 96ff42270bbc c
○ 58aaf278bf58 b
○ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);
@@ -176,24 +176,24 @@ fn test_revert() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Reverted 1 commits as follows:
pkstwlsy 29508aef Revert "a"
pkstwlsy 6c118c03 Revert "a"
Rebased 1 descendant commits
Working copy (@) now at: vruxwmqv 3489c981 d | (empty) d
Parent commit (@-) : royxmykx 14e95430 c | (empty) c
Parent commit (@-) : pkstwlsy 29508aef Revert "a"
Working copy (@) now at: vruxwmqv 3f3fb2f9 d | (empty) d
Parent commit (@-) : royxmykx 96ff4227 c | (empty) c
Parent commit (@-) : pkstwlsy 6c118c03 Revert "a"
Added 0 files, modified 0 files, removed 1 files
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ 3489c98177aa d
@ 3f3fb2f905d3 d
├─╮
│ ○ 29508aefc220 Revert "a"
│ ○ 6c118c03ae97 Revert "a"
│ │
│ │ This reverts commit 2443ea76b0b1c531326908326aab7020abab8e6c.
○ │ 14e954305d4b c
○ │ aa48676d4a49 b
│ │ This reverts commit 7d980be7a1d499e4d316ab4c01242885032f7eaf.
○ │ 96ff42270bbc c
○ │ 58aaf278bf58 b
├─╯
○ 2443ea76b0b1 a
○ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);
@@ -219,11 +219,11 @@ fn test_revert_multiple() {
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 208f8612074a e
○ ceeec03be46b d
○ 413337bbd11f c
○ 46cc97af6802 b
○ 2443ea76b0b1 a
@ 51a01d6d8cc4 e
○ 4b9d123d3b33 d
○ 05e1f540476f c
○ f93a910dbdf0 b
○ 7d980be7a1d4 a
◆ 000000000000
[EOF]
");
@@ -233,40 +233,40 @@ fn test_revert_multiple() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Reverted 3 commits as follows:
wqnwkozp 05f5fa79 Revert "e"
mouksmqu f5d9e8b2 Revert "c"
tqvpomtp fb78f44d Revert "b"
wqnwkozp 4329cf72 Revert "e"
mouksmqu 092f722e Revert "c"
tqvpomtp c90eef02 Revert "b"
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
○ fb78f44decd2 Revert "b"
○ c90eef022369 Revert "b"
│
│ This reverts commit 46cc97af6802301d8db381386e8485ff3ff24ae6.
○ f5d9e8b20bd1 Revert "c"
│ This reverts commit f93a910dbdf0f841e6cf2bc0ab0ba4c336d6f436.
○ 092f722e521f Revert "c"
│
│ This reverts commit 413337bbd11f7a6636c010d9e196acf801d8df2f.
○ 05f5fa79161a Revert "e"
│ This reverts commit 05e1f540476f8c4207ff44febbe2ce6e6696dc4b.
○ 4329cf7230d7 Revert "e"
│
│ This reverts commit 208f8612074af4c219d06568a8e1f04f2e80dc25.
@ 208f8612074a e
○ ceeec03be46b d
○ 413337bbd11f c
○ 46cc97af6802 b
○ 2443ea76b0b1 a
│ This reverts commit 51a01d6d8cc48a296cb87f8383b34ade3c050363.
@ 51a01d6d8cc4 e
○ 4b9d123d3b33 d
○ 05e1f540476f c
○ f93a910dbdf0 b
○ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);
// View the output of each reverted commit
let output = work_dir.run_jj(["show", "@+"]);
insta::assert_snapshot!(output, @r#"
Commit ID: 05f5fa79161a41b9ed3dc11e156d18de8abc7907
Commit ID: 4329cf7230d7b8229e9c88087cfa2f8aa13a1317
Change ID: wqnwkozpkustnxypnnntnykwrqrkrpvv
Author : Test User <test.user@example.com> (2001-02-03 08:05:19)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:19)
Revert "e"
This reverts commit 208f8612074af4c219d06568a8e1f04f2e80dc25.
This reverts commit 51a01d6d8cc48a296cb87f8383b34ade3c050363.
Modified regular file a:
1 1: a
@@ -276,14 +276,14 @@ fn test_revert_multiple() {
"#);
let output = work_dir.run_jj(["show", "@++"]);
insta::assert_snapshot!(output, @r#"
Commit ID: f5d9e8b20bd1c5c7485e8baab4b287759c717a52
Commit ID: 092f722e521fe49fde5a3830568fe1c51b8f2f5f
Change ID: mouksmquosnpvwqrpsvvxtxpywpnxlss
Author : Test User <test.user@example.com> (2001-02-03 08:05:19)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:19)
Revert "c"
This reverts commit 413337bbd11f7a6636c010d9e196acf801d8df2f.
This reverts commit 05e1f540476f8c4207ff44febbe2ce6e6696dc4b.
Removed regular file b:
1 : b
@@ -291,14 +291,14 @@ fn test_revert_multiple() {
"#);
let output = work_dir.run_jj(["show", "@+++"]);
insta::assert_snapshot!(output, @r#"
Commit ID: fb78f44decd2082bc2a6940624744c90b20635a8
Commit ID: c90eef022369d43d5eae8303101b5889b4b73963
Change ID: tqvpomtpwrqsylrpsxknultrymmqxmxv
Author : Test User <test.user@example.com> (2001-02-03 08:05:19)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:19)
Revert "b"
This reverts commit 46cc97af6802301d8db381386e8485ff3ff24ae6.
This reverts commit f93a910dbdf0f841e6cf2bc0ab0ba4c336d6f436.
Modified regular file a:
1 1: a
@@ -328,7 +328,7 @@ fn test_revert_description_template() {
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 2443ea76b0b1 a
@ 7d980be7a1d4 a
◆ 000000000000
[EOF]
");
@@ -343,12 +343,12 @@ fn test_revert_description_template() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Reverted 1 commits as follows:
royxmykx 1db880a5 Revert commit 2443ea76b0b1 "a"
royxmykx 6bfb98a3 Revert commit 7d980be7a1d4 "a"
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&work_dir), @r#"
○ 1db880a5204e Revert commit 2443ea76b0b1 "a"
@ 2443ea76b0b1 a
○ 6bfb98a33f58 Revert commit 7d980be7a1d4 "a"
@ 7d980be7a1d4 a
◆ 000000000000
[EOF]
"#);

8
cli/tests/test_revset_output.rs
View File

@@ -619,7 +619,7 @@ fn test_all_modifier() {
------- stderr -------
Error: Revset `all()` resolved to more than one revision
Hint: The revset `all()` resolved to these revisions:
qpvuntsm 230dd059 (empty) (no description set)
qpvuntsm e8849ae1 (empty) (no description set)
zzzzzzzz 00000000 (empty) (no description set)
Hint: Prefix the expression with `all:` to allow any number of revisions (i.e. `all:all()`).
[EOF]
@@ -636,7 +636,7 @@ fn test_all_modifier() {
// Command that accepts multiple revisions by default
let output = work_dir.run_jj(["log", "-rall:all()"]);
insta::assert_snapshot!(output, @r"
@ qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059
@ qpvuntsm test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
◆ zzzzzzzz root() 00000000
[EOF]
@@ -646,7 +646,7 @@ fn test_all_modifier() {
let output = work_dir.run_jj(["bookmark", "create", "-rall:@", "x"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Created 1 bookmarks pointing to qpvuntsm 230dd059 x | (empty) (no description set)
Created 1 bookmarks pointing to qpvuntsm e8849ae1 x | (empty) (no description set)
[EOF]
");
let output = work_dir.run_jj(["bookmark", "set", "-rall:all()", "x"]);
@@ -654,7 +654,7 @@ fn test_all_modifier() {
------- stderr -------
Error: Revset `all:all()` resolved to more than one revision
Hint: The revset `all:all()` resolved to these revisions:
qpvuntsm 230dd059 x | (empty) (no description set)
qpvuntsm e8849ae1 x | (empty) (no description set)
zzzzzzzz 00000000 (empty) (no description set)
[EOF]
[exit status: 1]

22
cli/tests/test_show_command.rs
View File

@@ -50,7 +50,7 @@ fn test_show_basic() {
let output = work_dir.run_jj(["show"]);
insta::assert_snapshot!(output, @r"
Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f
Commit ID: 92e687faa4e5b681937f5a9c47feaa33e6b4892c
Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
Author : Test User <test.user@example.com> (2001-02-03 08:05:09)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:09)
@@ -67,7 +67,7 @@ fn test_show_basic() {
let output = work_dir.run_jj(["show", "--context=0"]);
insta::assert_snapshot!(output, @r"
Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f
Commit ID: 92e687faa4e5b681937f5a9c47feaa33e6b4892c
Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
Author : Test User <test.user@example.com> (2001-02-03 08:05:09)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:09)
@@ -84,7 +84,7 @@ fn test_show_basic() {
let output = work_dir.run_jj(["show", "--color=debug"]);
insta::assert_snapshot!(output, @r"
Commit ID: <<commit_id::e34f04317a81edc6ba41fef239c0d0180f10656f>>
Commit ID: <<commit_id::92e687faa4e5b681937f5a9c47feaa33e6b4892c>>
Change ID: <<change_id::rlvkpnrzqnoowoytxnquwvuryrwnrmlp>>
Author : <<author name::Test User>> <<<author email local::test.user>><<author email::@>><<author email domain::example.com>>> (<<author timestamp local format::2001-02-03 08:05:09>>)
Committer: <<committer name::Test User>> <<<committer email local::test.user>><<committer email::@>><<committer email domain::example.com>>> (<<committer timestamp local format::2001-02-03 08:05:09>>)
@@ -101,7 +101,7 @@ fn test_show_basic() {
let output = work_dir.run_jj(["show", "-s"]);
insta::assert_snapshot!(output, @r"
Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f
Commit ID: 92e687faa4e5b681937f5a9c47feaa33e6b4892c
Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
Author : Test User <test.user@example.com> (2001-02-03 08:05:09)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:09)
@@ -115,7 +115,7 @@ fn test_show_basic() {
let output = work_dir.run_jj(["show", "--types"]);
insta::assert_snapshot!(output, @r"
Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f
Commit ID: 92e687faa4e5b681937f5a9c47feaa33e6b4892c
Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
Author : Test User <test.user@example.com> (2001-02-03 08:05:09)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:09)
@@ -129,7 +129,7 @@ fn test_show_basic() {
let output = work_dir.run_jj(["show", "--git"]);
insta::assert_snapshot!(output, @r"
Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f
Commit ID: 92e687faa4e5b681937f5a9c47feaa33e6b4892c
Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
Author : Test User <test.user@example.com> (2001-02-03 08:05:09)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:09)
@@ -153,7 +153,7 @@ fn test_show_basic() {
let output = work_dir.run_jj(["show", "--git", "--context=0"]);
insta::assert_snapshot!(output, @r"
Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f
Commit ID: 92e687faa4e5b681937f5a9c47feaa33e6b4892c
Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
Author : Test User <test.user@example.com> (2001-02-03 08:05:09)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:09)
@@ -176,7 +176,7 @@ fn test_show_basic() {
let output = work_dir.run_jj(["show", "--git", "--color=debug"]);
insta::assert_snapshot!(output, @r"
Commit ID: <<commit_id::e34f04317a81edc6ba41fef239c0d0180f10656f>>
Commit ID: <<commit_id::92e687faa4e5b681937f5a9c47feaa33e6b4892c>>
Change ID: <<change_id::rlvkpnrzqnoowoytxnquwvuryrwnrmlp>>
Author : <<author name::Test User>> <<<author email local::test.user>><<author email::@>><<author email domain::example.com>>> (<<author timestamp local format::2001-02-03 08:05:09>>)
Committer: <<committer name::Test User>> <<<committer email local::test.user>><<committer email::@>><<committer email domain::example.com>>> (<<committer timestamp local format::2001-02-03 08:05:09>>)
@@ -200,7 +200,7 @@ fn test_show_basic() {
let output = work_dir.run_jj(["show", "-s", "--git"]);
insta::assert_snapshot!(output, @r"
Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f
Commit ID: 92e687faa4e5b681937f5a9c47feaa33e6b4892c
Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
Author : Test User <test.user@example.com> (2001-02-03 08:05:09)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:09)
@@ -226,7 +226,7 @@ fn test_show_basic() {
let output = work_dir.run_jj(["show", "--stat"]);
insta::assert_snapshot!(output, @r"
Commit ID: e34f04317a81edc6ba41fef239c0d0180f10656f
Commit ID: 92e687faa4e5b681937f5a9c47feaa33e6b4892c
Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
Author : Test User <test.user@example.com> (2001-02-03 08:05:09)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:09)
@@ -282,7 +282,7 @@ fn test_show_with_no_patch() {
let output = work_dir.run_jj(["show", "--no-patch"]);
insta::assert_snapshot!(output, @r"
Commit ID: 250b23eb0c4c44580cd5d83ab1c4760ea0534f3c
Commit ID: 86d5fa72f4ecc6d51478941ee9160db9c52b842e
Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
Author : Test User <test.user@example.com> (2001-02-03 08:05:08)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:09)

128
cli/tests/test_sign_unsign_commands.rs
View File

@@ -37,13 +37,13 @@ backend = "test"
let output = work_dir.run_jj(["log", "-r", "all()"]);
insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:10 7acb64be
@ zsuskuln test.user@example.com 2001-02-03 08:05:10 fbef508b
│ (empty) (no description set)
○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 8bdfe4fb
○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 8c63f712
│ (empty) three
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 b0e11728
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 26a2c4cb
│ (empty) two
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 876f4b7e
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 401ea16f
│ (empty) one
◆ zzzzzzzz root() 00000000
[EOF]
@@ -53,24 +53,24 @@ backend = "test"
insta::assert_snapshot!(output, @r"
------- stderr -------
Signed 4 commits:
qpvuntsm 8174ec98 (empty) one
rlvkpnrz 6500b275 (empty) two
kkmpptxz bcfaa4c3 (empty) three
zsuskuln 4947c6dd (empty) (no description set)
Working copy (@) now at: zsuskuln 4947c6dd (empty) (no description set)
Parent commit (@-) : kkmpptxz bcfaa4c3 (empty) three
qpvuntsm 7fb98da0 (empty) one
rlvkpnrz 062a3c5a (empty) two
kkmpptxz d2174a79 (empty) three
zsuskuln 8d7bc037 (empty) (no description set)
Working copy (@) now at: zsuskuln 8d7bc037 (empty) (no description set)
Parent commit (@-) : kkmpptxz d2174a79 (empty) three
[EOF]
");
let output = work_dir.run_jj(["log", "-r", "all()"]);
insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:12 4947c6dd [✓︎]
@ zsuskuln test.user@example.com 2001-02-03 08:05:12 8d7bc037 [✓︎]
│ (empty) (no description set)
○ kkmpptxz test.user@example.com 2001-02-03 08:05:12 bcfaa4c3 [✓︎]
○ kkmpptxz test.user@example.com 2001-02-03 08:05:12 d2174a79 [✓︎]
│ (empty) three
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:12 6500b275 [✓︎]
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:12 062a3c5a [✓︎]
│ (empty) two
○ qpvuntsm test.user@example.com 2001-02-03 08:05:12 8174ec98 [✓︎]
○ qpvuntsm test.user@example.com 2001-02-03 08:05:12 7fb98da0 [✓︎]
│ (empty) one
◆ zzzzzzzz root() 00000000
[EOF]
@@ -82,12 +82,12 @@ backend = "test"
insta::assert_snapshot!(output, @r"
------- stderr -------
Signed 4 commits:
qpvuntsm dabebf30 (empty) one
rlvkpnrz 2085a464 (empty) two
kkmpptxz 227f5e15 (empty) three
zsuskuln 15d1b128 (empty) (no description set)
Working copy (@) now at: zsuskuln 15d1b128 (empty) (no description set)
Parent commit (@-) : kkmpptxz 227f5e15 (empty) three
qpvuntsm a57217b4 (empty) one
rlvkpnrz e0c0e7ad (empty) two
kkmpptxz fc827eb8 (empty) three
zsuskuln 66574289 (empty) (no description set)
Working copy (@) now at: zsuskuln 66574289 (empty) (no description set)
Parent commit (@-) : kkmpptxz fc827eb8 (empty) three
[EOF]
");
}
@@ -117,9 +117,9 @@ backend = "test"
let output = work_dir.run_jj(["log", "-r", "all()"]);
insta::assert_snapshot!(output, @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 8623fdf2 [✓︎]
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 72a53d81 [✓︎]
│ (empty) (no description set)
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 876f4b7e
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 401ea16f
│ (empty) one
◆ zzzzzzzz root() 00000000
[EOF]
@@ -154,7 +154,7 @@ key = "some-key"
let output = work_dir.run_jj(["log", "-r", "@-|@--", "-Tbuiltin_log_detailed"]);
insta::assert_snapshot!(output, @r"
○ Commit ID: f1a2b1ef76ee5b995ddbb1b13e8b54e4b0d32a12
○ Commit ID: 810ff318afe002ce54260260e4d4f7071eb476ed
│ Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
│ Author : Test User <test.user@example.com> (2001-02-03 08:05:09)
│ Committer: Test User <test.user@example.com> (2001-02-03 08:05:11)
@@ -162,7 +162,7 @@ key = "some-key"
│
│ two
│
○ Commit ID: d0e65e58aef1aca0ab92d3d42a9b00b82b7f76a6
○ Commit ID: eec44cafe0dc853b67cc7e14ca4fe3b80d3687f1
│ Change ID: qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu
~ Author : Test User <test.user@example.com> (2001-02-03 08:05:08)
Committer: Test User <test.user@example.com> (2001-02-03 08:05:11)
@@ -208,25 +208,25 @@ backend = "test"
insta::assert_snapshot!(output, @r"
------- stderr -------
Signed 3 commits:
qpvuntsm 254d1a64 (empty) one
rlvkpnrz caa78d30 (empty) two
kkmpptxz c2bc0eb0 (empty) three
qpvuntsm 2c0b7924 (empty) one
rlvkpnrz 0e054ee0 (empty) two
kkmpptxz ed55e398 (empty) three
Warning: 3 of these commits are not authored by you
Rebased 1 descendant commits
Working copy (@) now at: zsuskuln ede04d15 (empty) (no description set)
Parent commit (@-) : kkmpptxz c2bc0eb0 (empty) three
Working copy (@) now at: zsuskuln 1b3596cb (empty) (no description set)
Parent commit (@-) : kkmpptxz ed55e398 (empty) three
[EOF]
");
let output = work_dir.run_jj(["log", "-r", "all()"]);
insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:12 ede04d15
@ zsuskuln test.user@example.com 2001-02-03 08:05:12 1b3596cb
│ (empty) (no description set)
○ kkmpptxz someone@else.com 2001-02-03 08:05:12 c2bc0eb0 [✓︎]
○ kkmpptxz someone@else.com 2001-02-03 08:05:12 ed55e398 [✓︎]
│ (empty) three
○ rlvkpnrz someone@else.com 2001-02-03 08:05:12 caa78d30 [✓︎]
○ rlvkpnrz someone@else.com 2001-02-03 08:05:12 0e054ee0 [✓︎]
│ (empty) two
○ qpvuntsm someone@else.com 2001-02-03 08:05:12 254d1a64 [✓︎]
○ qpvuntsm someone@else.com 2001-02-03 08:05:12 2c0b7924 [✓︎]
│ (empty) one
◆ zzzzzzzz root() 00000000
[EOF]
@@ -258,21 +258,21 @@ backend = "test"
insta::assert_snapshot!(output, @r"
------- stderr -------
Signed 2 commits:
qpvuntsm 034b975d (empty) A
kkmpptxz 29dc7928 (empty) C
qpvuntsm 0e149d92 (empty) A
kkmpptxz ab7e21e9 (empty) C
Rebased 1 descendant commits
Working copy (@) now at: kkmpptxz 29dc7928 (empty) C
Parent commit (@-) : rlvkpnrz 014c011c (empty) B
Working copy (@) now at: kkmpptxz ab7e21e9 (empty) C
Parent commit (@-) : rlvkpnrz 3981b3e4 (empty) B
[EOF]
");
let output = work_dir.run_jj(["log", "-r", "all()"]);
insta::assert_snapshot!(output, @r"
@ kkmpptxz test.user@example.com 2001-02-03 08:05:11 29dc7928 [✓︎]
@ kkmpptxz test.user@example.com 2001-02-03 08:05:11 ab7e21e9 [✓︎]
│ (empty) C
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:11 014c011c
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:11 3981b3e4
│ (empty) B
○ qpvuntsm test.user@example.com 2001-02-03 08:05:11 034b975d [✓︎]
○ qpvuntsm test.user@example.com 2001-02-03 08:05:11 0e149d92 [✓︎]
│ (empty) A
◆ zzzzzzzz root() 00000000
[EOF]
@@ -329,13 +329,13 @@ backend = "test"
let output = work_dir.run_jj(["log", "-r", "all()"]);
insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:11 7aa7dcdf [✓︎]
@ zsuskuln test.user@example.com 2001-02-03 08:05:11 be4609e2 [✓︎]
│ (empty) (no description set)
○ kkmpptxz test.user@example.com 2001-02-03 08:05:11 0413d103 [✓︎]
○ kkmpptxz test.user@example.com 2001-02-03 08:05:11 7b6ad8e6 [✓︎]
│ (empty) three
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:11 c8768375 [✓︎]
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:11 8dc06170 [✓︎]
│ (empty) two
○ qpvuntsm test.user@example.com 2001-02-03 08:05:11 b90f5370 [✓︎]
○ qpvuntsm test.user@example.com 2001-02-03 08:05:11 fbef1f02 [✓︎]
│ (empty) one
◆ zzzzzzzz root() 00000000
[EOF]
@@ -345,24 +345,24 @@ backend = "test"
insta::assert_snapshot!(output, @r"
------- stderr -------
Unsigned 4 commits:
qpvuntsm cb05440c (empty) one
rlvkpnrz deb0db4b (empty) two
kkmpptxz 7c11ee12 (empty) three
zsuskuln be9daa4d (empty) (no description set)
Working copy (@) now at: zsuskuln be9daa4d (empty) (no description set)
Parent commit (@-) : kkmpptxz 7c11ee12 (empty) three
qpvuntsm c08b67cb (empty) one
rlvkpnrz 3081d203 (empty) two
kkmpptxz 8c2dc912 (empty) three
zsuskuln 9aec4578 (empty) (no description set)
Working copy (@) now at: zsuskuln 9aec4578 (empty) (no description set)
Parent commit (@-) : kkmpptxz 8c2dc912 (empty) three
[EOF]
");
let output = work_dir.run_jj(["log", "-r", "all()"]);
insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:13 be9daa4d
@ zsuskuln test.user@example.com 2001-02-03 08:05:13 9aec4578
│ (empty) (no description set)
○ kkmpptxz test.user@example.com 2001-02-03 08:05:13 7c11ee12
○ kkmpptxz test.user@example.com 2001-02-03 08:05:13 8c2dc912
│ (empty) three
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:13 deb0db4b
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:13 3081d203
│ (empty) two
○ qpvuntsm test.user@example.com 2001-02-03 08:05:13 cb05440c
○ qpvuntsm test.user@example.com 2001-02-03 08:05:13 c08b67cb
│ (empty) one
◆ zzzzzzzz root() 00000000
[EOF]
@@ -404,25 +404,25 @@ backend = "test"
let (_, stderr) = run_jj_as_someone_else(&["unsign", "-r", "..@"]);
insta::assert_snapshot!(stderr, @r"
Unsigned 4 commits:
qpvuntsm 757aba72 (empty) one
rlvkpnrz 49a6eeeb (empty) two
kkmpptxz 8859969b (empty) three
zsuskuln 8cea2d75 (empty) (no description set)
qpvuntsm 4430b844 (empty) one
rlvkpnrz 65d9cdf7 (empty) two
kkmpptxz f6eb4a7e (empty) three
zsuskuln 0fda7ce2 (empty) (no description set)
Warning: 4 of these commits are not authored by you
Working copy (@) now at: zsuskuln 8cea2d75 (empty) (no description set)
Parent commit (@-) : kkmpptxz 8859969b (empty) three
Working copy (@) now at: zsuskuln 0fda7ce2 (empty) (no description set)
Parent commit (@-) : kkmpptxz f6eb4a7e (empty) three
[EOF]
");
let output = work_dir.run_jj(["log", "-r", "all()"]);
insta::assert_snapshot!(output, @r"
@ zsuskuln test.user@example.com 2001-02-03 08:05:12 8cea2d75
@ zsuskuln test.user@example.com 2001-02-03 08:05:12 0fda7ce2
│ (empty) (no description set)
○ kkmpptxz test.user@example.com 2001-02-03 08:05:12 8859969b
○ kkmpptxz test.user@example.com 2001-02-03 08:05:12 f6eb4a7e
│ (empty) three
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:12 49a6eeeb
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:12 65d9cdf7
│ (empty) two
○ qpvuntsm test.user@example.com 2001-02-03 08:05:12 757aba72
○ qpvuntsm test.user@example.com 2001-02-03 08:05:12 4430b844
│ (empty) one
◆ zzzzzzzz root() 00000000
[EOF]

20
cli/tests/test_simplify_parents_command.rs
View File

@@ -147,8 +147,8 @@ fn test_simplify_parents_redundant_parent(args: &[&str]) {
insta::assert_snapshot!(output, @r"
------- stderr -------
Removed 1 edges from 1 out of 3 commits.
Working copy (@) now at: royxmykx 0ac2063b c | c
Parent commit (@-) : zsuskuln 1394f625 b | b
Working copy (@) now at: royxmykx 265f0407 c | c
Parent commit (@-) : zsuskuln 123b4d91 b | b
[EOF]
");
}
@@ -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 8cc01e1b f | f
Parent commit (@-) : znkkpsqq 040ae3a6 e | e
Working copy (@) now at: kmkuslsw 58e098e5 f | f
Parent commit (@-) : znkkpsqq 374f4ddc 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 70a39dff f | f
Parent commit (@-) : znkkpsqq a021fee9 e | e
Working copy (@) now at: kmkuslsw 37ef137f f | f
Parent commit (@-) : znkkpsqq b982b07d 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 8cc01e1b f | f
Parent commit (@-) : znkkpsqq 040ae3a6 e | e
Working copy (@) now at: kmkuslsw 58e098e5 f | f
Parent commit (@-) : znkkpsqq 374f4ddc e | e
[EOF]
");
@@ -300,8 +300,8 @@ 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 0c6b4c43 f | f
Parent commit (@-) : znkkpsqq 6a679611 e | e
Working copy (@) now at: kmkuslsw 78ceb6e1 f | f
Parent commit (@-) : znkkpsqq 009aef72 e | e
[EOF]
");

188
cli/tests/test_split_command.rs
View File

@@ -67,10 +67,10 @@ fn test_split_by_paths() {
let output = work_dir.run_jj(["split", "file2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
First part: qpvuntsm 65569ca7 (no description set)
Second part: zsuskuln 709756f0 (no description set)
Working copy (@) now at: zsuskuln 709756f0 (no description set)
Parent commit (@-) : qpvuntsm 65569ca7 (no description set)
First part: qpvuntsm 6dbc7747 (no description set)
Second part: zsuskuln 42cbbc02 (no description set)
Working copy (@) now at: zsuskuln 42cbbc02 (no description set)
Parent commit (@-) : qpvuntsm 6dbc7747 (no description set)
[EOF]
");
insta::assert_snapshot!(
@@ -122,10 +122,10 @@ fn test_split_by_paths() {
------- stderr -------
Warning: All changes have been selected, so the second commit will be empty
Rebased 1 descendant commits
First part: qpvuntsm 9da0eea0 (no description set)
Second part: znkkpsqq 5b5714a3 (empty) (no description set)
Working copy (@) now at: zsuskuln 0c798ee7 (no description set)
Parent commit (@-) : znkkpsqq 5b5714a3 (empty) (no description set)
First part: qpvuntsm 9fd1c9e1 (no description set)
Second part: znkkpsqq 41e0da21 (empty) (no description set)
Working copy (@) now at: zsuskuln a06e40b8 (no description set)
Parent commit (@-) : znkkpsqq 41e0da21 (empty) (no description set)
[EOF]
");
@@ -153,10 +153,10 @@ fn test_split_by_paths() {
------- stderr -------
Warning: No changes have been selected, so the first commit will be empty
Rebased 1 descendant commits
First part: qpvuntsm bd42f95a (empty) (no description set)
Second part: lylxulpl ed55c86b (no description set)
Working copy (@) now at: zsuskuln 1e1ed741 (no description set)
Parent commit (@-) : lylxulpl ed55c86b (no description set)
First part: qpvuntsm 49416632 (empty) (no description set)
Second part: lylxulpl 718afbf5 (no description set)
Working copy (@) now at: zsuskuln 0ed53ee6 (no description set)
Parent commit (@-) : lylxulpl 718afbf5 (no description set)
[EOF]
");
@@ -202,10 +202,10 @@ fn test_split_with_non_empty_description() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Warning: Deprecated config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
First part: qpvuntsm 231a3c00 part 1
Second part: kkmpptxz e96291aa part 2
Working copy (@) now at: kkmpptxz e96291aa part 2
Parent commit (@-) : qpvuntsm 231a3c00 part 1
First part: qpvuntsm c7f7b14b part 1
Second part: kkmpptxz ac33a5a9 part 2
Working copy (@) now at: kkmpptxz ac33a5a9 part 2
Parent commit (@-) : qpvuntsm c7f7b14b part 1
[EOF]
"#);
@@ -260,10 +260,10 @@ fn test_split_with_default_description() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Warning: Deprecated config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
First part: qpvuntsm 02ee5d60 TESTED=TODO
Second part: rlvkpnrz 33cd046b (no description set)
Working copy (@) now at: rlvkpnrz 33cd046b (no description set)
Parent commit (@-) : qpvuntsm 02ee5d60 TESTED=TODO
First part: qpvuntsm ff633dcc TESTED=TODO
Second part: rlvkpnrz b1d20b7e (no description set)
Working copy (@) now at: rlvkpnrz b1d20b7e (no description set)
Parent commit (@-) : qpvuntsm ff633dcc TESTED=TODO
[EOF]
"#);
@@ -340,10 +340,10 @@ fn test_split_with_descendants() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
First part: qpvuntsm 34dd141b Add file1
Second part: royxmykx 465e03d0 Add file2
Working copy (@) now at: kkmpptxz 2d5d641f Add file4
Parent commit (@-) : rlvkpnrz b3bd9eb7 Add file3
First part: qpvuntsm 74306e35 Add file1
Second part: royxmykx 0a37745e Add file2
Working copy (@) now at: kkmpptxz 7ee84812 Add file4
Parent commit (@-) : rlvkpnrz d335bd94 Add file3
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r###"
@@ -384,32 +384,32 @@ fn test_split_with_descendants() {
// - The rewritten commit once the description is added during `jj commit`.
// - The rewritten commit after the split.
let evolog_1 = work_dir.run_jj(["evolog", "-r", "qpvun"]);
insta::assert_snapshot!(evolog_1, @r###"
○ qpvuntsm test.user@example.com 2001-02-03 08:05:12 34dd141b
insta::assert_snapshot!(evolog_1, @r"
○ qpvuntsm test.user@example.com 2001-02-03 08:05:12 74306e35
│ Add file1
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 764d46f1
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 1d2499e7
│ Add file1 & file2
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 44af2155
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 f5700f8e
│ (no description set)
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
[EOF]
"###);
");
// The evolog for the second commit is the same, except that the change id
// changes after the split.
let evolog_2 = work_dir.run_jj(["evolog", "-r", "royxm"]);
insta::assert_snapshot!(evolog_2, @r###"
○ royxmykx test.user@example.com 2001-02-03 08:05:12 465e03d0
insta::assert_snapshot!(evolog_2, @r"
○ royxmykx test.user@example.com 2001-02-03 08:05:12 0a37745e
│ Add file2
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 764d46f1
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 1d2499e7
│ Add file1 & file2
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 44af2155
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 f5700f8e
│ (no description set)
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
[EOF]
"###);
");
}
// This test makes sure that the children of the commit being split retain any
@@ -447,11 +447,11 @@ fn test_split_with_merge_child() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
First part: kkmpptxz e8006b47 Add file1
Second part: royxmykx 5e1b793d Add file2
Working copy (@) now at: zsuskuln 696935af (empty) 2
Parent commit (@-) : qpvuntsm 8b64ddff (empty) 1
Parent commit (@-) : royxmykx 5e1b793d Add file2
First part: kkmpptxz cc199567 Add file1
Second part: royxmykx e488409f Add file2
Working copy (@) now at: zsuskuln ace61421 (empty) 2
Parent commit (@-) : qpvuntsm 884fe9b9 (empty) 1
Parent commit (@-) : royxmykx e488409f Add file2
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@@ -497,9 +497,9 @@ fn test_split_parallel_no_descendants() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Warning: Deprecated config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
First part: qpvuntsm 48018df6 TESTED=TODO
Second part: kkmpptxz 7eddbf93 (no description set)
Working copy (@) now at: kkmpptxz 7eddbf93 (no description set)
First part: qpvuntsm 7bcd474c TESTED=TODO
Second part: kkmpptxz 431886f6 (no description set)
Working copy (@) now at: kkmpptxz 431886f6 (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 0 files, removed 1 files
[EOF]
@@ -539,11 +539,11 @@ fn test_split_parallel_no_descendants() {
// - The rewritten commit after the split.
let evolog_1 = work_dir.run_jj(["evolog", "-r", "qpvun"]);
insta::assert_snapshot!(evolog_1, @r#"
○ qpvuntsm test.user@example.com 2001-02-03 08:05:09 48018df6
○ qpvuntsm test.user@example.com 2001-02-03 08:05:09 7bcd474c
│ TESTED=TODO
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 44af2155
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 f5700f8e
│ (no description set)
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
[EOF]
------- stderr -------
@@ -555,11 +555,11 @@ fn test_split_parallel_no_descendants() {
// changes after the split.
let evolog_2 = work_dir.run_jj(["evolog", "-r", "kkmpp"]);
insta::assert_snapshot!(evolog_2, @r#"
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 7eddbf93
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 431886f6
│ (no description set)
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 44af2155
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 f5700f8e
│ (no description set)
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
[EOF]
------- stderr -------
@@ -617,9 +617,9 @@ fn test_split_parallel_with_descendants() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
First part: qpvuntsm 84df941d Add file1
Second part: vruxwmqv 94753be3 Add file2
Working copy (@) now at: vruxwmqv 94753be3 Add file2
First part: qpvuntsm 18c85f56 Add file1
Second part: vruxwmqv cbdfd9cf Add file2
Working copy (@) now at: vruxwmqv cbdfd9cf Add file2
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 0 files, removed 1 files
[EOF]
@@ -694,12 +694,12 @@ fn test_split_parallel_with_merge_child() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
First part: kkmpptxz e8006b47 Add file1
Second part: royxmykx 2cc60f3d Add file2
Working copy (@) now at: zsuskuln 35b5d7eb (empty) 2
Parent commit (@-) : qpvuntsm 8b64ddff (empty) 1
Parent commit (@-) : kkmpptxz e8006b47 Add file1
Parent commit (@-) : royxmykx 2cc60f3d Add file2
First part: kkmpptxz cc199567 Add file1
Second part: royxmykx 82a5c527 Add file2
Working copy (@) now at: zsuskuln b7cdcdec (empty) 2
Parent commit (@-) : qpvuntsm 884fe9b9 (empty) 1
Parent commit (@-) : kkmpptxz cc199567 Add file1
Parent commit (@-) : royxmykx 82a5c527 Add file2
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@@ -726,7 +726,7 @@ fn test_split_empty() {
let output = work_dir.run_jj(["split"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: Refusing to split empty commit 2ab033062e9fdf7fad2ded8e89c1f145e3698190.
Error: Refusing to split empty commit 64eaeeb3e846248efc8b599a2b583b708104fc01.
Hint: Use `jj new` if you want to create another empty commit.
[EOF]
[exit status: 1]
@@ -773,16 +773,16 @@ fn test_split_interactive() {
let output = work_dir.run_jj(["split"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
First part: qpvuntsm 0e15949e (no description set)
Second part: rlvkpnrz 9ed12e4c (no description set)
Working copy (@) now at: rlvkpnrz 9ed12e4c (no description set)
Parent commit (@-) : qpvuntsm 0e15949e (no description set)
First part: qpvuntsm c664a51b (no description set)
Second part: rlvkpnrz 7e5d65b1 (no description set)
Working copy (@) now at: rlvkpnrz 7e5d65b1 (no description set)
Parent commit (@-) : qpvuntsm c664a51b (no description set)
[EOF]
");
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("instrs")).unwrap(), @r"
You are splitting a commit into two: qpvuntsm 44af2155 (no description set)
You are splitting a commit into two: qpvuntsm f5700f8e (no description set)
The diff initially shows the changes in the commit you're splitting.
@@ -803,10 +803,10 @@ fn test_split_interactive() {
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:08 9ed12e4c
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:08 7e5d65b1
│ (no description set)
│ A file2
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 0e15949e
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 c664a51b
│ (no description set)
│ A file1
◆ zzzzzzzz root() 00000000
@@ -848,10 +848,10 @@ fn test_split_interactive_with_paths() {
let output = work_dir.run_jj(["split", "-i", "file1", "file2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
First part: rlvkpnrz e3d766b8 (no description set)
Second part: kkmpptxz 4cf22d3b (no description set)
Working copy (@) now at: kkmpptxz 4cf22d3b (no description set)
Parent commit (@-) : rlvkpnrz e3d766b8 (no description set)
First part: rlvkpnrz cdc9960a (no description set)
Second part: kkmpptxz 7255f070 (no description set)
Working copy (@) now at: kkmpptxz 7255f070 (no description set)
Parent commit (@-) : rlvkpnrz cdc9960a (no description set)
[EOF]
");
@@ -868,14 +868,14 @@ fn test_split_interactive_with_paths() {
let output = work_dir.run_jj(["log", "--summary"]);
insta::assert_snapshot!(output, @r"
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 4cf22d3b
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 7255f070
│ (no description set)
│ M file2
│ M file3
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 e3d766b8
○ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 cdc9960a
│ (no description set)
│ A file1
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 497ed465
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 ff687a2f
│ (no description set)
│ A file2
│ A file3
@@ -1044,10 +1044,10 @@ fn test_split_with_non_empty_description_and_trailers() {
insta::assert_snapshot!(output, @r#"
------- stderr -------
Warning: Deprecated config: ui.default-description is updated to template-aliases.default_commit_description = '"\n\nTESTED=TODO\n"'
First part: qpvuntsm 231a3c00 part 1
Second part: kkmpptxz e96291aa part 2
Working copy (@) now at: kkmpptxz e96291aa part 2
Parent commit (@-) : qpvuntsm 231a3c00 part 1
First part: qpvuntsm c7f7b14b part 1
Second part: kkmpptxz ac33a5a9 part 2
Working copy (@) now at: kkmpptxz ac33a5a9 part 2
Parent commit (@-) : qpvuntsm c7f7b14b part 1
[EOF]
"#);
@@ -1099,10 +1099,10 @@ fn test_split_with_message() {
let output = work_dir.run_jj(["split", "-m", "fix in file1", "file1"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
First part: qpvuntsm c002c01e fix in file1
Second part: kkmpptxz 0841f981 my feature
Working copy (@) now at: kkmpptxz 0841f981 my feature
Parent commit (@-) : qpvuntsm c002c01e fix in file1
First part: qpvuntsm f2a70519 fix in file1
Second part: kkmpptxz cac11766 my feature
Working copy (@) now at: kkmpptxz cac11766 my feature
Parent commit (@-) : qpvuntsm f2a70519 fix in file1
[EOF]
");
@@ -1125,10 +1125,10 @@ fn test_split_with_message() {
]);
insta::assert_snapshot!(output, @r"
------- stderr -------
First part: qpvuntsm 6ffbff48 fix in file1
Second part: royxmykx 8cfdeaab my feature
Working copy (@) now at: royxmykx 8cfdeaab my feature
Parent commit (@-) : qpvuntsm 6ffbff48 fix in file1
First part: qpvuntsm d01cf12d fix in file1
Second part: royxmykx b1556ed9 my feature
Working copy (@) now at: royxmykx b1556ed9 my feature
Parent commit (@-) : qpvuntsm d01cf12d fix in file1
[EOF]
");
@@ -1195,10 +1195,10 @@ fn test_split_with_bookmarks(bookmark_behavior: BookmarkBehavior) {
insta::allow_duplicates! {
insta::assert_snapshot!(output, @r"
------- stderr -------
First part: qpvuntsm 63d0c5ed *le-signet* | first-commit
Second part: mzvwutvl a9f5665f second-commit
Working copy (@) now at: mzvwutvl a9f5665f second-commit
Parent commit (@-) : qpvuntsm 63d0c5ed *le-signet* | first-commit
First part: qpvuntsm a481fe8a *le-signet* | first-commit
Second part: mzvwutvl 5f597a6e second-commit
Working copy (@) now at: mzvwutvl 5f597a6e second-commit
Parent commit (@-) : qpvuntsm a481fe8a *le-signet* | first-commit
[EOF]
");
}
@@ -1215,10 +1215,10 @@ fn test_split_with_bookmarks(bookmark_behavior: BookmarkBehavior) {
insta::allow_duplicates! {
insta::assert_snapshot!(output, @r"
------- stderr -------
First part: qpvuntsm 63d0c5ed first-commit
Second part: mzvwutvl a9f5665f *le-signet* | second-commit
Working copy (@) now at: mzvwutvl a9f5665f *le-signet* | second-commit
Parent commit (@-) : qpvuntsm 63d0c5ed first-commit
First part: qpvuntsm a481fe8a first-commit
Second part: mzvwutvl 5f597a6e *le-signet* | second-commit
Working copy (@) now at: mzvwutvl 5f597a6e *le-signet* | second-commit
Parent commit (@-) : qpvuntsm a481fe8a first-commit
[EOF]
");
}

368
cli/tests/test_squash_command.rs
View File

@@ -40,9 +40,9 @@ fn test_squash() {
work_dir.write_file("file1", "c\n");
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 382c9bad7d42 c
○ d5d59175b481 b
○ 184ddbcce5a9 a
@ 22be6c4e01da c
○ 75591b1896b4 b
○ e6086990958c a
◆ 000000000000 (empty)
[EOF]
");
@@ -51,14 +51,14 @@ fn test_squash() {
let output = work_dir.run_jj(["squash"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: vruxwmqv f7bb78d8 (empty) (no description set)
Parent commit (@-) : kkmpptxz 59f44460 b c | (no description set)
Working copy (@) now at: vruxwmqv 2cf02eb8 (empty) (no description set)
Parent commit (@-) : kkmpptxz 9422c8d6 b c | (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ f7bb78d8da62 (empty)
○ 59f4446070a0 b c
○ 184ddbcce5a9 a
@ 2cf02eb82d82 (empty)
○ 9422c8d6f294 b c
○ e6086990958c a
◆ 000000000000 (empty)
[EOF]
");
@@ -74,13 +74,13 @@ fn test_squash() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: mzvwutvl 1d70f50a c | (no description set)
Parent commit (@-) : qpvuntsm 9146bcc8 a b | (no description set)
Working copy (@) now at: mzvwutvl 441a7a3a c | (no description set)
Parent commit (@-) : qpvuntsm 105931bf a b | (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 1d70f50afa6d c
○ 9146bcc8d996 a b
@ 441a7a3a17b0 c
○ 105931bfedad a b
◆ 000000000000 (empty)
[EOF]
");
@@ -109,13 +109,13 @@ fn test_squash() {
.run_jj(["bookmark", "create", "-r@", "e"])
.success();
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 41219719ab5f e (empty)
@ e05d4caaf6ce e (empty)
├─╮
│ ○ f86e2b3af3e3 d
○ │ 382c9bad7d42 c
│ ○ 9bb7863cfc78 d
○ │ 22be6c4e01da c
├─╯
○ d5d59175b481 b
○ 184ddbcce5a9 a
○ 75591b1896b4 b
○ e6086990958c a
◆ 000000000000 (empty)
[EOF]
");
@@ -134,19 +134,19 @@ fn test_squash() {
let output = work_dir.run_jj(["squash"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: xlzxqlsl b50b843d (empty) (no description set)
Parent commit (@-) : nmzmmopx 338cbc05 e | (no description set)
Working copy (@) now at: xlzxqlsl 91a81249 (empty) (no description set)
Parent commit (@-) : nmzmmopx 9155baf5 e | (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ b50b843d8555 (empty)
○ 338cbc05e4e6 e
@ 91a81249954f (empty)
○ 9155baf5ced1 e
├─╮
│ ○ f86e2b3af3e3 d
○ │ 382c9bad7d42 c
│ ○ 9bb7863cfc78 d
○ │ 22be6c4e01da c
├─╯
○ d5d59175b481 b
○ 184ddbcce5a9 a
○ 75591b1896b4 b
○ e6086990958c a
◆ 000000000000 (empty)
[EOF]
");
@@ -183,9 +183,9 @@ fn test_squash_partial() {
work_dir.write_file("file2", "c\n");
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ a0b1a272ebc4 c
○ d117da276a0f b
○ 54d3c1c0e9fd a
@ 87059ac9657b c
○ f2c9709f39e9 b
○ 64ea60be8d77 a
◆ 000000000000 (empty)
[EOF]
");
@@ -197,15 +197,15 @@ fn test_squash_partial() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: mzvwutvl 3c633226 c | (no description set)
Parent commit (@-) : qpvuntsm 38ffd8b9 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]
");
insta::assert_snapshot!(
std::fs::read_to_string(test_env.env_root().join("instrs")).unwrap(), @r"
You are moving changes from: kkmpptxz d117da27 b | (no description set)
into commit: qpvuntsm 54d3c1c0 a | (no description set)
You are moving changes from: kkmpptxz f2c9709f b | (no description set)
into commit: qpvuntsm 64ea60be a | (no description set)
The left side of the diff shows the contents of the parent commit. The
right side initially shows the contents of the commit you're moving
@@ -217,8 +217,8 @@ fn test_squash_partial() {
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 3c6332267ea8 c
○ 38ffd8b98578 a b
@ 34484d825f47 c
○ 3141e67514f6 a b
◆ 000000000000 (empty)
[EOF]
");
@@ -235,14 +235,14 @@ fn test_squash_partial() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Working copy (@) now at: mzvwutvl 57c3cf20 c | (no description set)
Parent commit (@-) : kkmpptxz c4925e01 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"
@ 57c3cf20d0b1 c
○ c4925e01d298 b
○ 1fc159063ed3 a
@ 37e1a0ef57ff c
○ b41e789df71c b
○ 3af17565155e a
◆ 000000000000 (empty)
[EOF]
");
@@ -275,14 +275,14 @@ fn test_squash_partial() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Working copy (@) now at: mzvwutvl 64d7ad7c c | (no description set)
Parent commit (@-) : kkmpptxz 60a26452 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"
@ 64d7ad7c43c1 c
○ 60a264527aee b
○ 7314692d32e3 a
@ 72ff256cd290 c
○ dd056a925eb3 b
○ cf083f1d9ccf a
◆ 000000000000 (empty)
[EOF]
");
@@ -350,9 +350,9 @@ fn test_squash_keep_emptied() {
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 382c9bad7d42 c
○ d5d59175b481 b
○ 184ddbcce5a9 a
@ 22be6c4e01da c
○ 75591b1896b4 b
○ e6086990958c a
◆ 000000000000 (empty)
[EOF]
");
@@ -361,15 +361,15 @@ fn test_squash_keep_emptied() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Working copy (@) now at: mzvwutvl 7ee7f18a c | (no description set)
Parent commit (@-) : kkmpptxz 9490bd7f b | (empty) (no description set)
Working copy (@) now at: mzvwutvl 093590e0 c | (no description set)
Parent commit (@-) : kkmpptxz 357946cf b | (empty) (no description set)
[EOF]
");
// With --keep-emptied, b remains even though it is now empty.
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 7ee7f18a5223 c
○ 9490bd7f1e6a b (empty)
○ 53bf93080518 a
@ 093590e044bd c
○ 357946cf85df b (empty)
○ 2269fb3b12f5 a
◆ 000000000000 (empty)
[EOF]
");
@@ -431,13 +431,13 @@ fn test_squash_from_to() {
work_dir.write_file("file2", "f\n");
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ a847ab4967fe f
○ c2f9de87325d e
○ e0dac715116f d
│ ○ 59597b34a0d8 c
│ ○ 12d6103dc0c8 b
@ 0fac1124d1ad f
○ 4ebe104a0e4e e
○ dc71a460d5d6 d
│ ○ ee0b260ffc44 c
│ ○ e31bf988d7c9 b
├─╯
○ b7b767179c44 a
○ e3e04beaf7d3 a
◆ 000000000000 (empty)
[EOF]
");
@@ -455,18 +455,18 @@ fn test_squash_from_to() {
let output = work_dir.run_jj(["squash", "--from", "c"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kmkuslsw b902d1dd f | (no description set)
Parent commit (@-) : znkkpsqq c2f9de87 e | (no description set)
Working copy (@) now at: kmkuslsw 941ab024 f | (no description set)
Parent commit (@-) : znkkpsqq 4ebe104a e | (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ b902d1dd59d9 f
○ c2f9de87325d e
○ e0dac715116f d
│ ○ 12d6103dc0c8 b c
@ 941ab024b3f8 f
○ 4ebe104a0e4e e
○ dc71a460d5d6 d
│ ○ e31bf988d7c9 b c
├─╯
○ b7b767179c44 a
○ e3e04beaf7d3 a
◆ 000000000000 (empty)
[EOF]
");
@@ -488,19 +488,19 @@ fn test_squash_from_to() {
let output = work_dir.run_jj(["squash", "--from", "@--"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kmkuslsw cfc5eb87 f | (no description set)
Parent commit (@-) : znkkpsqq 4dc7c279 e | (no description set)
Working copy (@) now at: kmkuslsw c102d2c4 f | (no description set)
Parent commit (@-) : znkkpsqq beb7c033 e | (no description set)
[EOF]
");
// The change has been removed from the source (the change pointed to by 'd'
// became empty and was abandoned)
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ cfc5eb876eb1 f
○ 4dc7c27994bd e
│ ○ 59597b34a0d8 c
│ ○ 12d6103dc0c8 b
@ c102d2c4e165 f
○ beb7c0338f7c e
│ ○ ee0b260ffc44 c
│ ○ e31bf988d7c9 b
├─╯
○ b7b767179c44 a d
○ e3e04beaf7d3 a d
◆ 000000000000 (empty)
[EOF]
");
@@ -518,19 +518,19 @@ fn test_squash_from_to() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: kmkuslsw 6de62c22 f | (no description set)
Parent commit (@-) : vruxwmqv 32196a11 d e | (no description set)
Working copy (@) now at: kmkuslsw 1bc21d4e f | (no description set)
Parent commit (@-) : vruxwmqv 8b6b080a d e | (no description set)
[EOF]
");
// The change has been removed from the source (the change pointed to by 'e'
// became empty and was abandoned)
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 6de62c22fa07 f
○ 32196a117ee3 d e
│ ○ 59597b34a0d8 c
│ ○ 12d6103dc0c8 b
@ 1bc21d4e92d6 f
○ 8b6b080ab587 d e
│ ○ ee0b260ffc44 c
│ ○ e31bf988d7c9 b
├─╯
○ b7b767179c44 a
○ e3e04beaf7d3 a
◆ 000000000000 (empty)
[EOF]
");
@@ -580,11 +580,11 @@ fn test_squash_from_to_partial() {
work_dir.write_file("file3", "d\n");
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ e0dac715116f d
│ ○ 087591be5a01 c
│ ○ 12d6103dc0c8 b
@ dc71a460d5d6 d
│ ○ 499d601f6046 c
│ ○ e31bf988d7c9 b
├─╯
○ b7b767179c44 a
○ e3e04beaf7d3 a
◆ 000000000000 (empty)
[EOF]
");
@@ -593,16 +593,16 @@ fn test_squash_from_to_partial() {
let output = work_dir.run_jj(["squash", "-i", "--from", "c"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: vruxwmqv 987bcfb2 d | (no description set)
Parent commit (@-) : qpvuntsm b7b76717 a | (no description set)
Working copy (@) now at: vruxwmqv 85589465 d | (no description set)
Parent commit (@-) : qpvuntsm e3e04bea a | (no description set)
Added 0 files, modified 2 files, removed 0 files
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 987bcfb2eb62 d
│ ○ 12d6103dc0c8 b c
@ 85589465a5f7 d
│ ○ e31bf988d7c9 b c
├─╯
○ b7b767179c44 a
○ e3e04beaf7d3 a
◆ 000000000000 (empty)
[EOF]
");
@@ -630,17 +630,17 @@ fn test_squash_from_to_partial() {
let output = work_dir.run_jj(["squash", "-i", "--from", "c"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: vruxwmqv 576244e8 d | (no description set)
Parent commit (@-) : qpvuntsm b7b76717 a | (no description set)
Working copy (@) now at: vruxwmqv 62bd5cd9 d | (no description set)
Parent commit (@-) : qpvuntsm e3e04bea a | (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 576244e87883 d
│ ○ 6f486f2f4539 c
│ ○ 12d6103dc0c8 b
@ 62bd5cd9f413 d
│ ○ 2748f30463ed c
│ ○ e31bf988d7c9 b
├─╯
○ b7b767179c44 a
○ e3e04beaf7d3 a
◆ 000000000000 (empty)
[EOF]
");
@@ -670,17 +670,17 @@ fn test_squash_from_to_partial() {
let output = work_dir.run_jj(["squash", "--from", "c", "file1"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: vruxwmqv 5b407c24 d | (no description set)
Parent commit (@-) : qpvuntsm b7b76717 a | (no description set)
Working copy (@) now at: vruxwmqv 76bf6139 d | (no description set)
Parent commit (@-) : qpvuntsm e3e04bea a | (no description set)
Added 0 files, modified 1 files, removed 0 files
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 5b407c249fa7 d
│ ○ 724d64da1487 c
│ ○ 12d6103dc0c8 b
@ 76bf613928cf d
│ ○ 9d4418d4828e c
│ ○ e31bf988d7c9 b
├─╯
○ b7b767179c44 a
○ e3e04beaf7d3 a
◆ 000000000000 (empty)
[EOF]
");
@@ -714,11 +714,11 @@ fn test_squash_from_to_partial() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ e0dac715116f d
│ ○ d2a587ae205d c
│ ○ a53394306362 b
@ dc71a460d5d6 d
│ ○ f964ce4bca71 c
│ ○ e12c895adba6 b
├─╯
○ b7b767179c44 a
○ e3e04beaf7d3 a
◆ 000000000000 (empty)
[EOF]
");
@@ -790,15 +790,15 @@ fn test_squash_from_multiple() {
work_dir.write_file("file", "f\n");
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 94e57ecb8d4f f
○ 78ed28eb87b8 e
@ 65e53f39b4d6 f
○ 7dc592781647 e
├─┬─╮
│ │ ○ 35e764e4357c b
│ ○ │ 02a128cd4344 c
│ │ ○ fed4d1a2e491 b
│ ○ │ d7e94ec7e73e c
│ ├─╯
○ │ aaf7b53a1b64 d
○ │ 8acbb71558d5 d
├─╯
○ 3b1673b6370c a
○ e88768e65e67 a
◆ 000000000000 (empty)
[EOF]
");
@@ -808,10 +808,10 @@ fn test_squash_from_multiple() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Working copy (@) now at: kpqxywon 7ea39167 f | (no description set)
Parent commit (@-) : yostqsxw acfbf2a0 e | (no description set)
Working copy (@) now at: kpqxywon 703c6f0c f | (no description set)
Parent commit (@-) : yostqsxw 3d6a1899 e | (no description set)
New conflicts appeared in 1 commits:
yqosqzyt 4df3b215 d | (conflict) (no description set)
yqosqzyt a3221d7a d | (conflict) (no description set)
Hint: To resolve the conflicts, start by updating to it:
jj new yqosqzyt
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -820,12 +820,12 @@ fn test_squash_from_multiple() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 7ea391676d52 f
○ acfbf2a0600d e
@ 703c6f0cae6f f
○ 3d6a18995cae e
├─╮
× │ 4df3b2156c3d d
× │ a3221d7ae02a d
├─╯
○ 3b1673b6370c a b c
○ e88768e65e67 a b c
◆ 000000000000 (empty)
[EOF]
");
@@ -851,17 +851,17 @@ fn test_squash_from_multiple() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: xznxytkn 6a670d1a (empty) (no description set)
Parent commit (@-) : yostqsxw c1293ff7 e f | (no description set)
Working copy (@) now at: xznxytkn ec32238b (empty) (no description set)
Parent commit (@-) : yostqsxw 5298eef6 e f | (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 6a670d1ac76e (empty)
○ c1293ff7be51 e f
@ ec32238b2be5 (empty)
○ 5298eef6bca5 e f
├─╮
○ │ aaf7b53a1b64 d
○ │ 8acbb71558d5 d
├─╯
○ 3b1673b6370c a b c
○ e88768e65e67 a b c
◆ 000000000000 (empty)
[EOF]
");
@@ -932,15 +932,15 @@ fn test_squash_from_multiple_partial() {
work_dir.write_file("file2", "f\n");
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 30980b9045f7 f
○ 5326a04aac1f e
@ 4558bd852475 f
○ e2db96b2e57a e
├─┬─╮
│ │ ○ d117da276a0f b
│ ○ │ 93a7bfff61e7 c
│ │ ○ f2c9709f39e9 b
│ ○ │ aa908686a197 c
│ ├─╯
○ │ 763809ca0131 d
○ │ f6812ff8db35 d
├─╯
○ 54d3c1c0e9fd a
○ 64ea60be8d77 a
◆ 000000000000 (empty)
[EOF]
");
@@ -950,10 +950,10 @@ fn test_squash_from_multiple_partial() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 2 descendant commits
Working copy (@) now at: kpqxywon a8530305 f | (no description set)
Parent commit (@-) : yostqsxw 0a3637fc e | (no description set)
Working copy (@) now at: kpqxywon f3ae0274 f | (no description set)
Parent commit (@-) : yostqsxw 45ad30bd e | (no description set)
New conflicts appeared in 1 commits:
yqosqzyt 05a3ab3d d | (conflict) (no description set)
yqosqzyt 15efa8c0 d | (conflict) (no description set)
Hint: To resolve the conflicts, start by updating to it:
jj new yqosqzyt
Then use `jj resolve`, or edit the conflict markers in the file directly.
@@ -962,15 +962,15 @@ fn test_squash_from_multiple_partial() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ a8530305127c f
○ 0a3637fca632 e
@ f3ae0274fb6c f
○ 45ad30bdccc6 e
├─┬─╮
│ │ ○ 450d1499c1ae b
│ ○ │ 14b44bf0473c c
│ │ ○ e9db15b956c4 b
│ ○ │ 83cbe51db94d c
│ ├─╯
× │ 05a3ab3dffc8 d
× │ 15efa8c069e0 d
├─╯
○ 54d3c1c0e9fd a
○ 64ea60be8d77 a
◆ 000000000000 (empty)
[EOF]
");
@@ -1014,20 +1014,20 @@ fn test_squash_from_multiple_partial() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: kpqxywon 3b7559b8 f | (no description set)
Parent commit (@-) : yostqsxw a3b1714c e | (no description set)
Working copy (@) now at: kpqxywon b5a40c15 f | (no description set)
Parent commit (@-) : yostqsxw 5dea187c e | (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ 3b7559b89a57 f
○ a3b1714cdfb2 e
@ b5a40c154611 f
○ 5dea187c414d e
├─┬─╮
│ │ ○ 867efb38e801 b
│ ○ │ 84dcb3d4b3eb c
│ │ ○ 8b9afc05ca07 b
│ ○ │ 5630471a8fd5 c
│ ├─╯
○ │ 763809ca0131 d
○ │ f6812ff8db35 d
├─╯
○ 54d3c1c0e9fd a
○ 64ea60be8d77 a
◆ 000000000000 (empty)
[EOF]
");
@@ -1081,12 +1081,12 @@ fn test_squash_from_multiple_partial_no_op() {
work_dir.write_file("d", "d\n");
// Test the setup
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ b37ca1ee3306 d
│ ○ f40b442af3e8 c
@ fdb92bc249a0 d
│ ○ 0dc8cb72859d c
├─╯
│ ○ b73077b08c59 b
│ ○ b1a17f79a1a5 b
├─╯
○ 2443ea76b0b1 a
○ 93d495c46d89 a
◆ 000000000000 (empty)
[EOF]
");
@@ -1095,16 +1095,16 @@ fn test_squash_from_multiple_partial_no_op() {
let output = work_dir.run_jj(["squash", "--from=@-+ ~ @", "--into=@", "-m=d", "b"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: mzvwutvl e178068a d
Parent commit (@-) : qpvuntsm 2443ea76 a
Working copy (@) now at: mzvwutvl 6dfc239e d
Parent commit (@-) : qpvuntsm 93d495c4 a
Added 1 files, modified 0 files, removed 0 files
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ e178068add8c d
│ ○ f40b442af3e8 c
@ 6dfc239e2ba3 d
│ ○ 0dc8cb72859d c
├─╯
○ 2443ea76b0b1 a
○ 93d495c46d89 a
◆ 000000000000 (empty)
[EOF]
");
@@ -1114,12 +1114,12 @@ fn test_squash_from_multiple_partial_no_op() {
r#"separate(" ", commit_id.short(), description)"#,
]);
insta::assert_snapshot!(output, @r"
@ e178068add8c d
@ 6dfc239e2ba3 d
├─╮
│ ○ b73077b08c59 b
│ ○ a786561e909f b
○ b37ca1ee3306 d
○ 1d9eb34614c9 d
│ ○ b1a17f79a1a5 b
│ ○ d8b7d57239ca b
○ fdb92bc249a0 d
○ af709ccc1ca9 d
[EOF]
");
@@ -1132,12 +1132,12 @@ fn test_squash_from_multiple_partial_no_op() {
[EOF]
");
insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ b37ca1ee3306 d
│ ○ f40b442af3e8 c
@ fdb92bc249a0 d
│ ○ 0dc8cb72859d c
├─╯
│ ○ b73077b08c59 b
│ ○ b1a17f79a1a5 b
├─╯
○ 2443ea76b0b1 a
○ 93d495c46d89 a
◆ 000000000000 (empty)
[EOF]
");
@@ -1312,8 +1312,8 @@ fn test_squash_description() {
work_dir.run_jj(["op", "restore", "@--"]).success();
work_dir.run_jj(["describe", "-m", ""]).success();
insta::assert_snapshot!(get_log_output_with_description(&work_dir), @r"
@ 97213fdca854
○ 98c5890febcb destination
@ b086e6e1d02c
○ aeace309a1bd destination
◆ 000000000000
[EOF]
");
@@ -1339,8 +1339,8 @@ fn test_squash_description() {
.run_jj(["describe", "-r", "@-", "-m", ""])
.success();
insta::assert_snapshot!(get_log_output_with_description(&work_dir), @r"
@ 22a3c36f2858 source
○ ad5f9d6b047a
@ 2664d61781df source
○ c7a218b8d32e
◆ 000000000000
[EOF]
");
@@ -1364,8 +1364,8 @@ fn test_squash_description() {
.run_jj(["describe", "-r", "..", "-m", ""])
.success();
insta::assert_snapshot!(get_log_output_with_description(&work_dir), @r"
@ 7e485555f641
○ 99b4683afeaf
@ e024f101aae7
○ c6812e220e36
◆ 000000000000
[EOF]
");
@@ -1385,8 +1385,8 @@ fn test_squash_description() {
.run_jj(["describe", "-r", "@-", "-m", ""])
.success();
insta::assert_snapshot!(get_log_output_with_description(&work_dir), @r"
@ e4007dc838a3 source
○ 9bb558f5d51c
@ 95925ceb516a source
○ db0ba0f18c8f
◆ 000000000000
[EOF]
");
@@ -1404,8 +1404,8 @@ fn test_squash_description() {
// any trailer
work_dir.run_jj(["op", "restore", "@--"]).success();
insta::assert_snapshot!(get_log_output_with_description(&work_dir), @r"
@ 5d1c6e004d1d source
○ 98c5890febcb destination
@ aeaaeb3703e0 source
○ aeace309a1bd destination
◆ 000000000000
[EOF]
");
@@ -1461,8 +1461,8 @@ fn test_squash_empty() {
let output = work_dir.run_jj(["squash"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz adece6e8 (empty) (no description set)
Parent commit (@-) : qpvuntsm 5076fc41 (empty) parent
Working copy (@) now at: kkmpptxz db7ad962 (empty) (no description set)
Parent commit (@-) : qpvuntsm 771da191 (empty) parent
[EOF]
");
insta::assert_snapshot!(get_description(&work_dir, "@-"), @r"
@@ -1491,9 +1491,9 @@ fn test_squash_use_destination_message() {
work_dir.run_jj(["describe", "-m=c"]).success();
// Test the setup
insta::assert_snapshot!(get_log_output_with_description(&work_dir), @r"
@ 8aac283daeac c
○ 017c7f689ed7 b
○ d8d5f980a897 a
@ cf388db088f7 c
○ e412ddda5587 b
○ b86e28cd6862 a
◆ 000000000000
[EOF]
");
@@ -1501,9 +1501,9 @@ fn test_squash_use_destination_message() {
// Squash the current revision using the short name for the option.
work_dir.run_jj(["squash", "-u"]).success();
insta::assert_snapshot!(get_log_output_with_description(&work_dir), @r"
@ fd33e4bc332b
○ 3a17aa5dcce9 b
○ d8d5f980a897 a
@ 70c0f74e4486
○ 44c1701e4ef8 b
○ b86e28cd6862 a
◆ 000000000000
[EOF]
");
@@ -1521,8 +1521,8 @@ fn test_squash_use_destination_message() {
])
.success();
insta::assert_snapshot!(get_log_output_with_description(&work_dir), @r"
@ 7c832accbf60
○ 688660377651 a
@ e5a16e0e6a46
○ 6e47254e0803 a
◆ 000000000000
[EOF]
");

118
cli/tests/test_status_command.rs
View File

@@ -35,8 +35,8 @@ fn test_status_copies() {
M copy-source
C {copy-source => copy-target}
R {rename-source => rename-target}
Working copy (@) : rlvkpnrz a96c3086 (no description set)
Parent commit (@-): qpvuntsm e3e2c703 (no description set)
Working copy (@) : rlvkpnrz c2fce842 (no description set)
Parent commit (@-): qpvuntsm ebf799bc (no description set)
[EOF]
");
}
@@ -61,9 +61,9 @@ fn test_status_merge() {
let output = work_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r"
The working copy has no changes.
Working copy (@) : mzvwutvl a538c72d (empty) (no description set)
Parent commit (@-): rlvkpnrz d3dd19f1 left | (empty) left
Parent commit (@-): zsuskuln 705a356d right
Working copy (@) : mzvwutvl f62dad77 (empty) (no description set)
Parent commit (@-): rlvkpnrz a007d87b left | (empty) left
Parent commit (@-): zsuskuln e6ad1952 right
[EOF]
");
}
@@ -84,7 +84,7 @@ fn test_status_ignored_gitignore() {
insta::assert_snapshot!(output, @r"
Working copy changes:
A .gitignore
Working copy (@) : qpvuntsm 3cef2183 (no description set)
Working copy (@) : qpvuntsm 32bad97e (no description set)
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -104,7 +104,7 @@ fn test_status_filtered() {
insta::assert_snapshot!(output, @r"
Working copy changes:
A file_1
Working copy (@) : qpvuntsm c8fb8395 (no description set)
Working copy (@) : qpvuntsm 2f169edb (no description set)
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -155,17 +155,17 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
let output = work_dir.run_jj(["log", "-r", "::"]);
insta::assert_snapshot!(output, @r"
@ yqosqzyt test.user@example.com 2001-02-03 08:05:13 dcb25635 conflict
@ yqosqzyt test.user@example.com 2001-02-03 08:05:13 7e0bc4cf conflict
│ (empty) boom-cont-2
× royxmykx test.user@example.com 2001-02-03 08:05:12 664a4c6c conflict
× royxmykx test.user@example.com 2001-02-03 08:05:12 681c71af conflict
│ (empty) boom-cont
× mzvwutvl test.user@example.com 2001-02-03 08:05:11 c5a4e9cb conflict
× mzvwutvl test.user@example.com 2001-02-03 08:05:11 30558616 conflict
├─╮ (empty) boom
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 1e8c2956
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 bb11a679
│ │ First part of conflicting change
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 2c8b19fd
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 b6dfc209
├─╯ Second part of conflicting change
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 aade7195
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 fe876a9c
│ Initial contents
◆ zzzzzzzz root() 00000000
[EOF]
@@ -174,8 +174,8 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
let output = work_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r"
The working copy has no changes.
Working copy (@) : yqosqzyt dcb25635 (conflict) (empty) boom-cont-2
Parent commit (@-): royxmykx 664a4c6c (conflict) (empty) boom-cont
Working copy (@) : yqosqzyt 7e0bc4cf (conflict) (empty) boom-cont-2
Parent commit (@-): royxmykx 681c71af (conflict) (empty) boom-cont
Warning: There are unresolved conflicts at these paths:
conflicted.txt 2-sided conflict
Hint: To resolve the conflicts, start by updating to the first one:
@@ -189,8 +189,8 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
let output = work_dir.run_jj(["status", "--color=always"]);
insta::assert_snapshot!(output, @r"
The working copy has no changes.
Working copy (@) : yqosqzyt dcb25635 (conflict) (empty) boom-cont-2
Parent commit (@-): royxmykx 664a4c6c (conflict) (empty) boom-cont
Working copy (@) : yqosqzyt 7e0bc4cf (conflict) (empty) boom-cont-2
Parent commit (@-): royxmykx 681c71af (conflict) (empty) boom-cont
Warning: There are unresolved conflicts at these paths:
conflicted.txt 2-sided conflict
Hint: To resolve the conflicts, start by updating to the first one:
@@ -204,8 +204,8 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
let output = work_dir.run_jj(["status", "--config=hints.resolving-conflicts=false"]);
insta::assert_snapshot!(output, @r"
The working copy has no changes.
Working copy (@) : yqosqzyt dcb25635 (conflict) (empty) boom-cont-2
Parent commit (@-): royxmykx 664a4c6c (conflict) (empty) boom-cont
Working copy (@) : yqosqzyt 7e0bc4cf (conflict) (empty) boom-cont-2
Parent commit (@-): royxmykx 681c71af (conflict) (empty) boom-cont
Warning: There are unresolved conflicts at these paths:
conflicted.txt 2-sided conflict
[EOF]
@@ -223,21 +223,21 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
let output = work_dir.run_jj(["log", "-r", "::"]);
insta::assert_snapshot!(output, @r"
@ wqnwkozp test.user@example.com 2001-02-03 08:05:20 c4a6dbc2
@ wqnwkozp test.user@example.com 2001-02-03 08:05:20 cc7d68f7
│ fixed 2
○ kmkuslsw test.user@example.com 2001-02-03 08:05:19 fcebf6ee
○ kmkuslsw test.user@example.com 2001-02-03 08:05:19 812e2163
│ fixed 1
× yqosqzyt test.user@example.com 2001-02-03 08:05:13 dcb25635 conflict
× yqosqzyt test.user@example.com 2001-02-03 08:05:13 7e0bc4cf conflict
│ (empty) boom-cont-2
× royxmykx test.user@example.com 2001-02-03 08:05:12 664a4c6c conflict
× royxmykx test.user@example.com 2001-02-03 08:05:12 681c71af conflict
│ (empty) boom-cont
× mzvwutvl test.user@example.com 2001-02-03 08:05:11 c5a4e9cb conflict
× mzvwutvl test.user@example.com 2001-02-03 08:05:11 30558616 conflict
├─╮ (empty) boom
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 1e8c2956
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 bb11a679
│ │ First part of conflicting change
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 2c8b19fd
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 b6dfc209
├─╯ Second part of conflicting change
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 aade7195
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 fe876a9c
│ Initial contents
◆ zzzzzzzz root() 00000000
[EOF]
@@ -248,8 +248,8 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
insta::assert_snapshot!(output, @r"
Working copy changes:
M conflicted.txt
Working copy (@) : wqnwkozp c4a6dbc2 fixed 2
Parent commit (@-): kmkuslsw fcebf6ee fixed 1
Working copy (@) : wqnwkozp cc7d68f7 fixed 2
Parent commit (@-): kmkuslsw 812e2163 fixed 1
[EOF]
");
@@ -259,21 +259,21 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
let output = work_dir.run_jj(["log", "-r", "::"]);
insta::assert_snapshot!(output, @r"
○ wqnwkozp test.user@example.com 2001-02-03 08:05:20 c4a6dbc2
○ wqnwkozp test.user@example.com 2001-02-03 08:05:20 cc7d68f7
│ fixed 2
@ kmkuslsw test.user@example.com 2001-02-03 08:05:19 fcebf6ee
@ kmkuslsw test.user@example.com 2001-02-03 08:05:19 812e2163
│ fixed 1
× yqosqzyt test.user@example.com 2001-02-03 08:05:13 dcb25635 conflict
× yqosqzyt test.user@example.com 2001-02-03 08:05:13 7e0bc4cf conflict
│ (empty) boom-cont-2
× royxmykx test.user@example.com 2001-02-03 08:05:12 664a4c6c conflict
× royxmykx test.user@example.com 2001-02-03 08:05:12 681c71af conflict
│ (empty) boom-cont
× mzvwutvl test.user@example.com 2001-02-03 08:05:11 c5a4e9cb conflict
× mzvwutvl test.user@example.com 2001-02-03 08:05:11 30558616 conflict
├─╮ (empty) boom
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 1e8c2956
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 bb11a679
│ │ First part of conflicting change
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 2c8b19fd
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 b6dfc209
├─╯ Second part of conflicting change
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 aade7195
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 fe876a9c
│ Initial contents
◆ zzzzzzzz root() 00000000
[EOF]
@@ -284,8 +284,8 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
insta::assert_snapshot!(output, @r"
Working copy changes:
M conflicted.txt
Working copy (@) : kmkuslsw fcebf6ee fixed 1
Parent commit (@-): yqosqzyt dcb25635 (conflict) (empty) boom-cont-2
Working copy (@) : kmkuslsw 812e2163 fixed 1
Parent commit (@-): yqosqzyt 7e0bc4cf (conflict) (empty) boom-cont-2
Hint: Conflict in parent commit has been resolved in working copy
[EOF]
");
@@ -297,21 +297,21 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
let output = work_dir.run_jj(["log", "-r", "::"]);
insta::assert_snapshot!(output, @r"
○ wqnwkozp test.user@example.com 2001-02-03 08:05:20 c4a6dbc2
○ wqnwkozp test.user@example.com 2001-02-03 08:05:20 cc7d68f7
│ fixed 2
○ kmkuslsw test.user@example.com 2001-02-03 08:05:19 fcebf6ee
○ kmkuslsw test.user@example.com 2001-02-03 08:05:19 812e2163
│ fixed 1
× yqosqzyt test.user@example.com 2001-02-03 08:05:13 dcb25635 conflict
× yqosqzyt test.user@example.com 2001-02-03 08:05:13 7e0bc4cf conflict
│ (empty) boom-cont-2
× royxmykx test.user@example.com 2001-02-03 08:05:12 664a4c6c conflict
× royxmykx test.user@example.com 2001-02-03 08:05:12 681c71af conflict
│ (empty) boom-cont
× mzvwutvl test.user@example.com 2001-02-03 08:05:11 c5a4e9cb conflict
× mzvwutvl test.user@example.com 2001-02-03 08:05:11 30558616 conflict
├─╮ (empty) boom
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 1e8c2956
│ ○ kkmpptxz test.user@example.com 2001-02-03 08:05:10 bb11a679
│ │ First part of conflicting change
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 2c8b19fd
○ │ zsuskuln test.user@example.com 2001-02-03 08:05:11 b6dfc209
├─╯ Second part of conflicting change
@ qpvuntsm test.user@example.com 2001-02-03 08:05:08 aade7195
@ qpvuntsm test.user@example.com 2001-02-03 08:05:08 fe876a9c
│ Initial contents
◆ zzzzzzzz root() 00000000
[EOF]
@@ -322,7 +322,7 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
insta::assert_snapshot!(output, @r"
Working copy changes:
A conflicted.txt
Working copy (@) : qpvuntsm aade7195 Initial contents
Working copy (@) : qpvuntsm fe876a9c Initial contents
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -354,9 +354,9 @@ fn test_status_simplify_conflict_sides() {
insta::assert_snapshot!(work_dir.run_jj(["status"]),
@r"
The working copy has no changes.
Working copy (@) : nkmrtpmo 83c4b9e7 conflict | (conflict) (empty) conflict
Parent commit (@-): kmkuslsw 4601566f conflictA | (conflict) (empty) conflictA
Parent commit (@-): lylxulpl 6f8d8381 conflictB | (conflict) (empty) conflictB
Working copy (@) : nkmrtpmo a5a545ce conflict | (conflict) (empty) conflict
Parent commit (@-): kmkuslsw ccb05364 conflictA | (conflict) (empty) conflictA
Parent commit (@-): lylxulpl d9bc60cb conflictB | (conflict) (empty) conflictB
Warning: There are unresolved conflicts at these paths:
fileA 2-sided conflict
fileB 2-sided conflict
@@ -391,7 +391,7 @@ fn test_status_untracked_files() {
? initially-untracked-file
? sub/always-untracked
? sub/initially-untracked
Working copy (@) : qpvuntsm 230dd059 (empty) (no description set)
Working copy (@) : qpvuntsm e8849ae1 (empty) (no description set)
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -413,7 +413,7 @@ fn test_status_untracked_files() {
Untracked paths:
? always-untracked-file
? sub/always-untracked
Working copy (@) : qpvuntsm 99798fcd (no description set)
Working copy (@) : qpvuntsm b8c1286d (no description set)
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -425,8 +425,8 @@ fn test_status_untracked_files() {
Untracked paths:
? always-untracked-file
? sub/always-untracked
Working copy (@) : mzvwutvl 30e53c74 (empty) (no description set)
Parent commit (@-): qpvuntsm 99798fcd (no description set)
Working copy (@) : mzvwutvl daa133b8 (empty) (no description set)
Parent commit (@-): qpvuntsm b8c1286d (no description set)
[EOF]
");
@@ -448,8 +448,8 @@ fn test_status_untracked_files() {
? initially-untracked-file
? sub/always-untracked
? sub/initially-untracked
Working copy (@) : mzvwutvl bb362aaf (no description set)
Parent commit (@-): qpvuntsm 99798fcd (no description set)
Working copy (@) : mzvwutvl 240f261a (no description set)
Parent commit (@-): qpvuntsm b8c1286d (no description set)
[EOF]
");
@@ -462,8 +462,8 @@ fn test_status_untracked_files() {
? initially-untracked-file
? sub/always-untracked
? sub/initially-untracked
Working copy (@) : yostqsxw 8e8c02fe (empty) (no description set)
Parent commit (@-): mzvwutvl bb362aaf (no description set)
Working copy (@) : yostqsxw 50beac0d (empty) (no description set)
Parent commit (@-): mzvwutvl 240f261a (no description set)
[EOF]
");
}

24
cli/tests/test_tag_command.rs
View File

@@ -64,32 +64,32 @@ fn test_tag_list() {
insta::assert_snapshot!(work_dir.run_jj(["tag", "list"]), @r"
conflicted_tag (conflicted):
- rlvkpnrz caf975d0 (empty) commit1
+ zsuskuln 3db783e0 (empty) commit2
+ royxmykx 68d950ce (empty) commit3
test_tag: rlvkpnrz caf975d0 (empty) commit1
test_tag2: zsuskuln 3db783e0 (empty) commit2
- rlvkpnrz 893e67dc (empty) commit1
+ zsuskuln 76abdd20 (empty) commit2
+ royxmykx 13c4e819 (empty) commit3
test_tag: rlvkpnrz 893e67dc (empty) commit1
test_tag2: zsuskuln 76abdd20 (empty) commit2
[EOF]
");
insta::assert_snapshot!(work_dir.run_jj(["tag", "list", "--color=always"]), @r"
conflicted_tag (conflicted):
- rlvkpnrz caf975d0 (empty) commit1
+ zsuskuln 3db783e0 (empty) commit2
+ royxmykx 68d950ce (empty) commit3
test_tag: rlvkpnrz caf975d0 (empty) commit1
test_tag2: zsuskuln 3db783e0 (empty) commit2
- rlvkpnrz 893e67dc (empty) commit1
+ zsuskuln 76abdd20 (empty) commit2
+ royxmykx 13c4e819 (empty) commit3
test_tag: rlvkpnrz 893e67dc (empty) commit1
test_tag2: zsuskuln 76abdd20 (empty) commit2
[EOF]
");
// Test pattern matching.
insta::assert_snapshot!(work_dir.run_jj(["tag", "list", "test_tag2"]), @r"
test_tag2: zsuskuln 3db783e0 (empty) commit2
test_tag2: zsuskuln 76abdd20 (empty) commit2
[EOF]
");
insta::assert_snapshot!(work_dir.run_jj(["tag", "list", "glob:test_tag?"]), @r"
test_tag2: zsuskuln 3db783e0 (empty) commit2
test_tag2: zsuskuln 76abdd20 (empty) commit2
[EOF]
");

138
cli/tests/test_undo.rs
View File

@@ -78,8 +78,8 @@ fn test_git_push_undo() {
// local `main` | BB | -- | --
// remote-tracking | AA | AA | AA
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 75e78001 (empty) BB
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 2080bdb8 (empty) AA
main: qpvuntsm d9a9f6a0 (empty) BB
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 3a44d6c5 (empty) AA
[EOF]
");
let pre_push_opid = work_dir.current_operation_id();
@@ -91,8 +91,8 @@ fn test_git_push_undo() {
// local `main` | BB | -- | --
// remote-tracking | BB | BB | BB
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 75e78001 (empty) BB
@origin: qpvuntsm 75e78001 (empty) BB
main: qpvuntsm d9a9f6a0 (empty) BB
@origin: qpvuntsm d9a9f6a0 (empty) BB
[EOF]
");
@@ -105,8 +105,8 @@ fn test_git_push_undo() {
// local `main` | BB | -- | --
// remote-tracking | AA | AA | BB
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 75e78001 (empty) BB
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 2080bdb8 (empty) AA
main: qpvuntsm d9a9f6a0 (empty) BB
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 3a44d6c5 (empty) AA
[EOF]
");
test_env.advance_test_rng_seed_to_multiple_of(100_000);
@@ -122,10 +122,10 @@ fn test_git_push_undo() {
// `jj git fetch && jj undo && jj git fetch` would become a no-op.
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main (conflicted):
- qpvuntsm hidden 2080bdb8 (empty) AA
+ qpvuntsm?? 20b2cc4b (empty) CC
+ qpvuntsm?? 75e78001 (empty) BB
@origin (behind by 1 commits): qpvuntsm?? 75e78001 (empty) BB
- qpvuntsm hidden 3a44d6c5 (empty) AA
+ qpvuntsm?? 1e742089 (empty) CC
+ qpvuntsm?? d9a9f6a0 (empty) BB
@origin (behind by 1 commits): qpvuntsm?? d9a9f6a0 (empty) BB
[EOF]
");
}
@@ -159,8 +159,8 @@ fn test_git_push_undo_with_import() {
// local `main` | BB | -- | --
// remote-tracking | AA | AA | AA
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 75e78001 (empty) BB
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 2080bdb8 (empty) AA
main: qpvuntsm d9a9f6a0 (empty) BB
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 3a44d6c5 (empty) AA
[EOF]
");
let pre_push_opid = work_dir.current_operation_id();
@@ -172,8 +172,8 @@ fn test_git_push_undo_with_import() {
// local `main` | BB | -- | --
// remote-tracking | BB | BB | BB
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 75e78001 (empty) BB
@origin: qpvuntsm 75e78001 (empty) BB
main: qpvuntsm d9a9f6a0 (empty) BB
@origin: qpvuntsm d9a9f6a0 (empty) BB
[EOF]
");
@@ -186,8 +186,8 @@ fn test_git_push_undo_with_import() {
// local `main` | BB | -- | --
// remote-tracking | AA | AA | BB
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 75e78001 (empty) BB
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 2080bdb8 (empty) AA
main: qpvuntsm d9a9f6a0 (empty) BB
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 3a44d6c5 (empty) AA
[EOF]
");
@@ -202,8 +202,8 @@ fn test_git_push_undo_with_import() {
// local `main` | BB | -- | --
// remote-tracking | BB | BB | BB
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 75e78001 (empty) BB
@origin: qpvuntsm 75e78001 (empty) BB
main: qpvuntsm d9a9f6a0 (empty) BB
@origin: qpvuntsm d9a9f6a0 (empty) BB
[EOF]
");
test_env.advance_test_rng_seed_to_multiple_of(100_000);
@@ -212,8 +212,8 @@ fn test_git_push_undo_with_import() {
// There is not a conflict. This seems like a good outcome; undoing `git push`
// was essentially a no-op.
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 20b2cc4b (empty) CC
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 75e78001 (empty) BB
main: qpvuntsm 1e742089 (empty) CC
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden d9a9f6a0 (empty) BB
[EOF]
");
}
@@ -247,9 +247,9 @@ fn test_git_push_undo_colocated() {
// local `main` | BB | BB | BB
// remote-tracking | AA | AA | AA
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 75e78001 (empty) BB
@git: qpvuntsm 75e78001 (empty) BB
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 2080bdb8 (empty) AA
main: qpvuntsm d9a9f6a0 (empty) BB
@git: qpvuntsm d9a9f6a0 (empty) BB
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 3a44d6c5 (empty) AA
[EOF]
");
let pre_push_opid = work_dir.current_operation_id();
@@ -261,9 +261,9 @@ fn test_git_push_undo_colocated() {
// local `main` | BB | BB | BB
// remote-tracking | BB | BB | BB
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 75e78001 (empty) BB
@git: qpvuntsm 75e78001 (empty) BB
@origin: qpvuntsm 75e78001 (empty) BB
main: qpvuntsm d9a9f6a0 (empty) BB
@git: qpvuntsm d9a9f6a0 (empty) BB
@origin: qpvuntsm d9a9f6a0 (empty) BB
[EOF]
");
@@ -284,9 +284,9 @@ fn test_git_push_undo_colocated() {
// local `main` | BB | BB | BB
// remote-tracking | AA | AA | AA
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 75e78001 (empty) BB
@git: qpvuntsm 75e78001 (empty) BB
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 2080bdb8 (empty) AA
main: qpvuntsm d9a9f6a0 (empty) BB
@git: qpvuntsm d9a9f6a0 (empty) BB
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 3a44d6c5 (empty) AA
[EOF]
");
test_env.advance_test_rng_seed_to_multiple_of(100_000);
@@ -296,11 +296,11 @@ fn test_git_push_undo_colocated() {
// same result in a seemingly different way?
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main (conflicted):
- qpvuntsm hidden 2080bdb8 (empty) AA
+ qpvuntsm?? 20b2cc4b (empty) CC
+ qpvuntsm?? 75e78001 (empty) BB
@git (behind by 1 commits): qpvuntsm?? 20b2cc4b (empty) CC
@origin (behind by 1 commits): qpvuntsm?? 75e78001 (empty) BB
- qpvuntsm hidden 3a44d6c5 (empty) AA
+ qpvuntsm?? 1e742089 (empty) CC
+ qpvuntsm?? d9a9f6a0 (empty) BB
@git (behind by 1 commits): qpvuntsm?? 1e742089 (empty) CC
@origin (behind by 1 commits): qpvuntsm?? d9a9f6a0 (empty) BB
[EOF]
");
}
@@ -326,15 +326,15 @@ fn test_git_push_undo_repo_only() {
work_dir.run_jj(["describe", "-m", "AA"]).success();
work_dir.run_jj(["git", "push", "--allow-new"]).success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 2080bdb8 (empty) AA
@origin: qpvuntsm 2080bdb8 (empty) AA
main: qpvuntsm 3a44d6c5 (empty) AA
@origin: qpvuntsm 3a44d6c5 (empty) AA
[EOF]
");
test_env.advance_test_rng_seed_to_multiple_of(100_000);
work_dir.run_jj(["describe", "-m", "BB"]).success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 75e78001 (empty) BB
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 2080bdb8 (empty) AA
main: qpvuntsm d9a9f6a0 (empty) BB
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 3a44d6c5 (empty) AA
[EOF]
");
let pre_push_opid = work_dir.current_operation_id();
@@ -345,8 +345,8 @@ fn test_git_push_undo_repo_only() {
.run_jj(["op", "restore", "--what=repo", &pre_push_opid])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 75e78001 (empty) BB
@origin: qpvuntsm 75e78001 (empty) BB
main: qpvuntsm d9a9f6a0 (empty) BB
@origin: qpvuntsm d9a9f6a0 (empty) BB
[EOF]
");
test_env.advance_test_rng_seed_to_multiple_of(100_000);
@@ -354,8 +354,8 @@ fn test_git_push_undo_repo_only() {
work_dir.run_jj(["git", "fetch"]).success();
// This currently gives an identical result to `test_git_push_undo_import`.
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
main: qpvuntsm 20b2cc4b (empty) CC
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden 75e78001 (empty) BB
main: qpvuntsm 1e742089 (empty) CC
@origin (ahead by 1 commits, behind by 1 commits): qpvuntsm hidden d9a9f6a0 (empty) BB
[EOF]
");
}
@@ -380,10 +380,10 @@ fn test_bookmark_track_untrack_undo() {
.run_jj(["bookmark", "delete", "feature2"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
feature1: qpvuntsm 8da1cfc8 (empty) commit
@origin: qpvuntsm 8da1cfc8 (empty) commit
feature1: qpvuntsm bab5b5ef (empty) commit
@origin: qpvuntsm bab5b5ef (empty) commit
feature2 (deleted)
@origin: qpvuntsm 8da1cfc8 (empty) commit
@origin: qpvuntsm bab5b5ef (empty) commit
[EOF]
");
@@ -392,26 +392,26 @@ fn test_bookmark_track_untrack_undo() {
.run_jj(["bookmark", "untrack", "feature1@origin", "feature2@origin"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
feature1: qpvuntsm 8da1cfc8 (empty) commit
feature1@origin: qpvuntsm 8da1cfc8 (empty) commit
feature2@origin: qpvuntsm 8da1cfc8 (empty) commit
feature1: qpvuntsm bab5b5ef (empty) commit
feature1@origin: qpvuntsm bab5b5ef (empty) commit
feature2@origin: qpvuntsm bab5b5ef (empty) commit
[EOF]
");
work_dir.run_jj(["undo"]).success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
feature1: qpvuntsm 8da1cfc8 (empty) commit
@origin: qpvuntsm 8da1cfc8 (empty) commit
feature1: qpvuntsm bab5b5ef (empty) commit
@origin: qpvuntsm bab5b5ef (empty) commit
feature2 (deleted)
@origin: qpvuntsm 8da1cfc8 (empty) commit
@origin: qpvuntsm bab5b5ef (empty) commit
[EOF]
");
work_dir.run_jj(["undo"]).success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
feature1: qpvuntsm 8da1cfc8 (empty) commit
feature1@origin: qpvuntsm 8da1cfc8 (empty) commit
feature2@origin: qpvuntsm 8da1cfc8 (empty) commit
feature1: qpvuntsm bab5b5ef (empty) commit
feature1@origin: qpvuntsm bab5b5ef (empty) commit
feature2@origin: qpvuntsm bab5b5ef (empty) commit
[EOF]
");
@@ -419,17 +419,17 @@ fn test_bookmark_track_untrack_undo() {
.run_jj(["bookmark", "track", "feature1@origin"])
.success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
feature1: qpvuntsm 8da1cfc8 (empty) commit
@origin: qpvuntsm 8da1cfc8 (empty) commit
feature2@origin: qpvuntsm 8da1cfc8 (empty) commit
feature1: qpvuntsm bab5b5ef (empty) commit
@origin: qpvuntsm bab5b5ef (empty) commit
feature2@origin: qpvuntsm bab5b5ef (empty) commit
[EOF]
");
work_dir.run_jj(["undo"]).success();
insta::assert_snapshot!(get_bookmark_output(&work_dir), @r"
feature1: qpvuntsm 8da1cfc8 (empty) commit
feature1@origin: qpvuntsm 8da1cfc8 (empty) commit
feature2@origin: qpvuntsm 8da1cfc8 (empty) commit
feature1: qpvuntsm bab5b5ef (empty) commit
feature1@origin: qpvuntsm bab5b5ef (empty) commit
feature2@origin: qpvuntsm bab5b5ef (empty) commit
[EOF]
");
}
@@ -446,9 +446,9 @@ fn test_shows_a_warning_when_undoing_an_undo_operation_as_bare_jj_undo() {
let output = work_dir.run_jj(["undo"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Undid operation: 2d5b73a97567 (2001-02-03 08:05:09) undo operation 289cb69a8458456474a77cc432e8009b99f039cdcaf19ba4526753e97d70fee3fd0f410ff2b7c1d10cf0c2501702e7a85d58f9d813cdca567c377431ec4d2b97
Working copy (@) now at: rlvkpnrz 65b6b74e (empty) (no description set)
Parent commit (@-) : qpvuntsm 230dd059 (empty) (no description set)
Undid operation: 94337eb25498 (2001-02-03 08:05:09) undo operation c7b028ea7b47461d4328dde306e13337ea9000b6abfde4cb751902fae3124d578f2e0082cbd1e1d32b5e64afc001a933be5acc81a015a7f15d62d90750eaa9ca
Working copy (@) now at: rlvkpnrz 43444d88 (empty) (no description set)
Parent commit (@-) : qpvuntsm e8849ae1 (empty) (no description set)
Hint: This action reverted an 'undo' operation. The repository is now in the same state as it was before the original 'undo'.
Hint: If your goal is to undo multiple operations, consider using `jj op log` to see past states, and `jj op restore` to restore one of these states.
[EOF]
@@ -460,9 +460,9 @@ fn test_shows_a_warning_when_undoing_an_undo_operation_as_bare_jj_undo() {
let output = work_dir.run_jj(["undo"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Undid operation: b16799358b33 (2001-02-03 08:05:12) undo operation b14487c6d6d98f7f575ea03c48ed92d899c2a0ecbe9458221b6fc11af2bf6d918c9620cae1f8268012b0e25c7dd6f78b19ec628d0504a0830dc562d6625ba9ec
Working copy (@) now at: mzvwutvl 167f90e7 (empty) (no description set)
Parent commit (@-) : qpvuntsm 230dd059 (empty) (no description set)
Undid operation: 0456966dabcb (2001-02-03 08:05:12) undo operation aea8c90f370bd851b9b66a6542aeff24f01418d745efcd7a94c7399afe4ce9aaf79903cd1feb34a9d091bfad3b3680e138ec90ecbed759cf2f6eacdb5c34e4e6
Working copy (@) now at: mzvwutvl 8afc18ff (empty) (no description set)
Parent commit (@-) : qpvuntsm e8849ae1 (empty) (no description set)
Hint: This action reverted an 'undo' operation. The repository is now in the same state as it was before the original 'undo'.
Hint: If your goal is to undo multiple operations, consider using `jj op log` to see past states, and `jj op restore` to restore one of these states.
[EOF]
@@ -482,9 +482,9 @@ fn test_shows_no_warning_when_undoing_a_specific_undo_change() {
let output = work_dir.run_jj(["undo", &op_id_hex]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Undid operation: 2d5b73a97567 (2001-02-03 08:05:09) undo operation 289cb69a8458456474a77cc432e8009b99f039cdcaf19ba4526753e97d70fee3fd0f410ff2b7c1d10cf0c2501702e7a85d58f9d813cdca567c377431ec4d2b97
Working copy (@) now at: rlvkpnrz 65b6b74e (empty) (no description set)
Parent commit (@-) : qpvuntsm 230dd059 (empty) (no description set)
Undid operation: 94337eb25498 (2001-02-03 08:05:09) undo operation c7b028ea7b47461d4328dde306e13337ea9000b6abfde4cb751902fae3124d578f2e0082cbd1e1d32b5e64afc001a933be5acc81a015a7f15d62d90750eaa9ca
Working copy (@) now at: rlvkpnrz 43444d88 (empty) (no description set)
Parent commit (@-) : qpvuntsm e8849ae1 (empty) (no description set)
[EOF]
");
}

2
cli/tests/test_util_command.rs
View File

@@ -94,7 +94,7 @@ fn test_gc_operation_log() {
let output = work_dir.run_jj(["debug", "operation", &op_to_remove]);
insta::assert_snapshot!(output, @r#"
------- stderr -------
Error: No operation ID matching "bda58b425f645d895ce92608576509b4fcc0c96dbc5f18717a817f09a530117dff0c2054a28781b4c7f1fdbf5a726c89ebd8666fe54dc9f3cc52ca9596110418"
Error: No operation ID matching "31c378f62742a80562c8fe790e46895882ed618d1ac06ceeddc182b3f676fc926f07f577cc505059b5345a5111982a193bb25b0601c518b88fd5c0fdac4e229d"
[EOF]
[exit status: 1]
"#);

26
cli/tests/test_working_copy.rs
View File

@@ -140,12 +140,12 @@ fn test_snapshot_large_file_restore() {
This will increase the maximum file size allowed for new files, in this repository only.
- Run `jj --config snapshot.max-new-file-size=13 st`
This will increase the maximum file size allowed for new files, for this command only.
Working copy (@) now at: kkmpptxz e3eb7e81 (no description set)
Working copy (@) now at: kkmpptxz 119f5156 (no description set)
Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 1 files, modified 0 files, removed 0 files
Warning: 1 of those updates were skipped because there were conflicting changes in the working copy.
Hint: Inspect the changes compared to the intended target with `jj diff --from e3eb7e819de5`.
Discard the conflicting changes with `jj restore --from e3eb7e819de5`.
Hint: Inspect the changes compared to the intended target with `jj diff --from 119f5156d330`.
Discard the conflicting changes with `jj restore --from 119f5156d330`.
[EOF]
");
insta::assert_snapshot!(work_dir.read_file("file"), @"a lot of text");
@@ -156,7 +156,7 @@ fn test_snapshot_large_file_restore() {
insta::assert_snapshot!(output, @r"
Working copy changes:
A file
Working copy (@) : kkmpptxz b75eed09 (no description set)
Working copy (@) : kkmpptxz 09eba65e (no description set)
Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF]
");
@@ -365,7 +365,7 @@ fn test_conflict_marker_length_stored_in_working_copy() {
// Working copy should contain conflict marker length
let output = work_dir.run_jj(["debug", "local-working-copy"]);
insta::assert_snapshot!(output.normalize_stdout_with(redact_output), @r#"
Current operation: OperationId("6feb53603f9f7324085d2d89dca19a6dac93fef6795cfd5d57090ff803d404ab1196b45d5b97faa641f6a78302ac0fbd149f5e5a880d1fd64d6520c31beab213")
Current operation: OperationId("48a1ea616c63af21072ac9efb7a027770537f8f1a73e60db707f339d0f1a3e0719e2721f73b62a96153fd6e7fd56aa24dbf470292bfa4587661039639d2334aa")
Current tree: Merge(Conflicted([TreeId("381273b50cf73f8c81b3f1502ee89e9bbd6c1518"), TreeId("771f3d31c4588ea40a8864b2a981749888e596c2"), TreeId("f56b8223da0dab22b03b8323ced4946329aeb4e0")]))
Normal { <executable> } 249 <timestamp> Some(MaterializedConflictData { conflict_marker_len: 11 }) "file"
[EOF]
@@ -399,9 +399,9 @@ fn test_conflict_marker_length_stored_in_working_copy() {
insta::assert_snapshot!(output, @r"
Working copy changes:
M file
Working copy (@) : mzvwutvl 3a981880 (conflict) (no description set)
Parent commit (@-): rlvkpnrz ce613b49 side-a
Parent commit (@-): zsuskuln 7b2b03ab side-b
Working copy (@) : mzvwutvl b6b012dc (conflict) (no description set)
Parent commit (@-): rlvkpnrz ccf9527c side-a
Parent commit (@-): zsuskuln d7acaf48 side-b
Warning: There are unresolved conflicts at these paths:
file 2-sided conflict
[EOF]
@@ -428,7 +428,7 @@ fn test_conflict_marker_length_stored_in_working_copy() {
// Working copy should still contain conflict marker length
let output = work_dir.run_jj(["debug", "local-working-copy"]);
insta::assert_snapshot!(output.normalize_stdout_with(redact_output), @r#"
Current operation: OperationId("205bc702428a522e0b175938a51c51b59741c854a609ba63c89de76ffda6e5eff6fcc00725328b1a91f448401769773cefcff01fac3448190d2cea4e137d2166")
Current operation: OperationId("cc8300e781c597dc3efe658a25485f6c9b811e35ea30467a0b762bbbbdc22e8f373a4a521f6bb4cc93a2d08973c535e98a2544a7f03a2ed473b85bc818495db3")
Current tree: Merge(Conflicted([TreeId("381273b50cf73f8c81b3f1502ee89e9bbd6c1518"), TreeId("771f3d31c4588ea40a8864b2a981749888e596c2"), TreeId("3329c18c95f7b7a55c278c2259e9c4ce711fae59")]))
Normal { <executable> } 289 <timestamp> Some(MaterializedConflictData { conflict_marker_len: 11 }) "file"
[EOF]
@@ -453,9 +453,9 @@ fn test_conflict_marker_length_stored_in_working_copy() {
insta::assert_snapshot!(output, @r"
Working copy changes:
M file
Working copy (@) : mzvwutvl 1aefd866 (no description set)
Parent commit (@-): rlvkpnrz ce613b49 side-a
Parent commit (@-): zsuskuln 7b2b03ab side-b
Working copy (@) : mzvwutvl 469d479f (no description set)
Parent commit (@-): rlvkpnrz ccf9527c side-a
Parent commit (@-): zsuskuln d7acaf48 side-b
[EOF]
");
@@ -463,7 +463,7 @@ fn test_conflict_marker_length_stored_in_working_copy() {
// working copy
let output = work_dir.run_jj(["debug", "local-working-copy"]);
insta::assert_snapshot!(output.normalize_stdout_with(redact_output), @r#"
Current operation: OperationId("2206ce3c108b1573df0841138c226bba1ab3cff900a5899ed31ac69162c7d6f30d37fb5ab43da60dba88047b8ab22d453887fff688f26dfcf04f2c99420a5563")
Current operation: OperationId("93b119e5cb434c1ded5ace206be37c99ab8a5aeefd3b9d1f6443edaf8a410e4240d021ebc5a9199fcc60993d8252c19ceeb21343b30a175ce19b5086d4976592")
Current tree: Merge(Resolved(TreeId("6120567b3cb2472d549753ed3e4b84183d52a650")))
Normal { <executable> } 130 <timestamp> None "file"
[EOF]

370
cli/tests/test_workspaces.rs
View File

@@ -31,7 +31,7 @@ fn test_workspaces_add_second_workspace() {
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz 8183d0fc (empty) (no description set)
default: rlvkpnrz 504e3d8c (empty) (no description set)
[EOF]
");
@@ -39,8 +39,8 @@ fn test_workspaces_add_second_workspace() {
insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr -------
Created workspace in "../secondary"
Working copy (@) now at: rzvqmyuk 5ed2222c (empty) (no description set)
Parent commit (@-) : qpvuntsm 751b12b7 initial
Working copy (@) now at: rzvqmyuk bcc858e1 (empty) (no description set)
Parent commit (@-) : qpvuntsm 7b22a8cb initial
Added 1 files, modified 0 files, removed 0 files
[EOF]
"#);
@@ -48,18 +48,18 @@ fn test_workspaces_add_second_workspace() {
// Can see the working-copy commit in each workspace in the log output. The "@"
// node in the graph indicates the current workspace's working-copy commit.
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 8183d0fcaa4c default@
│ ○ 5ed2222c28e2 second@
@ 504e3d8c1bcd default@
│ ○ bcc858e1d93f second@
├─╯
○ 751b12b7b981
○ 7b22a8cbe888
◆ 000000000000
[EOF]
");
insta::assert_snapshot!(get_log_output(&secondary_dir), @r"
@ 5ed2222c28e2 second@
│ ○ 8183d0fcaa4c default@
@ bcc858e1d93f second@
│ ○ 504e3d8c1bcd default@
├─╯
○ 751b12b7b981
○ 7b22a8cbe888
◆ 000000000000
[EOF]
");
@@ -67,8 +67,8 @@ fn test_workspaces_add_second_workspace() {
// Both workspaces show up when we list them
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz 8183d0fc (empty) (no description set)
second: rzvqmyuk 5ed2222c (empty) (no description set)
default: rlvkpnrz 504e3d8c (empty) (no description set)
second: rzvqmyuk bcc858e1 (empty) (no description set)
[EOF]
");
}
@@ -141,7 +141,7 @@ fn test_workspaces_add_second_workspace_on_merge() {
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: zsuskuln 35e47bff (empty) merge
default: zsuskuln 46ed31b6 (empty) merge
[EOF]
");
@@ -151,12 +151,12 @@ fn test_workspaces_add_second_workspace_on_merge() {
// The new workspace's working-copy commit shares all parents with the old one.
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 35e47bff781e default@
@ 46ed31b61ce9 default@
├─╮
│ │ ○ 7013a493bd09 second@
│ │ ○ d23b2d4ff55c second@
╭─┬─╯
│ ○ 444b77e99d43
○ │ 1694f2ddf8ec
│ ○ 3c52528f5893
○ │ a3155ab1bf5a
├─╯
◆ 000000000000
[EOF]
@@ -193,8 +193,8 @@ fn test_workspaces_add_at_operation() {
let output = main_dir.run_jj(["commit", "-m1"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: rlvkpnrz 18d8b994 (empty) (no description set)
Parent commit (@-) : qpvuntsm 3364a7ed 1
Working copy (@) now at: rlvkpnrz 59e07459 (empty) (no description set)
Parent commit (@-) : qpvuntsm 9e4b0b91 1
[EOF]
");
@@ -202,8 +202,8 @@ fn test_workspaces_add_at_operation() {
let output = main_dir.run_jj(["commit", "-m2"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: kkmpptxz 2e7dc5ab (empty) (no description set)
Parent commit (@-) : rlvkpnrz 0dbaa19a 2
Working copy (@) now at: kkmpptxz 6e9610ac (empty) (no description set)
Parent commit (@-) : rlvkpnrz 8b7259b9 2
[EOF]
");
@@ -214,8 +214,8 @@ fn test_workspaces_add_at_operation() {
insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr -------
Created workspace in "../secondary"
Working copy (@) now at: rzvqmyuk a4d1cbc9 (empty) (no description set)
Parent commit (@-) : qpvuntsm 3364a7ed 1
Working copy (@) now at: rzvqmyuk b8772476 (empty) (no description set)
Parent commit (@-) : qpvuntsm 9e4b0b91 1
Added 1 files, modified 0 files, removed 0 files
[EOF]
"#);
@@ -227,8 +227,8 @@ fn test_workspaces_add_at_operation() {
insta::assert_snapshot!(output, @r"
Working copy changes:
A file4
Working copy (@) : rzvqmyuk 2ba74f85 (no description set)
Parent commit (@-): qpvuntsm 3364a7ed 1
Working copy (@) : rzvqmyuk f2ff8257 (no description set)
Parent commit (@-): qpvuntsm 9e4b0b91 1
[EOF]
------- stderr -------
Concurrent modification detected, resolving automatically.
@@ -240,12 +240,12 @@ fn test_workspaces_add_at_operation() {
@ snapshot working copy
○ reconcile divergent operations
├─╮
○ │ commit cd06097124e3e5860867e35c2bb105902c28ea38
○ │ commit 9152e822279787a168ddf4cede6440a21faa00d7
│ ○ create initial working-copy commit in workspace secondary
│ ○ add workspace 'secondary'
├─╯
○ snapshot working copy
○ commit 1c867a0762e30de4591890ea208849f793742c1b
○ commit 093c3c9624b6cfe22b310586f5638792aa80e6d7
○ snapshot working copy
○ add workspace 'default'
○
@@ -269,7 +269,7 @@ fn test_workspaces_add_workspace_at_revision() {
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: kkmpptxz dadeedb4 (empty) (no description set)
default: kkmpptxz 5ac9178d (empty) (no description set)
[EOF]
");
@@ -285,8 +285,8 @@ fn test_workspaces_add_workspace_at_revision() {
insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr -------
Created workspace in "../secondary"
Working copy (@) now at: zxsnswpr e374e74a (empty) (no description set)
Parent commit (@-) : qpvuntsm f6097c2f first
Working copy (@) now at: zxsnswpr ea5860fb (empty) (no description set)
Parent commit (@-) : qpvuntsm 27473635 first
Added 1 files, modified 0 files, removed 0 files
[EOF]
"#);
@@ -294,20 +294,20 @@ fn test_workspaces_add_workspace_at_revision() {
// Can see the working-copy commit in each workspace in the log output. The "@"
// node in the graph indicates the current workspace's working-copy commit.
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ dadeedb493e8 default@
○ c420244c6398
│ ○ e374e74aa0c8 second@
@ 5ac9178da8b2 default@
○ a47d8a593529
│ ○ ea5860fbd622 second@
├─╯
○ f6097c2f7cac
○ 27473635a942
◆ 000000000000
[EOF]
");
insta::assert_snapshot!(get_log_output(&secondary_dir), @r"
@ e374e74aa0c8 second@
│ ○ dadeedb493e8 default@
│ ○ c420244c6398
@ ea5860fbd622 second@
│ ○ 5ac9178da8b2 default@
│ ○ a47d8a593529
├─╯
○ f6097c2f7cac
○ 27473635a942
◆ 000000000000
[EOF]
");
@@ -334,12 +334,12 @@ fn test_workspaces_add_workspace_multiple_revisions() {
main_dir.run_jj(["new", "-r", "root()"]).success();
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 5b36783cd11c
│ ○ 6c843d62ca29
@ 8d23abddc924
│ ○ eba7f49e2358
├─╯
│ ○ 544cd61f2d26
│ ○ 62444a45efcf
├─╯
│ ○ f6097c2f7cac
│ ○ 27473635a942
├─╯
◆ 000000000000
[EOF]
@@ -357,23 +357,23 @@ fn test_workspaces_add_workspace_multiple_revisions() {
insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr -------
Created workspace in "../merged"
Working copy (@) now at: wmwvqwsz f4fa64f4 (empty) (no description set)
Parent commit (@-) : mzvwutvl 6c843d62 third
Parent commit (@-) : kkmpptxz 544cd61f second
Parent commit (@-) : qpvuntsm f6097c2f first
Working copy (@) now at: wmwvqwsz 2d7c9a2d (empty) (no description set)
Parent commit (@-) : mzvwutvl eba7f49e third
Parent commit (@-) : kkmpptxz 62444a45 second
Parent commit (@-) : qpvuntsm 27473635 first
Added 3 files, modified 0 files, removed 0 files
[EOF]
"#);
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 5b36783cd11c default@
│ ○ f4fa64f40944 merge@
@ 8d23abddc924 default@
│ ○ 2d7c9a2d41dc merge@
│ ├─┬─╮
│ │ │ ○ f6097c2f7cac
│ │ │ ○ 27473635a942
├─────╯
│ │ ○ 544cd61f2d26
│ │ ○ 62444a45efcf
├───╯
│ ○ 6c843d62ca29
│ ○ eba7f49e2358
├─╯
◆ 000000000000
[EOF]
@@ -393,7 +393,7 @@ fn test_workspaces_add_workspace_from_subdir() {
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz e1038e77 (empty) (no description set)
default: rlvkpnrz 0ba0ff35 (empty) (no description set)
[EOF]
");
@@ -402,8 +402,8 @@ fn test_workspaces_add_workspace_from_subdir() {
insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr -------
Created workspace in "../../secondary"
Working copy (@) now at: rzvqmyuk 7ad84461 (empty) (no description set)
Parent commit (@-) : qpvuntsm a3a43d9e initial
Working copy (@) now at: rzvqmyuk dea1be10 (empty) (no description set)
Parent commit (@-) : qpvuntsm 80b67806 initial
Added 1 files, modified 0 files, removed 0 files
[EOF]
"#);
@@ -411,8 +411,8 @@ fn test_workspaces_add_workspace_from_subdir() {
// Both workspaces show up when we list them
let output = secondary_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz e1038e77 (empty) (no description set)
secondary: rzvqmyuk 7ad84461 (empty) (no description set)
default: rlvkpnrz 0ba0ff35 (empty) (no description set)
secondary: rzvqmyuk dea1be10 (empty) (no description set)
[EOF]
");
}
@@ -432,8 +432,8 @@ fn test_workspaces_add_workspace_in_current_workspace() {
------- stderr -------
Created workspace in "secondary"
Warning: Workspace created inside current directory. If this was unintentional, delete the "secondary" directory and run `jj workspace forget secondary` to remove it.
Working copy (@) now at: pmmvwywv 0a77a39d (empty) (no description set)
Parent commit (@-) : qpvuntsm 751b12b7 initial
Working copy (@) now at: pmmvwywv 058f604d (empty) (no description set)
Parent commit (@-) : qpvuntsm 7b22a8cb initial
Added 1 files, modified 0 files, removed 0 files
[EOF]
"#);
@@ -441,8 +441,8 @@ fn test_workspaces_add_workspace_in_current_workspace() {
// Workspace created despite warning
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz 46d9ba8b (no description set)
secondary: pmmvwywv 0a77a39d (empty) (no description set)
default: rlvkpnrz af2d0cd5 (no description set)
secondary: pmmvwywv 058f604d (empty) (no description set)
[EOF]
");
@@ -451,8 +451,8 @@ fn test_workspaces_add_workspace_in_current_workspace() {
insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr -------
Created workspace in "third"
Working copy (@) now at: zxsnswpr 64746d4b (empty) (no description set)
Parent commit (@-) : qpvuntsm 751b12b7 initial
Working copy (@) now at: zxsnswpr 1c1effec (empty) (no description set)
Parent commit (@-) : qpvuntsm 7b22a8cb initial
Added 1 files, modified 0 files, removed 0 files
[EOF]
"#);
@@ -460,9 +460,9 @@ fn test_workspaces_add_workspace_in_current_workspace() {
// Both workspaces created
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz 477c647f (no description set)
secondary: pmmvwywv 0a77a39d (empty) (no description set)
third: zxsnswpr 64746d4b (empty) (no description set)
default: rlvkpnrz b2288847 (no description set)
secondary: pmmvwywv 058f604d (empty) (no description set)
third: zxsnswpr 1c1effec (empty) (no description set)
[EOF]
");
@@ -494,10 +494,10 @@ fn test_workspaces_conflicting_edits() {
.success();
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 06b57f44a3ca default@
│ ○ 3224de8ae048 secondary@
@ 393250c59e39 default@
│ ○ 547036666102 secondary@
├─╯
○ 506f4ec3c2c6
○ 9a462e35578a
◆ 000000000000
[EOF]
");
@@ -511,24 +511,24 @@ fn test_workspaces_conflicting_edits() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: mzvwutvl a58c9a9b (empty) (no description set)
Parent commit (@-) : qpvuntsm d4124476 (no description set)
Working copy (@) now at: mzvwutvl 3a9b690d (empty) (no description set)
Parent commit (@-) : qpvuntsm b853f7c8 (no description set)
[EOF]
");
// The secondary workspace's working-copy commit was updated
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ a58c9a9b19ce default@
│ ○ e82cd4ee8faa secondary@
@ 3a9b690d6e67 default@
│ ○ 90f3d42e0bff secondary@
├─╯
○ d41244767d45
○ b853f7c8b006
◆ 000000000000
[EOF]
");
let output = secondary_dir.run_jj(["st"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: The working copy is stale (not updated since operation c81af45155a2).
Error: The working copy is stale (not updated since operation 09c578c227de).
Hint: Run `jj workspace update-stale` to update it.
See https://jj-vcs.github.io/jj/latest/working-copy/#stale-working-copy for more information.
[EOF]
@@ -538,7 +538,7 @@ fn test_workspaces_conflicting_edits() {
let output = secondary_dir.run_jj(["log"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: The working copy is stale (not updated since operation c81af45155a2).
Error: The working copy is stale (not updated since operation 09c578c227de).
Hint: Run `jj workspace update-stale` to update it.
See https://jj-vcs.github.io/jj/latest/working-copy/#stale-working-copy for more information.
[EOF]
@@ -552,31 +552,31 @@ fn test_workspaces_conflicting_edits() {
------- stderr -------
Concurrent modification detected, resolving automatically.
Rebased 1 descendant commits onto commits rewritten by other operation
Working copy (@) now at: pmmvwywv?? e82cd4ee (empty) (no description set)
Parent commit (@-) : qpvuntsm d4124476 (no description set)
Working copy (@) now at: pmmvwywv?? 90f3d42e (empty) (no description set)
Parent commit (@-) : qpvuntsm b853f7c8 (no description set)
Added 0 files, modified 1 files, removed 0 files
Updated working copy to fresh commit e82cd4ee8faa
Updated working copy to fresh commit 90f3d42e0bff
[EOF]
");
insta::assert_snapshot!(get_log_output(&secondary_dir),
@r"
@ e82cd4ee8faa secondary@ (divergent)
│ × 30816012e0da (divergent)
@ 90f3d42e0bff secondary@ (divergent)
│ × de7155dbea42 (divergent)
├─╯
│ ○ a58c9a9b19ce default@
│ ○ 3a9b690d6e67 default@
├─╯
○ d41244767d45
○ b853f7c8b006
◆ 000000000000
[EOF]
");
// The stale working copy should have been resolved by the previous command
insta::assert_snapshot!(get_log_output(&secondary_dir), @r"
@ e82cd4ee8faa secondary@ (divergent)
│ × 30816012e0da (divergent)
@ 90f3d42e0bff secondary@ (divergent)
│ × de7155dbea42 (divergent)
├─╯
│ ○ a58c9a9b19ce default@
│ ○ 3a9b690d6e67 default@
├─╯
○ d41244767d45
○ b853f7c8b006
◆ 000000000000
[EOF]
");
@@ -598,10 +598,10 @@ fn test_workspaces_updated_by_other() {
.success();
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 06b57f44a3ca default@
│ ○ 3224de8ae048 secondary@
@ 393250c59e39 default@
│ ○ 547036666102 secondary@
├─╯
○ 506f4ec3c2c6
○ 9a462e35578a
◆ 000000000000
[EOF]
");
@@ -612,24 +612,24 @@ fn test_workspaces_updated_by_other() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: mzvwutvl a58c9a9b (empty) (no description set)
Parent commit (@-) : qpvuntsm d4124476 (no description set)
Working copy (@) now at: mzvwutvl 3a9b690d (empty) (no description set)
Parent commit (@-) : qpvuntsm b853f7c8 (no description set)
[EOF]
");
// The secondary workspace's working-copy commit was updated.
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ a58c9a9b19ce default@
│ ○ e82cd4ee8faa secondary@
@ 3a9b690d6e67 default@
│ ○ 90f3d42e0bff secondary@
├─╯
○ d41244767d45
○ b853f7c8b006
◆ 000000000000
[EOF]
");
let output = secondary_dir.run_jj(["st"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: The working copy is stale (not updated since operation c81af45155a2).
Error: The working copy is stale (not updated since operation 09c578c227de).
Hint: Run `jj workspace update-stale` to update it.
See https://jj-vcs.github.io/jj/latest/working-copy/#stale-working-copy for more information.
[EOF]
@@ -640,18 +640,18 @@ fn test_workspaces_updated_by_other() {
let output = secondary_dir.run_jj(["workspace", "update-stale"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Working copy (@) now at: pmmvwywv e82cd4ee (empty) (no description set)
Parent commit (@-) : qpvuntsm d4124476 (no description set)
Working copy (@) now at: pmmvwywv 90f3d42e (empty) (no description set)
Parent commit (@-) : qpvuntsm b853f7c8 (no description set)
Added 0 files, modified 1 files, removed 0 files
Updated working copy to fresh commit e82cd4ee8faa
Updated working copy to fresh commit 90f3d42e0bff
[EOF]
");
insta::assert_snapshot!(get_log_output(&secondary_dir),
@r"
@ e82cd4ee8faa secondary@
│ ○ a58c9a9b19ce default@
@ 90f3d42e0bff secondary@
│ ○ 3a9b690d6e67 default@
├─╯
○ d41244767d45
○ b853f7c8b006
◆ 000000000000
[EOF]
");
@@ -675,10 +675,10 @@ fn test_workspaces_updated_by_other_automatic() {
.success();
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 06b57f44a3ca default@
│ ○ 3224de8ae048 secondary@
@ 393250c59e39 default@
│ ○ 547036666102 secondary@
├─╯
○ 506f4ec3c2c6
○ 9a462e35578a
◆ 000000000000
[EOF]
");
@@ -689,17 +689,17 @@ fn test_workspaces_updated_by_other_automatic() {
insta::assert_snapshot!(output, @r"
------- stderr -------
Rebased 1 descendant commits
Working copy (@) now at: mzvwutvl a58c9a9b (empty) (no description set)
Parent commit (@-) : qpvuntsm d4124476 (no description set)
Working copy (@) now at: mzvwutvl 3a9b690d (empty) (no description set)
Parent commit (@-) : qpvuntsm b853f7c8 (no description set)
[EOF]
");
// The secondary workspace's working-copy commit was updated.
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ a58c9a9b19ce default@
│ ○ e82cd4ee8faa secondary@
@ 3a9b690d6e67 default@
│ ○ 90f3d42e0bff secondary@
├─╯
○ d41244767d45
○ b853f7c8b006
◆ 000000000000
[EOF]
");
@@ -708,23 +708,23 @@ fn test_workspaces_updated_by_other_automatic() {
let output = secondary_dir.run_jj(["st"]);
insta::assert_snapshot!(output, @r"
The working copy has no changes.
Working copy (@) : pmmvwywv e82cd4ee (empty) (no description set)
Parent commit (@-): qpvuntsm d4124476 (no description set)
Working copy (@) : pmmvwywv 90f3d42e (empty) (no description set)
Parent commit (@-): qpvuntsm b853f7c8 (no description set)
[EOF]
------- stderr -------
Working copy (@) now at: pmmvwywv e82cd4ee (empty) (no description set)
Parent commit (@-) : qpvuntsm d4124476 (no description set)
Working copy (@) now at: pmmvwywv 90f3d42e (empty) (no description set)
Parent commit (@-) : qpvuntsm b853f7c8 (no description set)
Added 0 files, modified 1 files, removed 0 files
Updated working copy to fresh commit e82cd4ee8faa
Updated working copy to fresh commit 90f3d42e0bff
[EOF]
");
insta::assert_snapshot!(get_log_output(&secondary_dir),
@r"
@ e82cd4ee8faa secondary@
│ ○ a58c9a9b19ce default@
@ 90f3d42e0bff secondary@
│ ○ 3a9b690d6e67 default@
├─╯
○ d41244767d45
○ b853f7c8b006
◆ 000000000000
[EOF]
");
@@ -779,14 +779,14 @@ fn test_workspaces_current_op_discarded_by_other(automatic: bool) {
]);
insta::allow_duplicates! {
insta::assert_snapshot!(output, @r"
@ 64d9b429d9 abandon commit dc638a7f20571df2c846c84d1469b9fcd0edafc0
○ 129f2dca87 create initial working-copy commit in workspace secondary
○ 1516a7f851 add workspace 'secondary'
○ 19bf99b2b1 new empty commit
○ 38c9c18632 snapshot working copy
○ 5e4f01399f new empty commit
○ 299bc7a187 snapshot working copy
○ eac759b9ab add workspace 'default'
@ e426bb88ce abandon commit de90575a14d8b9198dc0930f9de4a69f846ded36
○ c1d0d40e1f create initial working-copy commit in workspace secondary
○ 5869a42f65 add workspace 'secondary'
○ 72b8205d96 new empty commit
○ 6e671162a7 snapshot working copy
○ 5213f1e3a9 new empty commit
○ b1bf0cc848 snapshot working copy
○ 2affa70252 add workspace 'default'
○ 0000000000
[EOF]
");
@@ -798,10 +798,10 @@ fn test_workspaces_current_op_discarded_by_other(automatic: bool) {
insta::allow_duplicates! {
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 2d02e07ed190 default@
│ ○ 3df3bf89ddf1 secondary@
@ 320bc89effc9 default@
│ ○ 891f00062e10 secondary@
├─╯
○ e734830954d8
○ 367415be5b44
◆ 000000000000
[EOF]
");
@@ -817,12 +817,12 @@ fn test_workspaces_current_op_discarded_by_other(automatic: bool) {
C {modified => added}
D deleted
M modified
Working copy (@) : kmkuslsw 0b518140 RECOVERY COMMIT FROM `jj workspace update-stale`
Parent commit (@-): rzvqmyuk 3df3bf89 (empty) (no description set)
Working copy (@) : kmkuslsw 18851b39 RECOVERY COMMIT FROM `jj workspace update-stale`
Parent commit (@-): rzvqmyuk 891f0006 (empty) (no description set)
[EOF]
------- stderr -------
Failed to read working copy's current operation; attempting recovery. Error message from read attempt: Object 129f2dca870b954e2966fba35893bb47a5bc6358db6e8c4065cee91d2d49073efc3e055b9b81269a13c443d964abb18e83d25de73db2376ff434c876c59976ac of type operation not found
Created and checked out recovery commit 8ed0355c5d31
Failed to read working copy's current operation; attempting recovery. Error message from read attempt: Object c1d0d40e1f9ef1e820a494113c16a66dd3550fe2d1a3231027f4305ad1f85956697de9ffdd2ec1e714a1e6ec419c6369c8a2abf91223b4732358e6929acf5ae8 of type operation not found
Created and checked out recovery commit 866928d1e0fd
[EOF]
");
} else {
@@ -839,19 +839,19 @@ fn test_workspaces_current_op_discarded_by_other(automatic: bool) {
let output = secondary_dir.run_jj(["workspace", "update-stale"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Failed to read working copy's current operation; attempting recovery. Error message from read attempt: Object 129f2dca870b954e2966fba35893bb47a5bc6358db6e8c4065cee91d2d49073efc3e055b9b81269a13c443d964abb18e83d25de73db2376ff434c876c59976ac of type operation not found
Created and checked out recovery commit 8ed0355c5d31
Failed to read working copy's current operation; attempting recovery. Error message from read attempt: Object c1d0d40e1f9ef1e820a494113c16a66dd3550fe2d1a3231027f4305ad1f85956697de9ffdd2ec1e714a1e6ec419c6369c8a2abf91223b4732358e6929acf5ae8 of type operation not found
Created and checked out recovery commit 866928d1e0fd
[EOF]
");
}
insta::allow_duplicates! {
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 2d02e07ed190 default@
│ ○ 0b5181407d03 secondary@
│ ○ 3df3bf89ddf1
@ 320bc89effc9 default@
│ ○ 18851b397d09 secondary@
│ ○ 891f00062e10
├─╯
○ e734830954d8
○ 367415be5b44
◆ 000000000000
[EOF]
");
@@ -874,8 +874,8 @@ fn test_workspaces_current_op_discarded_by_other(automatic: bool) {
C {modified => added}
D deleted
M modified
Working copy (@) : kmkuslsw 0b518140 RECOVERY COMMIT FROM `jj workspace update-stale`
Parent commit (@-): rzvqmyuk 3df3bf89 (empty) (no description set)
Working copy (@) : kmkuslsw 18851b39 RECOVERY COMMIT FROM `jj workspace update-stale`
Parent commit (@-): rzvqmyuk 891f0006 (empty) (no description set)
[EOF]
");
}
@@ -888,9 +888,9 @@ fn test_workspaces_current_op_discarded_by_other(automatic: bool) {
let output = secondary_dir.run_jj(["evolog"]);
insta::allow_duplicates! {
insta::assert_snapshot!(output, @r"
@ kmkuslsw test.user@example.com 2001-02-03 08:05:18 secondary@ 0b518140
@ kmkuslsw test.user@example.com 2001-02-03 08:05:18 secondary@ 18851b39
│ RECOVERY COMMIT FROM `jj workspace update-stale`
○ kmkuslsw hidden test.user@example.com 2001-02-03 08:05:18 8ed0355c
○ kmkuslsw hidden test.user@example.com 2001-02-03 08:05:18 866928d1
(empty) RECOVERY COMMIT FROM `jj workspace update-stale`
[EOF]
");
@@ -956,11 +956,11 @@ fn test_workspaces_update_stale_snapshot() {
");
insta::assert_snapshot!(get_log_output(&secondary_dir), @r"
@ e672fd8fefac secondary@
│ ○ ea37b073f5ab default@
│ ○ b13c81dedc64
@ 35d779b3baea secondary@
│ ○ c9516583d53b default@
│ ○ f6ae7810ef56
├─╯
○ e6e9989f1179
○ 7d5738ba9943
◆ 000000000000
[EOF]
");
@@ -985,7 +985,7 @@ fn test_workspaces_forget() {
// When listing workspaces, only the secondary workspace shows up
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
secondary: pmmvwywv 18463f43 (empty) (no description set)
secondary: pmmvwywv 31da1455 (empty) (no description set)
[EOF]
");
@@ -1001,8 +1001,8 @@ fn test_workspaces_forget() {
// there's only one workspace. We should show it when the command is not run
// from that workspace.
insta::assert_snapshot!(get_log_output(&main_dir), @r"
○ 18463f438cc9
○ 4e8f9d2be039
○ 31da14559558
○ 006bd1130b84
◆ 000000000000
[EOF]
");
@@ -1051,9 +1051,9 @@ fn test_workspaces_forget_multi_transaction() {
// there should be three workspaces
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz 909d51b1 (empty) (no description set)
second: pmmvwywv 18463f43 (empty) (no description set)
third: rzvqmyuk cc383fa2 (empty) (no description set)
default: rlvkpnrz f6bf8819 (empty) (no description set)
second: pmmvwywv 31da1455 (empty) (no description set)
third: rzvqmyuk bf5b5b4d (empty) (no description set)
[EOF]
");
@@ -1063,14 +1063,14 @@ fn test_workspaces_forget_multi_transaction() {
.success();
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz 909d51b1 (empty) (no description set)
default: rlvkpnrz f6bf8819 (empty) (no description set)
[EOF]
");
// the op log should have multiple workspaces forgotten in a single tx
let output = main_dir.run_jj(["op", "log", "--limit", "1"]);
insta::assert_snapshot!(output, @r"
@ 60b2b5a71a84 test-username@host.example.com 2001-02-03 04:05:12.000 +07:00 - 2001-02-03 04:05:12.000 +07:00
@ ccedd4f34298 test-username@host.example.com 2001-02-03 04:05:12.000 +07:00 - 2001-02-03 04:05:12.000 +07:00
│ forget workspaces second, third
│ args: jj workspace forget second third
[EOF]
@@ -1082,9 +1082,9 @@ fn test_workspaces_forget_multi_transaction() {
// finally, there should be three workspaces at the end
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: rlvkpnrz 909d51b1 (empty) (no description set)
second: pmmvwywv 18463f43 (empty) (no description set)
third: rzvqmyuk cc383fa2 (empty) (no description set)
default: rlvkpnrz f6bf8819 (empty) (no description set)
second: pmmvwywv 31da1455 (empty) (no description set)
third: rzvqmyuk bf5b5b4d (empty) (no description set)
[EOF]
");
}
@@ -1108,15 +1108,15 @@ fn test_workspaces_forget_abandon_commits() {
// there should be four workspaces, three of which are at the same empty commit
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: qpvuntsm 4e8f9d2b (no description set)
fourth: uuqppmxq 57d63245 (empty) (no description set)
second: uuqppmxq 57d63245 (empty) (no description set)
third: uuqppmxq 57d63245 (empty) (no description set)
default: qpvuntsm 006bd113 (no description set)
fourth: uuqppmxq 94f41578 (empty) (no description set)
second: uuqppmxq 94f41578 (empty) (no description set)
third: uuqppmxq 94f41578 (empty) (no description set)
[EOF]
");
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 4e8f9d2be039 default@
│ ○ 57d63245a308 fourth@ second@ third@
@ 006bd1130b84 default@
│ ○ 94f41578a9e1 fourth@ second@ third@
├─╯
◆ 000000000000
[EOF]
@@ -1127,8 +1127,8 @@ fn test_workspaces_forget_abandon_commits() {
.run_jj(["workspace", "forget", "default"])
.success();
insta::assert_snapshot!(get_log_output(&main_dir), @r"
○ 57d63245a308 fourth@ second@ third@
│ ○ 4e8f9d2be039
○ 94f41578a9e1 fourth@ second@ third@
│ ○ 006bd1130b84
├─╯
◆ 000000000000
[EOF]
@@ -1138,8 +1138,8 @@ fn test_workspaces_forget_abandon_commits() {
// still have commit checked out)
main_dir.run_jj(["workspace", "forget", "second"]).success();
insta::assert_snapshot!(get_log_output(&main_dir), @r"
○ 57d63245a308 fourth@ third@
│ ○ 4e8f9d2be039
○ 94f41578a9e1 fourth@ third@
│ ○ 006bd1130b84
├─╯
◆ 000000000000
[EOF]
@@ -1151,7 +1151,7 @@ fn test_workspaces_forget_abandon_commits() {
.run_jj(["workspace", "forget", "third", "fourth"])
.success();
insta::assert_snapshot!(get_log_output(&main_dir), @r"
○ 4e8f9d2be039
○ 006bd1130b84
◆ 000000000000
[EOF]
");
@@ -1180,15 +1180,15 @@ fn test_list_workspaces_template() {
// "current_working_copy" should point to the workspace we operate on
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: 8183d0fcaa4c (current)
second: 0a77a39d7d6f
default: 504e3d8c1bcd (current)
second: 058f604dffcd
[EOF]
");
let output = secondary_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: 8183d0fcaa4c
second: 0a77a39d7d6f (current)
default: 504e3d8c1bcd
second: 058f604dffcd (current)
[EOF]
");
}
@@ -1239,10 +1239,10 @@ fn test_debug_snapshot() {
work_dir.run_jj(["debug", "snapshot"]).success();
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(output, @r"
@ c55ebc67e3db test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
@ 05a77f06d585 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
│ snapshot working copy
│ args: jj debug snapshot
○ eac759b9ab75 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
○ 2affa7025254 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
│ add workspace 'default'
○ 000000000000 root()
[EOF]
@@ -1250,13 +1250,13 @@ fn test_debug_snapshot() {
work_dir.run_jj(["describe", "-m", "initial"]).success();
let output = work_dir.run_jj(["op", "log"]);
insta::assert_snapshot!(output, @r"
@ c9a40b951848 test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
│ describe commit 4e8f9d2be039994f589b4e57ac5e9488703e604d
@ 2c73e89e3beb test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
│ describe commit 006bd1130b84e90ab082adeabd7409270d5a86da
│ args: jj describe -m initial
○ c55ebc67e3db test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
○ 05a77f06d585 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
│ snapshot working copy
│ args: jj debug snapshot
○ eac759b9ab75 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
○ 2affa7025254 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
│ add workspace 'default'
○ 000000000000 root()
[EOF]
@@ -1326,8 +1326,8 @@ fn test_workspaces_rename_workspace() {
// Both workspaces show up when we list them
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: qpvuntsm 230dd059 (empty) (no description set)
second: uuqppmxq 57d63245 (empty) (no description set)
default: qpvuntsm e8849ae1 (empty) (no description set)
second: uuqppmxq 94f41578 (empty) (no description set)
[EOF]
");
@@ -1336,22 +1336,22 @@ fn test_workspaces_rename_workspace() {
let output = main_dir.run_jj(["workspace", "list"]);
insta::assert_snapshot!(output, @r"
default: qpvuntsm 230dd059 (empty) (no description set)
third: uuqppmxq 57d63245 (empty) (no description set)
default: qpvuntsm e8849ae1 (empty) (no description set)
third: uuqppmxq 94f41578 (empty) (no description set)
[EOF]
");
// Can see the working-copy commit in each workspace in the log output.
insta::assert_snapshot!(get_log_output(&main_dir), @r"
@ 230dd059e1b0 default@
│ ○ 57d63245a308 third@
@ e8849ae12c70 default@
│ ○ 94f41578a9e1 third@
├─╯
◆ 000000000000
[EOF]
");
insta::assert_snapshot!(get_log_output(&secondary_dir), @r"
@ 57d63245a308 third@
│ ○ 230dd059e1b0 default@
@ 94f41578a9e1 third@
│ ○ e8849ae12c70 default@
├─╯
◆ 000000000000
[EOF]

2
lib/src/config/misc.toml
View File

@@ -13,7 +13,7 @@ register-snapshot-trigger = false
abandon-unreachable-commits = true
auto-local-bookmark = false
executable-path = "git"
write-change-id-header = false
write-change-id-header = true
[operation]
hostname = ""

18
lib/src/git_backend.rs
View File

@@ -1574,8 +1574,6 @@ mod tests {
use pollster::FutureExt as _;
use super::*;
use crate::config::ConfigLayer;
use crate::config::ConfigSource;
use crate::config::StackedConfig;
use crate::content_hash::blake2b_hash;
use crate::tests::new_temp_dir;
@@ -1877,7 +1875,7 @@ mod tests {
#[test]
fn round_trip_change_id_via_git_header() {
let settings = user_settings_with_change_id();
let settings = user_settings();
let temp_dir = new_temp_dir();
let store_path = temp_dir.path().join("store");
@@ -2313,8 +2311,9 @@ mod tests {
tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
author Someone <someone@example.com> 0 +0000
committer Someone <someone@example.com> 0 +0000
change-id xpxpxpxpxpxpxpxpxpxpxpxpxpxpxpxp
gpgsig test sig
hash=9ad9526c3b2103c41a229f2f3c82d107a0ecd902f476a855f0e1dd5f7bef1430663de12749b73e293a877113895a8a2a0f29da4bbc5a5f9a19c3523fb0e53518
hash=03feb0caccbacce2e7b7bca67f4c82292dd487e669ed8a813120c9f82d3fd0801420a1f5d05e1393abfe4e9fc662399ec4a9a1898c5f1e547e0044a52bd4bd29
initial
");
@@ -2328,12 +2327,13 @@ mod tests {
insta::assert_snapshot!(std::str::from_utf8(&sig.sig).unwrap(), @r"
test sig
hash=9ad9526c3b2103c41a229f2f3c82d107a0ecd902f476a855f0e1dd5f7bef1430663de12749b73e293a877113895a8a2a0f29da4bbc5a5f9a19c3523fb0e53518
hash=03feb0caccbacce2e7b7bca67f4c82292dd487e669ed8a813120c9f82d3fd0801420a1f5d05e1393abfe4e9fc662399ec4a9a1898c5f1e547e0044a52bd4bd29
");
insta::assert_snapshot!(std::str::from_utf8(&sig.data).unwrap(), @r"
tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
author Someone <someone@example.com> 0 +0000
committer Someone <someone@example.com> 0 +0000
change-id xpxpxpxpxpxpxpxpxpxpxpxpxpxpxpxp
initial
");
@@ -2362,12 +2362,4 @@ mod tests {
let config = StackedConfig::with_defaults();
UserSettings::from_config(config).unwrap()
}
fn user_settings_with_change_id() -> UserSettings {
let mut config = StackedConfig::with_defaults();
let mut layer = ConfigLayer::empty(ConfigSource::Default);
layer.set_value("git.write-change-id-header", true).unwrap();
config.add_layer(layer);
UserSettings::from_config(config).unwrap()
}
}

2
lib/src/settings.rs
View File

@@ -82,7 +82,7 @@ impl Default for GitSettings {
auto_local_bookmark: false,
abandon_unreachable_commits: true,
executable_path: PathBuf::from("git"),
write_change_id_header: false,
write_change_id_header: true,
}
}
}

29
lib/tests/test_git.rs
View File

@@ -36,6 +36,8 @@ use jj_lib::backend::Timestamp;
use jj_lib::backend::TreeValue;
use jj_lib::commit::Commit;
use jj_lib::commit_builder::CommitBuilder;
use jj_lib::config::ConfigLayer;
use jj_lib::config::ConfigSource;
use jj_lib::git;
use jj_lib::git::FailedRefExportReason;
use jj_lib::git::GitBranchPushTargets;
@@ -72,6 +74,7 @@ use maplit::btreemap;
use maplit::hashset;
use tempfile::TempDir;
use test_case::test_case;
use testutils::base_user_config;
use testutils::commit_transactions;
use testutils::create_random_commit;
use testutils::repo_path;
@@ -3830,8 +3833,14 @@ fn test_bulk_update_extra_on_import_refs() {
#[test]
fn test_rewrite_imported_commit() {
let git_settings = GitSettings::default();
let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git);
let git_settings = jj_lib::settings::GitSettings {
write_change_id_header: false,
..Default::default()
};
let test_repo = TestRepo::init_with_backend_and_settings(
TestRepoBackend::Git,
&user_settings_without_change_id(),
);
let repo = &test_repo.repo;
let git_repo = get_git_repo(repo);
@@ -3942,7 +3951,7 @@ fn test_concurrent_write_commit() {
#[test]
fn test_concurrent_read_write_commit() {
let settings = &testutils::user_settings();
let settings = user_settings_without_change_id();
let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git);
let test_env = &test_repo.env;
let repo = &test_repo.repo;
@@ -3978,7 +3987,7 @@ fn test_concurrent_read_write_commit() {
// Writer assigns random change id
for (i, commit_id) in commit_ids.iter().enumerate() {
let repo = test_env.load_repo_at_head(settings, test_repo.repo_path()); // unshare loader
let repo = test_env.load_repo_at_head(&settings, test_repo.repo_path()); // unshare loader
let barrier = barrier.clone();
s.spawn(move || {
barrier.wait();
@@ -3994,7 +4003,7 @@ fn test_concurrent_read_write_commit() {
// Reader may generate change id (if not yet assigned by the writer)
for i in 0..num_reader_thread {
let mut repo = test_env.load_repo_at_head(settings, test_repo.repo_path()); // unshare loader
let mut repo = test_env.load_repo_at_head(&settings, test_repo.repo_path()); // unshare loader
let barrier = barrier.clone();
let mut pending_commit_ids = commit_ids.clone();
pending_commit_ids.rotate_left(i); // start lookup from different place
@@ -4265,3 +4274,13 @@ fn test_remote_rename_refs() {
commit_foobar_a,
);
}
fn user_settings_without_change_id() -> UserSettings {
let mut config = base_user_config();
let mut layer = ConfigLayer::empty(ConfigSource::Default);
layer
.set_value("git.write-change-id-header", false)
.unwrap();
config.add_layer(layer);
UserSettings::from_config(config).unwrap()
}

122
lib/tests/test_id_prefix.rs
View File

@@ -67,32 +67,32 @@ fn test_id_prefix() {
.sorted()
.join("\n");
insta::assert_snapshot!(commit_prefixes, @r"
11a 5
214 24
2a6 2
33e 14
3be 16
3ea 18
593 20
5d3 1
5f6 13
676 3
7b6 25
7da 9
81c 10
87e 12
997 21
9f7 22
a0e 4
a55 19
ac4 23
c18 17
ce9 0
d42 6
d9d 8
eec 15
efe 7
fa3 11
0c8 9
18f 7
19a 10
37a 13
3b4 21
3c0 1
4ee 16
51f 4
56e 14
711 17
761 3
7b1 11
7c6 24
7f4 8
846 23
8d7 25
960 15
a30 12
b51 19
b97 22
b9d 5
bb4 2
c3a 18
c47 0
d3c 6
d54 20
");
let change_prefixes = commits
.iter()
@@ -136,31 +136,31 @@ fn test_id_prefix() {
let context = IdPrefixContext::default();
let index = context.populate(repo.as_ref()).unwrap();
assert_eq!(
index.shortest_commit_prefix_len(repo.as_ref(), commits[2].id()),
index.shortest_commit_prefix_len(repo.as_ref(), commits[7].id()),
2
);
assert_eq!(
index.shortest_commit_prefix_len(repo.as_ref(), commits[5].id()),
index.shortest_commit_prefix_len(repo.as_ref(), commits[16].id()),
1
);
assert_eq!(
index.resolve_commit_prefix(repo.as_ref(), &prefix("2")),
index.resolve_commit_prefix(repo.as_ref(), &prefix("1")),
AmbiguousMatch
);
assert_eq!(
index.resolve_commit_prefix(repo.as_ref(), &prefix("2a")),
SingleMatch(commits[2].id().clone())
index.resolve_commit_prefix(repo.as_ref(), &prefix("18")),
SingleMatch(commits[7].id().clone())
);
assert_eq!(
index.resolve_commit_prefix(repo.as_ref(), &prefix("20")),
index.resolve_commit_prefix(repo.as_ref(), &prefix("10")),
NoMatch
);
assert_eq!(
index.resolve_commit_prefix(repo.as_ref(), &prefix("2a0")),
index.resolve_commit_prefix(repo.as_ref(), &prefix("180")),
NoMatch
);
assert_eq!(
index.shortest_change_prefix_len(repo.as_ref(), commits[0].change_id()),
index.shortest_change_prefix_len(repo.as_ref(), commits[2].change_id()),
2
);
assert_eq!(
@@ -168,50 +168,50 @@ fn test_id_prefix() {
1
);
assert_eq!(
index.resolve_change_prefix(repo.as_ref(), &prefix("7")),
index.resolve_change_prefix(repo.as_ref(), &prefix("4")),
AmbiguousMatch
);
assert_eq!(
index.resolve_change_prefix(repo.as_ref(), &prefix("78")),
SingleMatch(vec![commits[0].id().clone()])
index.resolve_change_prefix(repo.as_ref(), &prefix("43")),
SingleMatch(vec![commits[2].id().clone()])
);
assert_eq!(
index.resolve_change_prefix(repo.as_ref(), &prefix("70")),
index.resolve_change_prefix(repo.as_ref(), &prefix("40")),
NoMatch
);
assert_eq!(
index.resolve_change_prefix(repo.as_ref(), &prefix("780")),
index.resolve_change_prefix(repo.as_ref(), &prefix("430")),
NoMatch
);
// Disambiguate within a revset
// ---------------------------------------------------------------------------------------------
let expression =
RevsetExpression::commits(vec![commits[0].id().clone(), commits[2].id().clone()]);
RevsetExpression::commits(vec![commits[7].id().clone(), commits[2].id().clone()]);
let context = context.disambiguate_within(expression);
let index = context.populate(repo.as_ref()).unwrap();
// The prefix is now shorter
assert_eq!(
index.shortest_commit_prefix_len(repo.as_ref(), commits[2].id()),
index.shortest_commit_prefix_len(repo.as_ref(), commits[7].id()),
1
);
// Shorter prefix within the set can be used
assert_eq!(
index.resolve_commit_prefix(repo.as_ref(), &prefix("2")),
SingleMatch(commits[2].id().clone())
index.resolve_commit_prefix(repo.as_ref(), &prefix("1")),
SingleMatch(commits[7].id().clone())
);
// Can still resolve commits outside the set
assert_eq!(
index.resolve_commit_prefix(repo.as_ref(), &prefix("21")),
SingleMatch(commits[24].id().clone())
index.resolve_commit_prefix(repo.as_ref(), &prefix("19")),
SingleMatch(commits[10].id().clone())
);
assert_eq!(
index.shortest_change_prefix_len(repo.as_ref(), commits[0].change_id()),
index.shortest_change_prefix_len(repo.as_ref(), commits[2].change_id()),
1
);
assert_eq!(
index.resolve_change_prefix(repo.as_ref(), &prefix("7")),
SingleMatch(vec![commits[0].id().clone()])
index.resolve_change_prefix(repo.as_ref(), &prefix("4")),
SingleMatch(vec![commits[2].id().clone()])
);
// Single commit in revset. Length 0 is unambiguous, but we pretend 1 digit is
@@ -311,9 +311,9 @@ fn test_id_prefix_divergent() {
.map(|(i, commit)| format!("{} {}", &commit.id().hex()[..4], i))
.join("\n");
insta::assert_snapshot!(commit_prefixes, @r"
eafa 0
d48d 1
2fbb 2
e2b9 0
f8d1 1
c596 2
");
let prefix = |x| HexPrefix::new(x).unwrap();
@@ -424,16 +424,16 @@ fn test_id_prefix_hidden() {
.sorted()
.join("\n");
insta::assert_snapshot!(commit_prefixes, @r"
15e 9
397 6
53c 7
62e 2
648 8
7c7 3
853 4
c0a 5
ce9 0
f10 1
3ae 6
64c 5
84e 2
906 8
912 7
9d1 3
a6b 1
c47 0
d9b 4
f5f 9
");
let change_prefixes = commits
.iter()

42
lib/tests/test_revset.rs
View File

@@ -153,13 +153,13 @@ fn test_resolve_symbol_commit_id() {
};
let mut commits = vec![];
for i in &[1, 167, 895] {
for i in [156, 268, 869] {
let commit = mut_repo
.new_commit(
vec![repo.store().root_commit_id().clone()],
repo.store().empty_merged_tree_id(),
)
// An arbitrary change id that doesn't start with "04"
// An arbitrary change id that doesn't start with "01"
.set_change_id(ChangeId::from_hex("781199f9d55d18e855a7aa84c5e4b40d"))
.set_description(format!("test {i}"))
.set_author(signature.clone())
@@ -172,37 +172,37 @@ fn test_resolve_symbol_commit_id() {
// Test the test setup
insta::assert_snapshot!(commits.iter().map(|c| c.id().hex()).join("\n"), @r"
0454de3cae04c46cda37ba2e8873b4c17ff51dcb
045f56cd1b17e8abde86771e2705395dcde6a957
0468f7da8de2ce442f512aacf83411d26cd2e0cf
019f179b4479a4f3d1373b772866037929e4f63c
019fd357eb2a4904c348b62d1f4cc2ac222cdbc7
017dc442a1d77bb1620a1a32863580ae81543d7d
");
// Test lookup by full commit id
assert_eq!(
resolve_symbol(repo.as_ref(), "0454de3cae04c46cda37ba2e8873b4c17ff51dcb",).unwrap(),
resolve_symbol(repo.as_ref(), "019f179b4479a4f3d1373b772866037929e4f63c",).unwrap(),
vec![commits[0].id().clone()]
);
assert_eq!(
resolve_symbol(repo.as_ref(), "045f56cd1b17e8abde86771e2705395dcde6a957",).unwrap(),
resolve_symbol(repo.as_ref(), "019fd357eb2a4904c348b62d1f4cc2ac222cdbc7",).unwrap(),
vec![commits[1].id().clone()]
);
assert_eq!(
resolve_symbol(repo.as_ref(), "0468f7da8de2ce442f512aacf83411d26cd2e0cf",).unwrap(),
resolve_symbol(repo.as_ref(), "017dc442a1d77bb1620a1a32863580ae81543d7d",).unwrap(),
vec![commits[2].id().clone()]
);
// Test commit id prefix
assert_eq!(
resolve_symbol(repo.as_ref(), "046").unwrap(),
resolve_symbol(repo.as_ref(), "017").unwrap(),
vec![commits[2].id().clone()]
);
assert_matches!(
resolve_symbol(repo.as_ref(), "04"),
Err(RevsetResolutionError::AmbiguousCommitIdPrefix(s)) if s == "04"
resolve_symbol(repo.as_ref(), "01"),
Err(RevsetResolutionError::AmbiguousCommitIdPrefix(s)) if s == "01"
);
assert_matches!(
resolve_symbol(repo.as_ref(), "040"),
Err(RevsetResolutionError::NoSuchRevision{name, candidates}) if name == "040" && candidates.is_empty()
resolve_symbol(repo.as_ref(), "010"),
Err(RevsetResolutionError::NoSuchRevision{name, candidates}) if name == "010" && candidates.is_empty()
);
// Test non-hex string
@@ -226,12 +226,12 @@ fn test_resolve_symbol_commit_id() {
workspace: None,
};
assert_matches!(
parse(&mut RevsetDiagnostics::new(), "present(04)", &context).unwrap()
parse(&mut RevsetDiagnostics::new(), "present(01)", &context).unwrap()
.resolve_user_expression(repo.as_ref(), &symbol_resolver),
Err(RevsetResolutionError::AmbiguousCommitIdPrefix(s)) if s == "04"
Err(RevsetResolutionError::AmbiguousCommitIdPrefix(s)) if s == "01"
);
assert_eq!(
resolve_commit_ids(repo.as_ref(), "present(046)"),
resolve_commit_ids(repo.as_ref(), "present(017)"),
vec![commits[2].id().clone()]
);
}
@@ -274,7 +274,7 @@ fn test_resolve_symbol_change_id(readonly: bool) {
.map(ChangeId::from_hex);
let mut commits = vec![];
let mut tx = repo.start_transaction();
for (i, change_id) in iter::zip([0, 1, 2, 5085], change_ids) {
for (i, change_id) in iter::zip([0, 1, 2, 5359], change_ids) {
let commit = tx
.repo_mut()
.new_commit(vec![root_commit_id.clone()], empty_tree_id.clone())
@@ -291,10 +291,10 @@ fn test_resolve_symbol_change_id(readonly: bool) {
insta::allow_duplicates! {
insta::assert_snapshot!(
commits.iter().map(|c| format!("{} {}\n", c.id(), c.change_id())).join(""), @r"
eaf7e54ceef15f0c5c985c725e7383d6e802a101 zvlyxpuvtsoopsqzlkorrpqrszrqvlnx
1e3c39cd4a83ddc116951ea7e43a56b3a30cad17 zvzowopwpuymrlmonvnuruunomzqmlsy
f1ca35ab1a9a0153416f730b86ff969b5df542cc zvlynszrxlvlwvkwkwsymrpypvtsszor
040031cb4ad0cbc3287914f1d205dabf4a7eb889 qyymsluxkmuopzvorkxrqlyvnwmwzoux
cd741d7f2c542e443df3c5bf2d4f8a15a2759e77 zvlyxpuvtsoopsqzlkorrpqrszrqvlnx
0af32dcddbdf49c132ad39c3623a6196c6c987a5 zvzowopwpuymrlmonvnuruunomzqmlsy
553ee869e64329d1022f5c00c63dff6621924c18 zvlynszrxlvlwvkwkwsymrpypvtsszor
0407d5eb08231b546a42518a50a835f17282eaef qyymsluxkmuopzvorkxrqlyvnwmwzoux
");
}