cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-05 23:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

cli: Print @ and @- in status and print_updated_working_copy_stats

Browse Source 
This helps newcomers learn/remember what @ and @- stand for.
This commit is contained in:
Robin Stocker 2025-03-29 17:23:55 +11:00
parent 2d9c72ffb1
commit 0456701e18
40 changed files with 885 additions and 884 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/src/cli_util.rs
View File

@ -2039,13 +2039,13 @@ See https://jj-vcs.github.io/jj/latest/working-copy/#stale-working-copy \
if Some(new_commit) != maybe_old_commit { if Some(new_commit) != maybe_old_commit {
if let Some(mut formatter) = ui.status_formatter() { if let Some(mut formatter) = ui.status_formatter() {
let template = self.commit_summary_template(); let template = self.commit_summary_template();
write!(formatter, "Working copy now at: ")?; write!(formatter, "Working copy (@) now at: ")?;
formatter.with_label("working_copy", |fmt| template.format(new_commit, fmt))?; formatter.with_label("working_copy", |fmt| template.format(new_commit, fmt))?;
writeln!(formatter)?; writeln!(formatter)?;
for parent in new_commit.parents() { for parent in new_commit.parents() {
let parent = parent?; let parent = parent?;
// "Working copy now at: " // "Working copy (@) now at: "
write!(formatter, "Parent commit : ")?; write!(formatter, "Parent commit (@-) : ")?;
template.format(&parent, formatter.as_mut())?; template.format(&parent, formatter.as_mut())?;
writeln!(formatter)?; writeln!(formatter)?;
} }

5
cli/src/commands/status.rs
View File

@ -113,12 +113,13 @@ pub(crate) fn cmd_status(
} }
let template = workspace_command.commit_summary_template(); let template = workspace_command.commit_summary_template();
write!(formatter, "Working copy : ")?; write!(formatter, "Working copy (@) : ")?;
formatter.with_label("working_copy", |fmt| template.format(wc_commit, fmt))?; formatter.with_label("working_copy", |fmt| template.format(wc_commit, fmt))?;
writeln!(formatter)?; writeln!(formatter)?;
for parent in wc_commit.parents() { for parent in wc_commit.parents() {
let parent = parent?; let parent = parent?;
write!(formatter, "Parent commit: ")?; // "Working copy (@) : "
write!(formatter, "Parent commit (@-): ")?;
template.format(&parent, formatter)?; template.format(&parent, formatter)?;
writeln!(formatter)?; writeln!(formatter)?;
} }

58
cli/tests/test_abandon_command.rs
View File

@ -48,9 +48,9 @@ fn test_basics() {
Abandoned 1 commits: Abandoned 1 commits:
vruxwmqv b7c62f28 d | d vruxwmqv b7c62f28 d | d
Rebased 1 descendant commits onto parents of abandoned commits Rebased 1 descendant commits onto parents of abandoned commits
Working copy now at: znkkpsqq 11a2e10e e | e Working copy (@) now at: znkkpsqq 11a2e10e e | e
Parent commit : rlvkpnrz 2443ea76 a | a Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Parent commit : royxmykx fe2e8e8b c d | c Parent commit (@-) : royxmykx fe2e8e8b c d | c
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -72,9 +72,9 @@ fn test_basics() {
------- stderr ------- ------- stderr -------
Abandoned 1 commits: Abandoned 1 commits:
znkkpsqq 5557ece3 e | e znkkpsqq 5557ece3 e | e
Working copy now at: nkmrtpmo d4f8ea73 (empty) (no description set) Working copy (@) now at: nkmrtpmo d4f8ea73 (empty) (no description set)
Parent commit : rlvkpnrz 2443ea76 a e?? | a Parent commit (@-) : rlvkpnrz 2443ea76 a e?? | a
Parent commit : vruxwmqv b7c62f28 d e?? | d Parent commit (@-) : vruxwmqv b7c62f28 d e?? | d
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -99,9 +99,9 @@ fn test_basics() {
znkkpsqq 5557ece3 e | e znkkpsqq 5557ece3 e | e
vruxwmqv b7c62f28 d | d vruxwmqv b7c62f28 d | d
Deleted bookmarks: d, e Deleted bookmarks: d, e
Working copy now at: xtnwkqum fa4ee8e6 (empty) (no description set) Working copy (@) now at: xtnwkqum fa4ee8e6 (empty) (no description set)
Parent commit : rlvkpnrz 2443ea76 a | a Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Parent commit : royxmykx fe2e8e8b c | c Parent commit (@-) : royxmykx fe2e8e8b c | c
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -147,9 +147,9 @@ fn test_basics() {
znkkpsqq 5557ece3 e | e znkkpsqq 5557ece3 e | e
vruxwmqv b7c62f28 d | d vruxwmqv b7c62f28 d | d
Deleted bookmarks: d, e Deleted bookmarks: d, e
Working copy now at: xlzxqlsl 14991aec (empty) (no description set) Working copy (@) now at: xlzxqlsl 14991aec (empty) (no description set)
Parent commit : rlvkpnrz 2443ea76 a | a Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Parent commit : royxmykx fe2e8e8b c | c Parent commit (@-) : royxmykx fe2e8e8b c | c
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -199,8 +199,8 @@ fn test_abandon_many() {
kkmpptxz 5fc5f374 (empty) commit1 kkmpptxz 5fc5f374 (empty) commit1
rlvkpnrz 9451b4ea (empty) commit0 rlvkpnrz 9451b4ea (empty) commit0
... ...
Working copy now at: kmkuslsw 822a2cf5 (empty) (no description set) Working copy (@) now at: kmkuslsw 822a2cf5 (empty) (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
} }
@ -244,8 +244,8 @@ fn test_bug_2600() {
zsuskuln 73c929fc base | base zsuskuln 73c929fc base | base
Deleted bookmarks: base Deleted bookmarks: base
Rebased 3 descendant commits onto parents of abandoned commits Rebased 3 descendant commits onto parents of abandoned commits
Working copy now at: znkkpsqq 86e31bec c | c Working copy (@) now at: znkkpsqq 86e31bec c | c
Parent commit : vruxwmqv fd6eb121 b | b Parent commit (@-) : vruxwmqv fd6eb121 b | b
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -270,8 +270,8 @@ fn test_bug_2600() {
royxmykx 98f3b9ba a | a royxmykx 98f3b9ba a | a
Deleted bookmarks: a Deleted bookmarks: a
Rebased 2 descendant commits onto parents of abandoned commits Rebased 2 descendant commits onto parents of abandoned commits
Working copy now at: znkkpsqq 683b9435 c | c Working copy (@) now at: znkkpsqq 683b9435 c | c
Parent commit : vruxwmqv c10cb7b4 b | b Parent commit (@-) : vruxwmqv c10cb7b4 b | b
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -295,9 +295,9 @@ fn test_bug_2600() {
vruxwmqv 8c0dced0 b | b vruxwmqv 8c0dced0 b | b
Deleted bookmarks: b Deleted bookmarks: b
Rebased 1 descendant commits onto parents of abandoned commits Rebased 1 descendant commits onto parents of abandoned commits
Working copy now at: znkkpsqq 33a94991 c | c Working copy (@) now at: znkkpsqq 33a94991 c | c
Parent commit : zsuskuln 73c929fc base | base Parent commit (@-) : zsuskuln 73c929fc base | base
Parent commit : royxmykx 98f3b9ba a | a Parent commit (@-) : royxmykx 98f3b9ba a | a
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -333,8 +333,8 @@ fn test_bug_2600() {
vruxwmqv 8c0dced0 b | b vruxwmqv 8c0dced0 b | b
royxmykx 98f3b9ba a | a royxmykx 98f3b9ba a | a
Rebased 1 descendant commits onto parents of abandoned commits Rebased 1 descendant commits onto parents of abandoned commits
Working copy now at: znkkpsqq 84fac1f8 c | c Working copy (@) now at: znkkpsqq 84fac1f8 c | c
Parent commit : zsuskuln 73c929fc a b base | base Parent commit (@-) : zsuskuln 73c929fc a b base | base
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -414,8 +414,8 @@ fn test_double_abandon() {
Abandoned 1 commits: Abandoned 1 commits:
rlvkpnrz 2443ea76 a | a rlvkpnrz 2443ea76 a | a
Deleted bookmarks: a Deleted bookmarks: a
Working copy now at: royxmykx f37b4afd (empty) (no description set) Working copy (@) now at: royxmykx f37b4afd (empty) (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -448,8 +448,8 @@ fn test_abandon_restore_descendants() {
Abandoned 1 commits: Abandoned 1 commits:
rlvkpnrz 225adef1 (no description set) rlvkpnrz 225adef1 (no description set)
Rebased 1 descendant commits (while preserving their content) onto parents of abandoned commits Rebased 1 descendant commits (while preserving their content) onto parents of abandoned commits
Working copy now at: kkmpptxz a734deb0 (no description set) Working copy (@) now at: kkmpptxz a734deb0 (no description set)
Parent commit : qpvuntsm 485d52a9 (no description set) Parent commit (@-) : qpvuntsm 485d52a9 (no description set)
[EOF] [EOF]
"); ");
let output = work_dir.run_jj(["diff", "--git"]); let output = work_dir.run_jj(["diff", "--git"]);
@ -517,8 +517,8 @@ fn test_abandon_tracking_bookmarks() {
Abandoned 1 commits: Abandoned 1 commits:
zsuskuln f652c321 bar | (empty) (no description set) zsuskuln f652c321 bar | (empty) (no description set)
Deleted bookmarks: bar Deleted bookmarks: bar
Working copy now at: vruxwmqv 41658cf4 (empty) (no description set) Working copy (@) now at: vruxwmqv 41658cf4 (empty) (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
} }

68
cli/tests/test_absorb_command.rs
View File

@ -48,8 +48,8 @@ fn test_absorb_simple() {
Absorbed changes into 2 revisions: Absorbed changes into 2 revisions:
zsuskuln 3027ca7a 2 zsuskuln 3027ca7a 2
kkmpptxz d0f1e8dd 1 kkmpptxz d0f1e8dd 1
Working copy now at: yqosqzyt 277bed24 (empty) (no description set) Working copy (@) now at: yqosqzyt 277bed24 (empty) (no description set)
Parent commit : zsuskuln 3027ca7a 2 Parent commit (@-) : zsuskuln 3027ca7a 2
[EOF] [EOF]
"); ");
@ -61,8 +61,8 @@ fn test_absorb_simple() {
Absorbed changes into 1 revisions: Absorbed changes into 1 revisions:
kkmpptxz d366d92c 1 kkmpptxz d366d92c 1
Rebased 1 descendant commits. Rebased 1 descendant commits.
Working copy now at: vruxwmqv 32eb72fe (empty) (no description set) Working copy (@) now at: vruxwmqv 32eb72fe (empty) (no description set)
Parent commit : zsuskuln 5bf0bc06 2 Parent commit (@-) : zsuskuln 5bf0bc06 2
[EOF] [EOF]
"); ");
@ -73,8 +73,8 @@ fn test_absorb_simple() {
------- stderr ------- ------- stderr -------
Absorbed changes into 1 revisions: Absorbed changes into 1 revisions:
zsuskuln 6e2c4777 2 zsuskuln 6e2c4777 2
Working copy now at: yostqsxw 4a48490c (empty) (no description set) Working copy (@) now at: yostqsxw 4a48490c (empty) (no description set)
Parent commit : zsuskuln 6e2c4777 2 Parent commit (@-) : zsuskuln 6e2c4777 2
[EOF] [EOF]
"); ");
@ -178,8 +178,8 @@ fn test_absorb_replace_single_line_hunk() {
Absorbed changes into 1 revisions: Absorbed changes into 1 revisions:
qpvuntsm 7e885236 (conflict) 1 qpvuntsm 7e885236 (conflict) 1
Rebased 1 descendant commits. Rebased 1 descendant commits.
Working copy now at: mzvwutvl e9c3b95b (empty) (no description set) Working copy (@) now at: mzvwutvl e9c3b95b (empty) (no description set)
Parent commit : kkmpptxz 7c36845c 2 Parent commit (@-) : kkmpptxz 7c36845c 2
New conflicts appeared in 1 commits: New conflicts appeared in 1 commits:
qpvuntsm 7e885236 (conflict) 1 qpvuntsm 7e885236 (conflict) 1
Hint: To resolve the conflicts, start by updating to it: Hint: To resolve the conflicts, start by updating to it:
@ -247,9 +247,9 @@ fn test_absorb_merge() {
let output = work_dir.run_jj(["new", "-m3", "description(1)", "description(2)"]); let output = work_dir.run_jj(["new", "-m3", "description(1)", "description(2)"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: mzvwutvl 08898161 (empty) 3 Working copy (@) now at: mzvwutvl 08898161 (empty) 3
Parent commit : kkmpptxz 7e9df299 1 Parent commit (@-) : kkmpptxz 7e9df299 1
Parent commit : zsuskuln baf056cf 2 Parent commit (@-) : zsuskuln baf056cf 2
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -263,9 +263,9 @@ fn test_absorb_merge() {
zsuskuln 71d1ee56 2 zsuskuln 71d1ee56 2
kkmpptxz 4d379399 1 kkmpptxz 4d379399 1
Rebased 1 descendant commits. Rebased 1 descendant commits.
Working copy now at: mzvwutvl 9db19b54 (empty) 3 Working copy (@) now at: mzvwutvl 9db19b54 (empty) 3
Parent commit : kkmpptxz 4d379399 1 Parent commit (@-) : kkmpptxz 4d379399 1
Parent commit : zsuskuln 71d1ee56 2 Parent commit (@-) : zsuskuln 71d1ee56 2
[EOF] [EOF]
"); ");
@ -280,8 +280,8 @@ fn test_absorb_merge() {
------- stderr ------- ------- stderr -------
Absorbed changes into 1 revisions: Absorbed changes into 1 revisions:
mzvwutvl e93c0210 3 mzvwutvl e93c0210 3
Working copy now at: vruxwmqv 1b10dfa4 (empty) (no description set) Working copy (@) now at: vruxwmqv 1b10dfa4 (empty) (no description set)
Parent commit : mzvwutvl e93c0210 3 Parent commit (@-) : mzvwutvl e93c0210 3
[EOF] [EOF]
"); ");
@ -343,9 +343,9 @@ fn test_absorb_discardable_merge_with_descendant() {
let output = work_dir.run_jj(["new", "description(1)", "description(2)"]); let output = work_dir.run_jj(["new", "description(1)", "description(2)"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: mzvwutvl f59b2364 (empty) (no description set) Working copy (@) now at: mzvwutvl f59b2364 (empty) (no description set)
Parent commit : kkmpptxz 7e9df299 1 Parent commit (@-) : kkmpptxz 7e9df299 1
Parent commit : zsuskuln baf056cf 2 Parent commit (@-) : zsuskuln baf056cf 2
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -363,9 +363,9 @@ fn test_absorb_discardable_merge_with_descendant() {
zsuskuln 02668cf6 2 zsuskuln 02668cf6 2
kkmpptxz fcabe394 1 kkmpptxz fcabe394 1
Rebased 1 descendant commits. Rebased 1 descendant commits.
Working copy now at: royxmykx f04f1247 3 Working copy (@) now at: royxmykx f04f1247 3
Parent commit : kkmpptxz fcabe394 1 Parent commit (@-) : kkmpptxz fcabe394 1
Parent commit : zsuskuln 02668cf6 2 Parent commit (@-) : zsuskuln 02668cf6 2
[EOF] [EOF]
"); ");
@ -423,8 +423,8 @@ fn test_absorb_conflict() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Working copy now at: kkmpptxz 74405a07 (conflict) (no description set) Working copy (@) now at: kkmpptxz 74405a07 (conflict) (no description set)
Parent commit : qpvuntsm 3619e4e5 1 Parent commit (@-) : qpvuntsm 3619e4e5 1
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file1 2-sided conflict file1 2-sided conflict
@ -514,8 +514,8 @@ fn test_absorb_file_mode() {
Absorbed changes into 1 revisions: Absorbed changes into 1 revisions:
qpvuntsm 991365da 1 qpvuntsm 991365da 1
Rebased 1 descendant commits. Rebased 1 descendant commits.
Working copy now at: zsuskuln 77de368e (no description set) Working copy (@) now at: zsuskuln 77de368e (no description set)
Parent commit : qpvuntsm 991365da 1 Parent commit (@-) : qpvuntsm 991365da 1
Remaining changes: Remaining changes:
M file1 M file1
[EOF] [EOF]
@ -560,8 +560,8 @@ fn test_absorb_from_into() {
Absorbed changes into 1 revisions: Absorbed changes into 1 revisions:
kkmpptxz 91df4543 2 kkmpptxz 91df4543 2
Rebased 1 descendant commits. Rebased 1 descendant commits.
Working copy now at: zsuskuln d5424357 (no description set) Working copy (@) now at: zsuskuln d5424357 (no description set)
Parent commit : kkmpptxz 91df4543 2 Parent commit (@-) : kkmpptxz 91df4543 2
Remaining changes: Remaining changes:
M file1 M file1
[EOF] [EOF]
@ -605,8 +605,8 @@ fn test_absorb_from_into() {
Absorbed changes into 1 revisions: Absorbed changes into 1 revisions:
rlvkpnrz 3a5fd02e 1 rlvkpnrz 3a5fd02e 1
Rebased 2 descendant commits. Rebased 2 descendant commits.
Working copy now at: zsuskuln 53ce490b (no description set) Working copy (@) now at: zsuskuln 53ce490b (no description set)
Parent commit : kkmpptxz c94cd773 (empty) 2 Parent commit (@-) : kkmpptxz c94cd773 (empty) 2
[EOF] [EOF]
"); ");
@ -674,8 +674,8 @@ fn test_absorb_paths() {
Absorbed changes into 1 revisions: Absorbed changes into 1 revisions:
qpvuntsm ae044adb 1 qpvuntsm ae044adb 1
Rebased 1 descendant commits. Rebased 1 descendant commits.
Working copy now at: kkmpptxz c6f31836 (no description set) Working copy (@) now at: kkmpptxz c6f31836 (no description set)
Parent commit : qpvuntsm ae044adb 1 Parent commit (@-) : qpvuntsm ae044adb 1
Remaining changes: Remaining changes:
M file2 M file2
[EOF] [EOF]
@ -735,8 +735,8 @@ fn test_absorb_immutable() {
Absorbed changes into 1 revisions: Absorbed changes into 1 revisions:
kkmpptxz d80e3c2a 2 kkmpptxz d80e3c2a 2
Rebased 1 descendant commits. Rebased 1 descendant commits.
Working copy now at: mzvwutvl 3021153d (no description set) Working copy (@) now at: mzvwutvl 3021153d (no description set)
Parent commit : kkmpptxz d80e3c2a 2 Parent commit (@-) : kkmpptxz d80e3c2a 2
Remaining changes: Remaining changes:
M file1 M file1
[EOF] [EOF]

8
cli/tests/test_commit_command.rs
View File

@ -194,8 +194,8 @@ fn test_commit_interactive_with_paths() {
let output = work_dir.run_jj(["commit", "-i", "file1", "file2"]); let output = work_dir.run_jj(["commit", "-i", "file1", "file2"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kkmpptxz f3e6062e (no description set) Working copy (@) now at: kkmpptxz f3e6062e (no description set)
Parent commit : rlvkpnrz 9453cb28 edit Parent commit (@-) : rlvkpnrz 9453cb28 edit
[EOF] [EOF]
"); ");
@ -392,8 +392,8 @@ fn test_commit_paths_warning() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Warning: The given paths do not match any file: file3 Warning: The given paths do not match any file: file3
Working copy now at: rlvkpnrz d1872100 (no description set) Working copy (@) now at: rlvkpnrz d1872100 (no description set)
Parent commit : qpvuntsm fa15625b (empty) first Parent commit (@-) : qpvuntsm fa15625b (empty) first
[EOF] [EOF]
"); ");

4
cli/tests/test_concurrent_operations.rs
View File

@ -223,8 +223,8 @@ fn test_concurrent_snapshot_wc_reloadable() {
let output = work_dir.run_jj(["describe", "-m", "new child2"]); let output = work_dir.run_jj(["describe", "-m", "new child2"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kkmpptxz 1795621b new child2 Working copy (@) now at: kkmpptxz 1795621b new child2
Parent commit : rlvkpnrz 86f54245 new child1 Parent commit (@-) : rlvkpnrz 86f54245 new child1
[EOF] [EOF]
"); ");

60
cli/tests/test_describe_command.rs
View File

@ -31,8 +31,8 @@ fn test_describe() {
let output = work_dir.run_jj(["describe", "-m", "description from CLI"]); let output = work_dir.run_jj(["describe", "-m", "description from CLI"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 95979928 (empty) description from CLI Working copy (@) now at: qpvuntsm 95979928 (empty) description from CLI
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -65,8 +65,8 @@ fn test_describe() {
let output = work_dir.run_jj(["describe"]); let output = work_dir.run_jj(["describe"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 94fcb906 (empty) description from editor Working copy (@) now at: qpvuntsm 94fcb906 (empty) description from editor
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -79,8 +79,8 @@ fn test_describe() {
let output = work_dir.run_jj(["describe"]); let output = work_dir.run_jj(["describe"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 7a348923 (empty) description among comment Working copy (@) now at: qpvuntsm 7a348923 (empty) description among comment
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -89,8 +89,8 @@ fn test_describe() {
let output = work_dir.run_jj(["describe"]); let output = work_dir.run_jj(["describe"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 749361b5 (empty) line1 Working copy (@) now at: qpvuntsm 749361b5 (empty) line1
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
let output = work_dir.run_jj(["log", "--no-graph", "-r@", "-Tdescription"]); let output = work_dir.run_jj(["log", "--no-graph", "-r@", "-Tdescription"]);
@ -116,8 +116,8 @@ fn test_describe() {
let output = work_dir.run_jj(["describe"]); let output = work_dir.run_jj(["describe"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm dc44dbee (empty) line1 Working copy (@) now at: qpvuntsm dc44dbee (empty) line1
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
let output = work_dir.run_jj(["log", "--no-graph", "-r@", "-Tdescription"]); let output = work_dir.run_jj(["log", "--no-graph", "-r@", "-Tdescription"]);
@ -131,8 +131,8 @@ fn test_describe() {
let output = work_dir.run_jj(["describe", "-m", ""]); let output = work_dir.run_jj(["describe", "-m", ""]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 6296963b (empty) (no description set) Working copy (@) now at: qpvuntsm 6296963b (empty) (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
std::fs::write(&edit_script, "write\n").unwrap(); std::fs::write(&edit_script, "write\n").unwrap();
@ -181,8 +181,8 @@ fn test_describe() {
let output = work_dir.run_jj(["describe"]); let output = work_dir.run_jj(["describe"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 10fa2dc7 (empty) description from editor Working copy (@) now at: qpvuntsm 10fa2dc7 (empty) description from editor
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
let output = work_dir.run_jj(["log", "--no-graph", "-r@", "-Tdescription"]); let output = work_dir.run_jj(["log", "--no-graph", "-r@", "-Tdescription"]);
@ -287,8 +287,8 @@ fn test_describe_multiple_commits() {
------- stderr ------- ------- stderr -------
Updated 2 commits Updated 2 commits
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: kkmpptxz 41659b84 (empty) description from CLI Working copy (@) now at: kkmpptxz 41659b84 (empty) description from CLI
Parent commit : rlvkpnrz 8d650510 (empty) (no description set) Parent commit (@-) : rlvkpnrz 8d650510 (empty) (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -351,8 +351,8 @@ fn test_describe_multiple_commits() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Updated 2 commits Updated 2 commits
Working copy now at: kkmpptxz f203494a (empty) description from editor of @ Working copy (@) now at: kkmpptxz f203494a (empty) description from editor of @
Parent commit : rlvkpnrz 0d76a92c (empty) description from editor of @- Parent commit (@-) : rlvkpnrz 0d76a92c (empty) description from editor of @-
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -518,8 +518,8 @@ fn test_describe_multiple_commits() {
------- stderr ------- ------- stderr -------
Updated 2 commits Updated 2 commits
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: kkmpptxz 1d7701ee (empty) description from editor of @ Working copy (@) now at: kkmpptxz 1d7701ee (empty) description from editor of @
Parent commit : rlvkpnrz 5389926e (empty) description from editor for @- Parent commit (@-) : rlvkpnrz 5389926e (empty) description from editor for @-
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -549,8 +549,8 @@ fn test_multiple_message_args() {
]); ]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 99a36a50 (empty) First Paragraph from CLI Working copy (@) now at: qpvuntsm 99a36a50 (empty) First Paragraph from CLI
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -588,8 +588,8 @@ fn test_multiple_message_args() {
]); ]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 01ac40b3 (empty) First Paragraph from CLI Working copy (@) now at: qpvuntsm 01ac40b3 (empty) First Paragraph from CLI
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -617,8 +617,8 @@ fn test_describe_default_description() {
let output = work_dir.run_jj(["describe"]); let output = work_dir.run_jj(["describe"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 573b6df5 TESTED=TODO Working copy (@) now at: qpvuntsm 573b6df5 TESTED=TODO
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!( insta::assert_snapshot!(
@ -839,8 +839,8 @@ fn test_describe_with_edit_and_message_args_opens_editor() {
let output = work_dir.run_jj(["describe", "-m", "message from command line", "--edit"]); let output = work_dir.run_jj(["describe", "-m", "message from command line", "--edit"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 61ece7a9 (empty) message from command line Working copy (@) now at: qpvuntsm 61ece7a9 (empty) message from command line
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!( insta::assert_snapshot!(
@ -866,8 +866,8 @@ 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"]); let output = work_dir.run_jj(["describe", "-m", "new message", "--edit"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm de694560 (empty) new message Working copy (@) now at: qpvuntsm de694560 (empty) new message
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!( insta::assert_snapshot!(

52
cli/tests/test_diffedit_command.rs
View File

@ -125,8 +125,8 @@ fn test_diffedit() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created kkmpptxz cbc7a725 (no description set) Created kkmpptxz cbc7a725 (no description set)
Working copy now at: kkmpptxz cbc7a725 (no description set) Working copy (@) now at: kkmpptxz cbc7a725 (no description set)
Parent commit : rlvkpnrz a72506cd (no description set) Parent commit (@-) : rlvkpnrz a72506cd (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -144,8 +144,8 @@ fn test_diffedit() {
------- stderr ------- ------- stderr -------
Created rlvkpnrz d4eef3fc (no description set) Created rlvkpnrz d4eef3fc (no description set)
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: kkmpptxz 59ef1b95 (no description set) Working copy (@) now at: kkmpptxz 59ef1b95 (no description set)
Parent commit : rlvkpnrz d4eef3fc (no description set) Parent commit (@-) : rlvkpnrz d4eef3fc (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -163,8 +163,8 @@ fn test_diffedit() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created kkmpptxz 5b585bd1 (no description set) Created kkmpptxz 5b585bd1 (no description set)
Working copy now at: kkmpptxz 5b585bd1 (no description set) Working copy (@) now at: kkmpptxz 5b585bd1 (no description set)
Parent commit : rlvkpnrz a72506cd (no description set) Parent commit (@-) : rlvkpnrz a72506cd (no description set)
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -213,8 +213,8 @@ fn test_diffedit_new_file() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created rlvkpnrz b0376e2b (no description set) Created rlvkpnrz b0376e2b (no description set)
Working copy now at: rlvkpnrz b0376e2b (no description set) Working copy (@) now at: rlvkpnrz b0376e2b (no description set)
Parent commit : qpvuntsm b739eb46 (no description set) Parent commit (@-) : qpvuntsm b739eb46 (no description set)
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -339,9 +339,9 @@ fn test_diffedit_external_tool_conflict_marker_style() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created mzvwutvl fb39e804 (conflict) (empty) (no description set) Created mzvwutvl fb39e804 (conflict) (empty) (no description set)
Working copy now at: mzvwutvl fb39e804 (conflict) (empty) (no description set) Working copy (@) now at: mzvwutvl fb39e804 (conflict) (empty) (no description set)
Parent commit : rlvkpnrz 3765cc27 side-a Parent commit (@-) : rlvkpnrz 3765cc27 side-a
Parent commit : zsuskuln 8b3de837 side-b Parent commit (@-) : zsuskuln 8b3de837 side-b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict file 2-sided conflict
@ -418,9 +418,9 @@ fn test_diffedit_external_tool_conflict_marker_style() {
let output = work_dir.run_jj(["st"]); let output = work_dir.run_jj(["st"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
The working copy has no changes. The working copy has no changes.
Working copy : mzvwutvl fb39e804 (conflict) (empty) (no description set) Working copy (@) : mzvwutvl fb39e804 (conflict) (empty) (no description set)
Parent commit: rlvkpnrz 3765cc27 side-a Parent commit (@-): rlvkpnrz 3765cc27 side-a
Parent commit: zsuskuln 8b3de837 side-b Parent commit (@-): zsuskuln 8b3de837 side-b
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict file 2-sided conflict
[EOF] [EOF]
@ -488,8 +488,8 @@ fn test_diffedit_3pane() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created kkmpptxz ed8aada3 (no description set) Created kkmpptxz ed8aada3 (no description set)
Working copy now at: kkmpptxz ed8aada3 (no description set) Working copy (@) now at: kkmpptxz ed8aada3 (no description set)
Parent commit : rlvkpnrz a72506cd (no description set) Parent commit (@-) : rlvkpnrz a72506cd (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -506,8 +506,8 @@ fn test_diffedit_3pane() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created kkmpptxz 7c19e689 (no description set) Created kkmpptxz 7c19e689 (no description set)
Working copy now at: kkmpptxz 7c19e689 (no description set) Working copy (@) now at: kkmpptxz 7c19e689 (no description set)
Parent commit : rlvkpnrz a72506cd (no description set) Parent commit (@-) : rlvkpnrz a72506cd (no description set)
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -581,8 +581,8 @@ fn test_diffedit_merge() {
------- stderr ------- ------- stderr -------
Created royxmykx 0105de4a (conflict) merge Created royxmykx 0105de4a (conflict) merge
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: yqosqzyt abbb78c1 (conflict) (empty) (no description set) Working copy (@) now at: yqosqzyt abbb78c1 (conflict) (empty) (no description set)
Parent commit : royxmykx 0105de4a (conflict) merge Parent commit (@-) : royxmykx 0105de4a (conflict) merge
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file2 2-sided conflict file2 2-sided conflict
@ -661,8 +661,8 @@ fn test_diffedit_old_restore_interactive_tests() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created rlvkpnrz 69811eda (no description set) Created rlvkpnrz 69811eda (no description set)
Working copy now at: rlvkpnrz 69811eda (no description set) Working copy (@) now at: rlvkpnrz 69811eda (no description set)
Parent commit : qpvuntsm fc687cb8 (no description set) Parent commit (@-) : qpvuntsm fc687cb8 (no description set)
Added 0 files, modified 1 files, removed 1 files Added 0 files, modified 1 files, removed 1 files
[EOF] [EOF]
"); ");
@ -679,8 +679,8 @@ fn test_diffedit_old_restore_interactive_tests() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created rlvkpnrz 2b76a42e (no description set) Created rlvkpnrz 2b76a42e (no description set)
Working copy now at: rlvkpnrz 2b76a42e (no description set) Working copy (@) now at: rlvkpnrz 2b76a42e (no description set)
Parent commit : qpvuntsm fc687cb8 (no description set) Parent commit (@-) : qpvuntsm fc687cb8 (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -731,8 +731,8 @@ fn test_diffedit_restore_descendants() {
------- stderr ------- ------- stderr -------
Created rlvkpnrz 62b8c2ce (no description set) Created rlvkpnrz 62b8c2ce (no description set)
Rebased 1 descendant commits (while preserving their content) Rebased 1 descendant commits (while preserving their content)
Working copy now at: kkmpptxz 321d1cd1 (no description set) Working copy (@) now at: kkmpptxz 321d1cd1 (no description set)
Parent commit : rlvkpnrz 62b8c2ce (no description set) Parent commit (@-) : rlvkpnrz 62b8c2ce (no description set)
[EOF] [EOF]
"); ");
let output = work_dir.run_jj(["diff", "--git"]); let output = work_dir.run_jj(["diff", "--git"]);

40
cli/tests/test_duplicate_command.rs
View File

@ -795,9 +795,9 @@ fn test_duplicate_insert_after() {
Duplicated 9e85a474f005 as knltnxnu ad0a80e9 a1 Duplicated 9e85a474f005 as knltnxnu ad0a80e9 a1
Duplicated dcc98bc8bbea as krtqozmx 840bbbe5 b1 Duplicated dcc98bc8bbea as krtqozmx 840bbbe5 b1
Rebased 2 commits onto duplicated commits Rebased 2 commits onto duplicated commits
Working copy now at: nmzmmopx 9eeade97 d2 | d2 Working copy (@) now at: nmzmmopx 9eeade97 d2 | d2
Parent commit : knltnxnu ad0a80e9 a1 Parent commit (@-) : knltnxnu ad0a80e9 a1
Parent commit : krtqozmx 840bbbe5 b1 Parent commit (@-) : krtqozmx 840bbbe5 b1
Added 3 files, modified 0 files, removed 0 files Added 3 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1427,8 +1427,8 @@ fn test_duplicate_insert_before() {
Duplicated 9e85a474f005 as knltnxnu 056a0cb3 a1 Duplicated 9e85a474f005 as knltnxnu 056a0cb3 a1
Duplicated dcc98bc8bbea as krtqozmx fb68a539 b1 Duplicated dcc98bc8bbea as krtqozmx fb68a539 b1
Rebased 4 commits onto duplicated commits Rebased 4 commits onto duplicated commits
Working copy now at: nmzmmopx 89f9b379 d2 | d2 Working copy (@) now at: nmzmmopx 89f9b379 d2 | d2
Parent commit : xznxytkn 771d0e16 d1 | d1 Parent commit (@-) : xznxytkn 771d0e16 d1 | d1
Added 2 files, modified 0 files, removed 0 files Added 2 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1630,8 +1630,8 @@ fn test_duplicate_insert_before() {
Duplicated 9e85a474f005 as nwmqwkzz 9963be9b a1 Duplicated 9e85a474f005 as nwmqwkzz 9963be9b a1
Duplicated 17072aa2b823 as uwrrnrtx a5eee87f a3 Duplicated 17072aa2b823 as uwrrnrtx a5eee87f a3
Rebased 2 commits onto duplicated commits Rebased 2 commits onto duplicated commits
Working copy now at: nmzmmopx 8161bbbc d2 | d2 Working copy (@) now at: nmzmmopx 8161bbbc d2 | d2
Parent commit : uwrrnrtx a5eee87f a3 Parent commit (@-) : uwrrnrtx a5eee87f a3
Added 3 files, modified 0 files, removed 0 files Added 3 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1964,10 +1964,10 @@ fn test_duplicate_insert_after_before() {
Duplicated 9e85a474f005 as sryyqqkq 44f57f24 a1 Duplicated 9e85a474f005 as sryyqqkq 44f57f24 a1
Duplicated dcc98bc8bbea as pxnqtknr bcee4b60 b1 Duplicated dcc98bc8bbea as pxnqtknr bcee4b60 b1
Rebased 1 commits onto duplicated commits Rebased 1 commits onto duplicated commits
Working copy now at: nmzmmopx 6a5a099f d2 | d2 Working copy (@) now at: nmzmmopx 6a5a099f d2 | d2
Parent commit : xznxytkn 0f21c5e1 d1 | d1 Parent commit (@-) : xznxytkn 0f21c5e1 d1 | d1
Parent commit : sryyqqkq 44f57f24 a1 Parent commit (@-) : sryyqqkq 44f57f24 a1
Parent commit : pxnqtknr bcee4b60 b1 Parent commit (@-) : pxnqtknr bcee4b60 b1
Added 3 files, modified 0 files, removed 0 files Added 3 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -2074,10 +2074,10 @@ fn test_duplicate_insert_after_before() {
Duplicated 9e85a474f005 as knltnxnu a2d38733 a1 Duplicated 9e85a474f005 as knltnxnu a2d38733 a1
Duplicated dcc98bc8bbea as krtqozmx 2512c935 b1 Duplicated dcc98bc8bbea as krtqozmx 2512c935 b1
Rebased 1 commits onto duplicated commits Rebased 1 commits onto duplicated commits
Working copy now at: nmzmmopx 4678ad48 d2 | d2 Working copy (@) now at: nmzmmopx 4678ad48 d2 | d2
Parent commit : xznxytkn 0f21c5e1 d1 | d1 Parent commit (@-) : xznxytkn 0f21c5e1 d1 | d1
Parent commit : knltnxnu a2d38733 a1 Parent commit (@-) : knltnxnu a2d38733 a1
Parent commit : krtqozmx 2512c935 b1 Parent commit (@-) : krtqozmx 2512c935 b1
Added 3 files, modified 0 files, removed 0 files Added 3 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -2113,9 +2113,9 @@ fn test_duplicate_insert_after_before() {
Duplicated 9e85a474f005 as wxzmtyol 893a647a a1 Duplicated 9e85a474f005 as wxzmtyol 893a647a a1
Duplicated 17072aa2b823 as musouqkq fb14bc1e a3 Duplicated 17072aa2b823 as musouqkq fb14bc1e a3
Rebased 1 commits onto duplicated commits Rebased 1 commits onto duplicated commits
Working copy now at: nmzmmopx 21321795 d2 | d2 Working copy (@) now at: nmzmmopx 21321795 d2 | d2
Parent commit : xznxytkn 0f21c5e1 d1 | d1 Parent commit (@-) : xznxytkn 0f21c5e1 d1 | d1
Parent commit : musouqkq fb14bc1e a3 Parent commit (@-) : musouqkq fb14bc1e a3
Added 3 files, modified 0 files, removed 0 files Added 3 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -2406,8 +2406,8 @@ fn test_rebase_duplicates() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 4 commits onto destination Rebased 4 commits onto destination
Working copy now at: royxmykx ed671a3c c | c Working copy (@) now at: royxmykx ed671a3c c | c
Parent commit : zsuskuln 4c6f1569 b | b Parent commit (@-) : zsuskuln 4c6f1569 b | b
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");

4
cli/tests/test_edit_command.rs
View File

@ -44,8 +44,8 @@ fn test_edit() {
let output = work_dir.run_jj(["edit", "@-"]); let output = work_dir.run_jj(["edit", "@-"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 73383c0b first Working copy (@) now at: qpvuntsm 73383c0b first
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");

12
cli/tests/test_file_chmod_command.rs
View File

@ -106,9 +106,9 @@ fn test_chmod_regular_conflict() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Warning: No matching entries for paths: nonexistent Warning: No matching entries for paths: nonexistent
Working copy now at: yostqsxw 2b11d002 conflict | (conflict) conflict Working copy (@) now at: yostqsxw 2b11d002 conflict | (conflict) conflict
Parent commit : royxmykx 427fbd2f x | x Parent commit (@-) : royxmykx 427fbd2f x | x
Parent commit : zsuskuln 3f83a26d n | n Parent commit (@-) : zsuskuln 3f83a26d n | n
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict including an executable file 2-sided conflict including an executable
@ -196,9 +196,9 @@ fn test_chmod_file_dir_deletion_conflicts() {
let output = work_dir.run_jj(["file", "chmod", "x", "file", "-r=file_deletion"]); let output = work_dir.run_jj(["file", "chmod", "x", "file", "-r=file_deletion"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kmkuslsw 139dee15 file_deletion | (conflict) file_deletion Working copy (@) now at: kmkuslsw 139dee15 file_deletion | (conflict) file_deletion
Parent commit : zsuskuln c51c9c55 file | file Parent commit (@-) : zsuskuln c51c9c55 file | file
Parent commit : royxmykx 6b18b3c1 deletion | deletion Parent commit (@-) : royxmykx 6b18b3c1 deletion | deletion
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict including 1 deletion and an executable file 2-sided conflict including 1 deletion and an executable

66
cli/tests/test_fix_command.rs
View File

@ -542,8 +542,8 @@ fn test_fix_leaf_commit() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Fixed 1 commits of 1 checked. Fixed 1 commits of 1 checked.
Working copy now at: rlvkpnrz 85ce8924 (no description set) Working copy (@) now at: rlvkpnrz 85ce8924 (no description set)
Parent commit : qpvuntsm b2ca2bc5 (no description set) Parent commit (@-) : qpvuntsm b2ca2bc5 (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -582,8 +582,8 @@ fn test_fix_parent_commit() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Fixed 3 commits of 3 checked. Fixed 3 commits of 3 checked.
Working copy now at: mzvwutvl d30c8ae2 child2 | (no description set) Working copy (@) now at: mzvwutvl d30c8ae2 child2 | (no description set)
Parent commit : qpvuntsm 70a4dae2 parent | (no description set) Parent commit (@-) : qpvuntsm 70a4dae2 parent | (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -687,8 +687,8 @@ fn test_default_revset() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Fixed 3 commits of 3 checked. Fixed 3 commits of 3 checked.
Working copy now at: yostqsxw dabc47b2 bar2 | (no description set) Working copy (@) now at: yostqsxw dabc47b2 bar2 | (no description set)
Parent commit : yqosqzyt 984b5924 bar1 | (no description set) Parent commit (@-) : yqosqzyt 984b5924 bar1 | (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -820,8 +820,8 @@ fn test_fix_some_paths() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Fixed 1 commits of 1 checked. Fixed 1 commits of 1 checked.
Working copy now at: qpvuntsm 54a90d2b (no description set) Working copy (@) now at: qpvuntsm 54a90d2b (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -846,8 +846,8 @@ fn test_fix_cyclic() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Fixed 1 commits of 1 checked. Fixed 1 commits of 1 checked.
Working copy now at: qpvuntsm bf5e6a5a (no description set) Working copy (@) now at: qpvuntsm bf5e6a5a (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -861,8 +861,8 @@ fn test_fix_cyclic() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Fixed 1 commits of 1 checked. Fixed 1 commits of 1 checked.
Working copy now at: qpvuntsm 0e2d20d6 (no description set) Working copy (@) now at: qpvuntsm 0e2d20d6 (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -908,8 +908,8 @@ fn test_deduplication() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Fixed 4 commits of 4 checked. Fixed 4 commits of 4 checked.
Working copy now at: yqosqzyt cf770245 d | (no description set) Working copy (@) now at: yqosqzyt cf770245 d | (no description set)
Parent commit : mzvwutvl 370615a5 c | (empty) (no description set) Parent commit (@-) : mzvwutvl 370615a5 c | (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1030,8 +1030,8 @@ fn test_stderr_success() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
errorFixed 1 commits of 1 checked. errorFixed 1 commits of 1 checked.
Working copy now at: qpvuntsm 487808ba (no description set) Working copy (@) now at: qpvuntsm 487808ba (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1097,8 +1097,8 @@ fn test_fix_file_types() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Fixed 1 commits of 1 checked. Fixed 1 commits of 1 checked.
Working copy now at: qpvuntsm 6836a9e4 (no description set) Working copy (@) now at: qpvuntsm 6836a9e4 (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1126,8 +1126,8 @@ fn test_fix_executable() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Fixed 1 commits of 1 checked. Fixed 1 commits of 1 checked.
Working copy now at: qpvuntsm fee78e99 (no description set) Working copy (@) now at: qpvuntsm fee78e99 (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1205,9 +1205,9 @@ fn test_fix_adding_merge_commit() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Fixed 1 commits of 1 checked. Fixed 1 commits of 1 checked.
Working copy now at: mzvwutvl f93eb5a9 (no description set) Working copy (@) now at: mzvwutvl f93eb5a9 (no description set)
Parent commit : qpvuntsm 6e64e7a7 a | (no description set) Parent commit (@-) : qpvuntsm 6e64e7a7 a | (no description set)
Parent commit : kkmpptxz c536f264 b | (no description set) Parent commit (@-) : kkmpptxz c536f264 b | (no description set)
Added 0 files, modified 4 files, removed 0 files Added 0 files, modified 4 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1256,9 +1256,9 @@ fn test_fix_both_sides_of_conflict() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Fixed 3 commits of 3 checked. Fixed 3 commits of 3 checked.
Working copy now at: mzvwutvl a55c6ec2 (conflict) (empty) (no description set) Working copy (@) now at: mzvwutvl a55c6ec2 (conflict) (empty) (no description set)
Parent commit : qpvuntsm 8e8aad69 a | (no description set) Parent commit (@-) : qpvuntsm 8e8aad69 a | (no description set)
Parent commit : kkmpptxz 91f9b284 b | (no description set) Parent commit (@-) : kkmpptxz 91f9b284 b | (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict file 2-sided conflict
@ -1311,9 +1311,9 @@ fn test_fix_resolve_conflict() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Fixed 3 commits of 3 checked. Fixed 3 commits of 3 checked.
Working copy now at: mzvwutvl 50fd048d (empty) (no description set) Working copy (@) now at: mzvwutvl 50fd048d (empty) (no description set)
Parent commit : qpvuntsm dd2721f1 a | (no description set) Parent commit (@-) : qpvuntsm dd2721f1 a | (no description set)
Parent commit : kkmpptxz 07c27a8e b | (no description set) Parent commit (@-) : kkmpptxz 07c27a8e b | (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1375,8 +1375,8 @@ fn test_all_files() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Fixed 2 commits of 2 checked. Fixed 2 commits of 2 checked.
Working copy now at: rlvkpnrz c098d165 child Working copy (@) now at: rlvkpnrz c098d165 child
Parent commit : qpvuntsm 0bb31627 parent Parent commit (@-) : qpvuntsm 0bb31627 parent
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1428,8 +1428,8 @@ fn test_all_files() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Fixed 2 commits of 2 checked. Fixed 2 commits of 2 checked.
Working copy now at: rlvkpnrz c5d0aa1d child Working copy (@) now at: rlvkpnrz c5d0aa1d child
Parent commit : qpvuntsm b4d02ca9 parent Parent commit (@-) : qpvuntsm b4d02ca9 parent
Added 0 files, modified 2 files, removed 0 files Added 0 files, modified 2 files, removed 0 files
[EOF] [EOF]
"); ");

60
cli/tests/test_git_clone.rs
View File

@ -72,8 +72,8 @@ fn test_git_clone(subprocess: bool) {
Fetching into new repo in "$TEST_ENV/clone" Fetching into new repo in "$TEST_ENV/clone"
bookmark: main@origin [new] tracked bookmark: main@origin [new] tracked
Setting the revset alias `trunk()` to `main@origin` Setting the revset alias `trunk()` to `main@origin`
Working copy now at: uuqppmxq f78d2645 (empty) (no description set) Working copy (@) now at: uuqppmxq f78d2645 (empty) (no description set)
Parent commit : qomsplrm ebeb70d8 main | message Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -193,8 +193,8 @@ fn test_git_clone(subprocess: bool) {
Fetching into new repo in "$TEST_ENV/nested/path/to/repo" Fetching into new repo in "$TEST_ENV/nested/path/to/repo"
bookmark: main@origin [new] tracked bookmark: main@origin [new] tracked
Setting the revset alias `trunk()` to `main@origin` Setting the revset alias `trunk()` to `main@origin`
Working copy now at: uuzqqzqu cf5d593e (empty) (no description set) Working copy (@) now at: uuzqqzqu cf5d593e (empty) (no description set)
Parent commit : qomsplrm ebeb70d8 main | message Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -276,8 +276,8 @@ fn test_git_clone_colocate(subprocess: bool) {
Fetching into new repo in "$TEST_ENV/clone" Fetching into new repo in "$TEST_ENV/clone"
bookmark: main@origin [new] tracked bookmark: main@origin [new] tracked
Setting the revset alias `trunk()` to `main@origin` Setting the revset alias `trunk()` to `main@origin`
Working copy now at: uuqppmxq f78d2645 (empty) (no description set) Working copy (@) now at: uuqppmxq f78d2645 (empty) (no description set)
Parent commit : qomsplrm ebeb70d8 main | message Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -459,8 +459,8 @@ fn test_git_clone_colocate(subprocess: bool) {
Fetching into new repo in "$TEST_ENV/nested/path/to/repo" Fetching into new repo in "$TEST_ENV/nested/path/to/repo"
bookmark: main@origin [new] tracked bookmark: main@origin [new] tracked
Setting the revset alias `trunk()` to `main@origin` Setting the revset alias `trunk()` to `main@origin`
Working copy now at: vzqnnsmr 589d0921 (empty) (no description set) Working copy (@) now at: vzqnnsmr 589d0921 (empty) (no description set)
Parent commit : qomsplrm ebeb70d8 main | message Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -501,8 +501,8 @@ fn test_git_clone_remote_default_bookmark(subprocess: bool) {
bookmark: feature1@origin [new] tracked bookmark: feature1@origin [new] tracked
bookmark: main@origin [new] tracked bookmark: main@origin [new] tracked
Setting the revset alias `trunk()` to `main@origin` Setting the revset alias `trunk()` to `main@origin`
Working copy now at: sqpuoqvx 2ca1c979 (empty) (no description set) Working copy (@) now at: sqpuoqvx 2ca1c979 (empty) (no description set)
Parent commit : qomsplrm ebeb70d8 feature1 main | message Parent commit (@-) : qomsplrm ebeb70d8 feature1 main | message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -537,8 +537,8 @@ fn test_git_clone_remote_default_bookmark(subprocess: bool) {
bookmark: feature1@origin [new] untracked bookmark: feature1@origin [new] untracked
bookmark: main@origin [new] untracked bookmark: main@origin [new] untracked
Setting the revset alias `trunk()` to `main@origin` Setting the revset alias `trunk()` to `main@origin`
Working copy now at: rzvqmyuk 018092c2 (empty) (no description set) Working copy (@) now at: rzvqmyuk 018092c2 (empty) (no description set)
Parent commit : qomsplrm ebeb70d8 feature1@origin main | message Parent commit (@-) : qomsplrm ebeb70d8 feature1@origin main | message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -563,8 +563,8 @@ fn test_git_clone_remote_default_bookmark(subprocess: bool) {
bookmark: feature1@origin [new] untracked bookmark: feature1@origin [new] untracked
bookmark: main@origin [new] untracked bookmark: main@origin [new] untracked
Setting the revset alias `trunk()` to `feature1@origin` Setting the revset alias `trunk()` to `feature1@origin`
Working copy now at: nppvrztz 5fd587f4 (empty) (no description set) Working copy (@) now at: nppvrztz 5fd587f4 (empty) (no description set)
Parent commit : qomsplrm ebeb70d8 feature1 main@origin | message Parent commit (@-) : qomsplrm ebeb70d8 feature1 main@origin | message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -621,8 +621,8 @@ fn test_git_clone_remote_default_bookmark_with_escape(subprocess: bool) {
Fetching into new repo in "$TEST_ENV/clone" Fetching into new repo in "$TEST_ENV/clone"
bookmark: "\""@origin [new] untracked bookmark: "\""@origin [new] untracked
Setting the revset alias `trunk()` to `"\""@origin` Setting the revset alias `trunk()` to `"\""@origin`
Working copy now at: sqpuoqvx 2ca1c979 (empty) (no description set) Working copy (@) now at: sqpuoqvx 2ca1c979 (empty) (no description set)
Parent commit : qomsplrm ebeb70d8 " | message Parent commit (@-) : qomsplrm ebeb70d8 " | message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -668,8 +668,8 @@ fn test_git_clone_ignore_working_copy(subprocess: bool) {
insta::allow_duplicates! { insta::allow_duplicates! {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
The working copy has no changes. The working copy has no changes.
Working copy : sqpuoqvx 2ca1c979 (empty) (no description set) Working copy (@) : sqpuoqvx 2ca1c979 (empty) (no description set)
Parent commit: qomsplrm ebeb70d8 main | message Parent commit (@-): qomsplrm ebeb70d8 main | message
[EOF] [EOF]
"); ");
} }
@ -732,8 +732,8 @@ fn test_git_clone_with_remote_name(subprocess: bool) {
Fetching into new repo in "$TEST_ENV/clone" Fetching into new repo in "$TEST_ENV/clone"
bookmark: main@upstream [new] tracked bookmark: main@upstream [new] tracked
Setting the revset alias `trunk()` to `main@upstream` Setting the revset alias `trunk()` to `main@upstream`
Working copy now at: sqpuoqvx 2ca1c979 (empty) (no description set) Working copy (@) now at: sqpuoqvx 2ca1c979 (empty) (no description set)
Parent commit : qomsplrm ebeb70d8 main | message Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -804,8 +804,8 @@ fn test_git_clone_trunk_deleted(subprocess: bool) {
Fetching into new repo in "$TEST_ENV/clone" Fetching into new repo in "$TEST_ENV/clone"
bookmark: main@origin [new] untracked bookmark: main@origin [new] untracked
Setting the revset alias `trunk()` to `main@origin` Setting the revset alias `trunk()` to `main@origin`
Working copy now at: sqpuoqvx 2ca1c979 (empty) (no description set) Working copy (@) now at: sqpuoqvx 2ca1c979 (empty) (no description set)
Parent commit : qomsplrm ebeb70d8 main | message Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -898,8 +898,8 @@ fn test_git_clone_conditional_config() {
Fetching into new repo in "$TEST_ENV/new" Fetching into new repo in "$TEST_ENV/new"
bookmark: main@origin [new] untracked bookmark: main@origin [new] untracked
Setting the revset alias `trunk()` to `main@origin` Setting the revset alias `trunk()` to `main@origin`
Working copy now at: zxsnswpr 9ffb42e2 (empty) (no description set) Working copy (@) now at: zxsnswpr 9ffb42e2 (empty) (no description set)
Parent commit : qomsplrm ebeb70d8 main | message Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -967,8 +967,8 @@ fn test_git_clone_with_depth_subprocess() {
Fetching into new repo in "$TEST_ENV/clone" Fetching into new repo in "$TEST_ENV/clone"
bookmark: main@origin [new] tracked bookmark: main@origin [new] tracked
Setting the revset alias `trunk()` to `main@origin` Setting the revset alias `trunk()` to `main@origin`
Working copy now at: sqpuoqvx 2ca1c979 (empty) (no description set) Working copy (@) now at: sqpuoqvx 2ca1c979 (empty) (no description set)
Parent commit : qomsplrm ebeb70d8 main | message Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -1079,8 +1079,8 @@ fn test_git_clone_malformed(subprocess: bool) {
insta::allow_duplicates! { insta::allow_duplicates! {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
The working copy has no changes. The working copy has no changes.
Working copy : zsuskuln f652c321 (empty) (no description set) Working copy (@) : zsuskuln f652c321 (empty) (no description set)
Parent commit: zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
} }
@ -1153,8 +1153,8 @@ fn test_git_clone_git2_warning() {
Fetching into new repo in "$TEST_ENV/clone" Fetching into new repo in "$TEST_ENV/clone"
bookmark: main@origin [new] tracked bookmark: main@origin [new] tracked
Setting the revset alias `trunk()` to `main@origin` Setting the revset alias `trunk()` to `main@origin`
Working copy now at: sqpuoqvx 2ca1c979 (empty) (no description set) Working copy (@) now at: sqpuoqvx 2ca1c979 (empty) (no description set)
Parent commit : qomsplrm ebeb70d8 main | message Parent commit (@-) : qomsplrm ebeb70d8 main | message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);

60
cli/tests/test_git_colocated.rs
View File

@ -186,8 +186,8 @@ fn test_git_colocated_unborn_bookmark() {
let output = work_dir.run_jj(["new", "root()"]); let output = work_dir.run_jj(["new", "root()"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kkmpptxz fcdbbd73 (empty) (no description set) Working copy (@) now at: kkmpptxz fcdbbd73 (empty) (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -207,8 +207,8 @@ fn test_git_colocated_unborn_bookmark() {
checkout_index(); checkout_index();
insta::assert_snapshot!(work_dir.run_jj(["status"]), @r" insta::assert_snapshot!(work_dir.run_jj(["status"]), @r"
The working copy has no changes. The working copy has no changes.
Working copy : kkmpptxz fcdbbd73 (empty) (no description set) Working copy (@) : kkmpptxz fcdbbd73 (empty) (no description set)
Parent commit: zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -218,8 +218,8 @@ fn test_git_colocated_unborn_bookmark() {
let output = work_dir.run_jj(["new"]); let output = work_dir.run_jj(["new"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: royxmykx 0e146103 (empty) (no description set) Working copy (@) now at: royxmykx 0e146103 (empty) (no description set)
Parent commit : kkmpptxz e3e01407 (no description set) Parent commit (@-) : kkmpptxz e3e01407 (no description set)
[EOF] [EOF]
"); ");
assert!(git_repo.head().unwrap().is_detached()); assert!(git_repo.head().unwrap().is_detached());
@ -239,8 +239,8 @@ fn test_git_colocated_unborn_bookmark() {
checkout_index(); checkout_index();
insta::assert_snapshot!(work_dir.run_jj(["status"]), @r" insta::assert_snapshot!(work_dir.run_jj(["status"]), @r"
The working copy has no changes. The working copy has no changes.
Working copy : royxmykx 0e146103 (empty) (no description set) Working copy (@) : royxmykx 0e146103 (empty) (no description set)
Parent commit: kkmpptxz e3e01407 (no description set) Parent commit (@-): kkmpptxz e3e01407 (no description set)
[EOF] [EOF]
"); ");
@ -255,8 +255,8 @@ fn test_git_colocated_unborn_bookmark() {
let output = work_dir.run_jj(["new", "root()"]); let output = work_dir.run_jj(["new", "root()"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: znkkpsqq 10dd328b (empty) (no description set) Working copy (@) now at: znkkpsqq 10dd328b (empty) (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -275,8 +275,8 @@ fn test_git_colocated_unborn_bookmark() {
checkout_index(); checkout_index();
insta::assert_snapshot!(work_dir.run_jj(["status"]), @r" insta::assert_snapshot!(work_dir.run_jj(["status"]), @r"
The working copy has no changes. The working copy has no changes.
Working copy : znkkpsqq 10dd328b (empty) (no description set) Working copy (@) : znkkpsqq 10dd328b (empty) (no description set)
Parent commit: zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -285,8 +285,8 @@ fn test_git_colocated_unborn_bookmark() {
let output = work_dir.run_jj(["new"]); let output = work_dir.run_jj(["new"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: wqnwkozp 101e2723 (empty) (no description set) Working copy (@) now at: wqnwkozp 101e2723 (empty) (no description set)
Parent commit : znkkpsqq fc8af934 (no description set) Parent commit (@-) : znkkpsqq fc8af934 (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -388,8 +388,8 @@ fn test_git_colocated_rebase_on_import() {
------- stderr ------- ------- stderr -------
Abandoned 1 commits that are no longer reachable. Abandoned 1 commits that are no longer reachable.
Rebased 1 descendant commits off of commits rewritten from git Rebased 1 descendant commits off of commits rewritten from git
Working copy now at: zsuskuln 15b1d70c (empty) (no description set) Working copy (@) now at: zsuskuln 15b1d70c (empty) (no description set)
Parent commit : qpvuntsm 47fe984d master | add a file Parent commit (@-) : qpvuntsm 47fe984d master | add a file
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Done importing changes from the underlying Git repo. Done importing changes from the underlying Git repo.
[EOF] [EOF]
@ -453,8 +453,8 @@ fn test_git_colocated_bookmarks() {
[EOF] [EOF]
------- stderr ------- ------- stderr -------
Abandoned 1 commits that are no longer reachable. Abandoned 1 commits that are no longer reachable.
Working copy now at: yqosqzyt 096dc80d (empty) (no description set) Working copy (@) now at: yqosqzyt 096dc80d (empty) (no description set)
Parent commit : qpvuntsm 230dd059 (empty) (no description set) Parent commit (@-) : qpvuntsm 230dd059 (empty) (no description set)
Done importing changes from the underlying Git repo. Done importing changes from the underlying Git repo.
[EOF] [EOF]
"); ");
@ -597,8 +597,8 @@ fn test_git_colocated_checkout_non_empty_working_copy() {
let output = work_dir.run_jj(["describe", "-m", "new"]); let output = work_dir.run_jj(["describe", "-m", "new"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kkmpptxz acea3383 (empty) new Working copy (@) now at: kkmpptxz acea3383 (empty) new
Parent commit : slsumksp 97358f54 master | initial Parent commit (@-) : slsumksp 97358f54 master | initial
[EOF] [EOF]
"); ");
@ -707,8 +707,8 @@ fn test_git_colocated_rebase_dirty_working_copy() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
Working copy changes: Working copy changes:
M file M file
Working copy : rlvkpnrz 6bad94b1 feature?? | (no description set) Working copy (@) : rlvkpnrz 6bad94b1 feature?? | (no description set)
Parent commit: qpvuntsm 3230d522 (no description set) Parent commit (@-): qpvuntsm 3230d522 (no description set)
Warning: These bookmarks have conflicts: Warning: These bookmarks have conflicts:
feature feature
Hint: Use `jj bookmark list` to see details. Use `jj bookmark set <name> -r <rev>` to resolve. Hint: Use `jj bookmark list` to see details. Use `jj bookmark set <name> -r <rev>` to resolve.
@ -836,8 +836,8 @@ fn test_git_colocated_concurrent_checkout() {
------- stderr ------- ------- stderr -------
Warning: Failed to update Git HEAD ref Warning: Failed to update Git HEAD ref
Caused by: The reference "HEAD" should have content 58a6206c70b53dfc30dc2f8c9e3713034cfc323e, actual content was 363a08cf5e683485227336e24a006e0deac341bc Caused by: The reference "HEAD" should have content 58a6206c70b53dfc30dc2f8c9e3713034cfc323e, actual content was 363a08cf5e683485227336e24a006e0deac341bc
Working copy now at: mzvwutvl 6b3bc9c8 (empty) (no description set) Working copy (@) now at: mzvwutvl 6b3bc9c8 (empty) (no description set)
Parent commit : zsuskuln 7d358222 (empty) commit3 Parent commit (@-) : zsuskuln 7d358222 (empty) commit3
[EOF] [EOF]
"#); "#);
@ -963,8 +963,8 @@ fn test_git_colocated_undo_head_move() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Undid operation: b50ec983d1c1 (2001-02-03 08:05:13) new empty commit Undid operation: b50ec983d1c1 (2001-02-03 08:05:13) new empty commit
Working copy now at: royxmykx eb08b363 (empty) (no description set) Working copy (@) now at: royxmykx eb08b363 (empty) (no description set)
Parent commit : qpvuntsm 230dd059 (empty) (no description set) Parent commit (@-) : qpvuntsm 230dd059 (empty) (no description set)
[EOF] [EOF]
"); ");
assert!(git_repo.head().unwrap().is_detached()); assert!(git_repo.head().unwrap().is_detached());
@ -1602,13 +1602,13 @@ fn test_git_colocated_operation_cleanup() {
// Reset the Git HEAD with Jujutsu. // Reset the Git HEAD with Jujutsu.
let output = work_dir.run_jj(["new", "main"]); let output = work_dir.run_jj(["new", "main"]);
insta::assert_snapshot!(output, @r#" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kmkuslsw 92667528 (empty) (no description set) Working copy (@) now at: kmkuslsw 92667528 (empty) (no description set)
Parent commit : kkmpptxz 52fef888 main | 2 Parent commit (@-) : kkmpptxz 52fef888 main | 2
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"#); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r#" insta::assert_snapshot!(get_log_output(&work_dir), @r#"
@ 926675286938f585d83b3646a95df96206968e8c @ 926675286938f585d83b3646a95df96206968e8c
│ ○ fbb4e341d1e7e1d3b87377c075bd8a407305ba3a │ ○ fbb4e341d1e7e1d3b87377c075bd8a407305ba3a

4
cli/tests/test_git_import_export.rs
View File

@ -274,8 +274,8 @@ fn test_git_import_move_export_with_default_undo() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Restored to operation: eac759b9ab75 (2001-02-03 08:05:07) add workspace 'default' Restored to operation: eac759b9ab75 (2001-02-03 08:05:07) add workspace 'default'
Working copy now at: qpvuntsm 230dd059 (empty) (no description set) Working copy (@) now at: qpvuntsm 230dd059 (empty) (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_bookmark_output(&work_dir), @""); insta::assert_snapshot!(get_bookmark_output(&work_dir), @"");

8
cli/tests/test_git_init.rs
View File

@ -137,8 +137,8 @@ fn test_git_init_external(bare: bool) {
insta::assert_snapshot!(output, @r#" insta::assert_snapshot!(output, @r#"
------- stderr ------- ------- stderr -------
Done importing changes from the underlying Git repo. Done importing changes from the underlying Git repo.
Working copy now at: sqpuoqvx 0bd37cef (empty) (no description set) Working copy (@) now at: sqpuoqvx 0bd37cef (empty) (no description set)
Parent commit : nntyzxmz e80a42cc my-bookmark | My commit message Parent commit (@-) : nntyzxmz e80a42cc my-bookmark | My commit message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
Initialized repo in "repo" Initialized repo in "repo"
[EOF] [EOF]
@ -215,8 +215,8 @@ fn test_git_init_external_import_trunk(bare: bool) {
------- stderr ------- ------- stderr -------
Done importing changes from the underlying Git repo. Done importing changes from the underlying Git repo.
Setting the revset alias `trunk()` to `trunk@origin` Setting the revset alias `trunk()` to `trunk@origin`
Working copy now at: sqpuoqvx 0bd37cef (empty) (no description set) Working copy (@) now at: sqpuoqvx 0bd37cef (empty) (no description set)
Parent commit : nntyzxmz e80a42cc my-bookmark trunk@origin | My commit message Parent commit (@-) : nntyzxmz e80a42cc my-bookmark trunk@origin | My commit message
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
Initialized repo in "repo" Initialized repo in "repo"
[EOF] [EOF]

16
cli/tests/test_git_private_commits.rs
View File

@ -108,8 +108,8 @@ fn test_git_private_commits_block_pushing() {
Changes to push to origin: Changes to push to origin:
Move forward bookmark main from 7eb97bf230ad to aa3058ff8663 Move forward bookmark main from 7eb97bf230ad to aa3058ff8663
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 'default' became immutable, so a new commit has been created on top of it.
Working copy now at: znkkpsqq 2e1adf47 (empty) (no description set) Working copy (@) now at: znkkpsqq 2e1adf47 (empty) (no description set)
Parent commit : yqosqzyt aa3058ff main | (empty) private 1 Parent commit (@-) : yqosqzyt aa3058ff main | (empty) private 1
[EOF] [EOF]
"); ");
} }
@ -144,8 +144,8 @@ fn test_git_private_commits_can_be_overridden() {
Changes to push to origin: Changes to push to origin:
Move forward bookmark main from 7eb97bf230ad to aa3058ff8663 Move forward bookmark main from 7eb97bf230ad to aa3058ff8663
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 'default' became immutable, so a new commit has been created on top of it.
Working copy now at: znkkpsqq 2e1adf47 (empty) (no description set) Working copy (@) now at: znkkpsqq 2e1adf47 (empty) (no description set)
Parent commit : yqosqzyt aa3058ff main | (empty) private 1 Parent commit (@-) : yqosqzyt aa3058ff main | (empty) private 1
[EOF] [EOF]
"); ");
} }
@ -169,8 +169,8 @@ fn test_git_private_commits_are_not_checked_if_immutable() {
Changes to push to origin: Changes to push to origin:
Move forward bookmark main from 7eb97bf230ad to aa3058ff8663 Move forward bookmark main from 7eb97bf230ad to aa3058ff8663
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 'default' became immutable, so a new commit has been created on top of it.
Working copy now at: yostqsxw dce4a15c (empty) (no description set) Working copy (@) now at: yostqsxw dce4a15c (empty) (no description set)
Parent commit : yqosqzyt aa3058ff main | (empty) private 1 Parent commit (@-) : yqosqzyt aa3058ff main | (empty) private 1
[EOF] [EOF]
"); ");
} }
@ -250,8 +250,8 @@ fn test_git_private_commits_already_on_the_remote_do_not_block_push() {
Move forward bookmark main from 7eb97bf230ad to fbb352762352 Move forward bookmark main from 7eb97bf230ad to fbb352762352
Add bookmark bookmark1 to 7eb97bf230ad Add bookmark bookmark1 to 7eb97bf230ad
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 'default' became immutable, so a new commit has been created on top of it.
Working copy now at: kpqxywon a7b08364 (empty) (no description set) Working copy (@) now at: kpqxywon a7b08364 (empty) (no description set)
Parent commit : yostqsxw fbb35276 main | (empty) public 3 Parent commit (@-) : yostqsxw fbb35276 main | (empty) public 3
[EOF] [EOF]
"); ");

12
cli/tests/test_git_push.rs
View File

@ -1025,8 +1025,8 @@ fn test_git_push_changes(subprocess: bool) {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
Working copy changes: Working copy changes:
M file M file
Working copy : yostqsxw 38cb417c bar Working copy (@) : yostqsxw 38cb417c bar
Parent commit: yqosqzyt a050abf4 push-yostqsxwqrlt* push-yqosqzytrlsw | foo Parent commit (@-): yqosqzyt a050abf4 push-yostqsxwqrlt* push-yqosqzytrlsw | foo
[EOF] [EOF]
"); ");
} }
@ -1044,8 +1044,8 @@ fn test_git_push_changes(subprocess: bool) {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
Working copy changes: Working copy changes:
M file M file
Working copy : yostqsxw 38cb417c push-yostqsxwqrlt | bar Working copy (@) : yostqsxw 38cb417c push-yostqsxwqrlt | bar
Parent commit: yqosqzyt a050abf4 push-yqosqzytrlsw | foo Parent commit (@-): yqosqzyt a050abf4 push-yqosqzytrlsw | foo
[EOF] [EOF]
"); ");
} }
@ -2458,8 +2458,8 @@ fn test_git_push_sign_on_push() {
Rebased 2 descendant commits Rebased 2 descendant commits
Changes to push to origin: Changes to push to origin:
Move forward bookmark bookmark2 from 8476341eb395 to a6259c482040 Move forward bookmark bookmark2 from 8476341eb395 to a6259c482040
Working copy now at: kmkuslsw b5f47345 (empty) commit which should not be signed 2 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 Parent commit (@-) : kpqxywon 90df08d3 (empty) commit which should not be signed 1
[EOF] [EOF]
"); ");
// Only commits which are being pushed should be signed // Only commits which are being pushed should be signed

4
cli/tests/test_gitignores.rs
View File

@ -133,8 +133,8 @@ fn test_gitignores_ignored_file_in_target_commit() {
let output = work_dir.run_jj(["edit", "with-file"]); let output = work_dir.run_jj(["edit", "with-file"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 5ada929e with-file | (no description set) Working copy (@) now at: qpvuntsm 5ada929e with-file | (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 1 files, modified 0 files, removed 0 files 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. 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`. Hint: Inspect the changes compared to the intended target with `jj diff --from 5ada929e5d2e`.

40
cli/tests/test_global_opts.rs
View File

@ -130,8 +130,8 @@ fn test_no_subcommand() {
let output = work_dir.run_jj([""; 0]); let output = work_dir.run_jj([""; 0]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kxryzmor 89c70edf (empty) (no description set) Working copy (@) now at: kxryzmor 89c70edf (empty) (no description set)
Parent commit : lylxulpl 51bd3589 foo Parent commit (@-) : lylxulpl 51bd3589 foo
[EOF] [EOF]
"); ");
} }
@ -200,8 +200,8 @@ fn test_resolve_workspace_directory() {
let output = sub_dir.run_jj(["status"]); let output = sub_dir.run_jj(["status"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
The working copy has no changes. The working copy has no changes.
Working copy : qpvuntsm 230dd059 (empty) (no description set) Working copy (@) : qpvuntsm 230dd059 (empty) (no description set)
Parent commit: zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -218,8 +218,8 @@ fn test_resolve_workspace_directory() {
let output = sub_dir.run_jj(["status", "-R", "../.."]); let output = sub_dir.run_jj(["status", "-R", "../.."]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
The working copy has no changes. The working copy has no changes.
Working copy : qpvuntsm 230dd059 (empty) (no description set) Working copy (@) : qpvuntsm 230dd059 (empty) (no description set)
Parent commit: zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -596,8 +596,8 @@ fn test_color_ui_messages() {
let output = work_dir.run_jj(["st", "--color", "debug"]); let output = work_dir.run_jj(["st", "--color", "debug"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
The working copy has no changes. 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)>> 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)>> 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)>>
[EOF] [EOF]
"); ");
} }
@ -867,15 +867,15 @@ fn test_conditional_config() {
let output = test_env.run_jj_in(&test_env.home_dir().join("repo1"), ["foo"]); let output = test_env.run_jj_in(&test_env.home_dir().join("repo1"), ["foo"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: royxmykx 82899b03 (empty) repo1 Working copy (@) now at: royxmykx 82899b03 (empty) repo1
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
let output = test_env.run_jj_in(&test_env.home_dir().join("repo2"), ["foo"]); let output = test_env.run_jj_in(&test_env.home_dir().join("repo2"), ["foo"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: yqosqzyt 3bd315a9 (empty) home Working copy (@) now at: yqosqzyt 3bd315a9 (empty) home
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
} }
@ -955,8 +955,8 @@ fn test_default_config() {
let output = run_jj(&work_dir, &["new"]); let output = run_jj(&work_dir, &["new"]);
insta::assert_snapshot!(output, @r#" insta::assert_snapshot!(output, @r#"
------- stderr ------- ------- stderr -------
Working copy now at: <change-id> <id> (empty) (no description set) Working copy (@) now at: <change-id> <id> (empty) (no description set)
Parent commit : <change-id> <id> (empty) (no description set) Parent commit (@-) : <change-id> <id> (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. 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: Hint: To configure, run:
jj config set --user user.name "Some One" jj config set --user user.name "Some One"
@ -1003,8 +1003,8 @@ fn test_no_user_configured() {
}); });
insta::assert_snapshot!(output, @r#" insta::assert_snapshot!(output, @r#"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 7a7d6016 (empty) without name Working copy (@) now at: qpvuntsm 7a7d6016 (empty) without name
Parent commit : zzzzzzzz 00000000 (empty) (no description set) 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. 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: Hint: To configure, run:
jj config set --user user.name "Some One" jj config set --user user.name "Some One"
@ -1016,8 +1016,8 @@ fn test_no_user_configured() {
}); });
insta::assert_snapshot!(output, @r#" insta::assert_snapshot!(output, @r#"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 906f8b89 (empty) without email Working copy (@) now at: qpvuntsm 906f8b89 (empty) without email
Parent commit : zzzzzzzz 00000000 (empty) (no description set) 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. 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: Hint: To configure, run:
jj config set --user user.email "someone@example.com" jj config set --user user.email "someone@example.com"
@ -1030,8 +1030,8 @@ fn test_no_user_configured() {
}); });
insta::assert_snapshot!(output, @r#" insta::assert_snapshot!(output, @r#"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm 57d3a489 (empty) without name and email Working copy (@) now at: qpvuntsm 57d3a489 (empty) without name and email
Parent commit : zzzzzzzz 00000000 (empty) (no description set) 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. 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: Hint: To configure, run:
jj config set --user user.name "Some One" jj config set --user user.name "Some One"

20
cli/tests/test_immutable_commits.rs
View File

@ -99,8 +99,8 @@ fn test_rewrite_immutable_generic() {
let output = work_dir.run_jj(["--ignore-immutable", "edit", "main"]); let output = work_dir.run_jj(["--ignore-immutable", "edit", "main"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kkmpptxz 72e1b68c main | b Working copy (@) now at: kkmpptxz 72e1b68c main | b
Parent commit : qpvuntsm b84b821b a Parent commit (@-) : qpvuntsm b84b821b a
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -120,8 +120,8 @@ fn test_rewrite_immutable_generic() {
let output = work_dir.run_jj(["new", "main"]); let output = work_dir.run_jj(["new", "main"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: wqnwkozp fc921593 (empty) (no description set) Working copy (@) now at: wqnwkozp fc921593 (empty) (no description set)
Parent commit : kkmpptxz 72e1b68c main | b Parent commit (@-) : kkmpptxz 72e1b68c main | b
[EOF] [EOF]
"); ");
@ -151,8 +151,8 @@ fn test_new_wc_commit_when_wc_immutable() {
------- stderr ------- ------- stderr -------
Moved 1 bookmarks to kkmpptxz a164195b main | (empty) a Moved 1 bookmarks to kkmpptxz a164195b 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 'default' became immutable, so a new commit has been created on top of it.
Working copy now at: zsuskuln ef5fa85b (empty) (no description set) Working copy (@) now at: zsuskuln ef5fa85b (empty) (no description set)
Parent commit : kkmpptxz a164195b main | (empty) a Parent commit (@-) : kkmpptxz a164195b main | (empty) a
[EOF] [EOF]
"); ");
} }
@ -170,8 +170,8 @@ fn test_immutable_heads_set_to_working_copy() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
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 'default' became immutable, so a new commit has been created on top of it.
Working copy now at: pmmvwywv 7278b2d8 (empty) (no description set) Working copy (@) now at: pmmvwywv 7278b2d8 (empty) (no description set)
Parent commit : kkmpptxz a713ef56 (empty) a Parent commit (@-) : kkmpptxz a713ef56 (empty) a
[EOF] [EOF]
"); ");
} }
@ -197,8 +197,8 @@ fn test_new_wc_commit_when_wc_immutable_multi_workspace() {
Moved 1 bookmarks to kkmpptxz 7796c4df main | (empty) a Moved 1 bookmarks to kkmpptxz 7796c4df 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 '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. 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) Working copy (@) now at: royxmykx 896465c4 (empty) (no description set)
Parent commit : kkmpptxz 7796c4df main | (empty) a Parent commit (@-) : kkmpptxz 7796c4df main | (empty) a
[EOF] [EOF]
"); ");
workspace1_dir workspace1_dir

34
cli/tests/test_new_command.rs
View File

@ -148,8 +148,8 @@ fn test_new_merge() {
let output = work_dir.run_jj(["new", "@", "all:visible_heads()"]); let output = work_dir.run_jj(["new", "@", "all:visible_heads()"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: nkmrtpmo ed2dc1d9 (empty) (no description set) Working copy (@) now at: nkmrtpmo ed2dc1d9 (empty) (no description set)
Parent commit : wqnwkozp 11402323 (empty) (no description set) Parent commit (@-) : wqnwkozp 11402323 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -188,9 +188,9 @@ fn test_new_insert_after() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: kxryzmor 1fc93fd1 (empty) G Working copy (@) now at: kxryzmor 1fc93fd1 (empty) G
Parent commit : kkmpptxz bfd4157e B | (empty) B Parent commit (@-) : kkmpptxz bfd4157e B | (empty) B
Parent commit : vruxwmqv c9257eff D | (empty) D Parent commit (@-) : vruxwmqv c9257eff D | (empty) D
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_short_log_output(&work_dir), @r" insta::assert_snapshot!(get_short_log_output(&work_dir), @r"
@ -213,8 +213,8 @@ fn test_new_insert_after() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: uyznsvlq fcf8281b (empty) H Working copy (@) now at: uyznsvlq fcf8281b (empty) H
Parent commit : vruxwmqv c9257eff D | (empty) D Parent commit (@-) : vruxwmqv c9257eff D | (empty) D
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_short_log_output(&work_dir), @r" insta::assert_snapshot!(get_short_log_output(&work_dir), @r"
@ -319,10 +319,10 @@ fn test_new_insert_before() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: kxryzmor 7ed2d6ff (empty) G Working copy (@) now at: kxryzmor 7ed2d6ff (empty) G
Parent commit : kkmpptxz bfd4157e B | (empty) B Parent commit (@-) : kkmpptxz bfd4157e B | (empty) B
Parent commit : vruxwmqv c9257eff D | (empty) D Parent commit (@-) : vruxwmqv c9257eff D | (empty) D
Parent commit : znkkpsqq 41a89ffc E | (empty) E Parent commit (@-) : znkkpsqq 41a89ffc E | (empty) E
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_short_log_output(&work_dir), @r" insta::assert_snapshot!(get_short_log_output(&work_dir), @r"
@ -387,8 +387,8 @@ fn test_new_insert_before_root_successors() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 5 descendant commits Rebased 5 descendant commits
Working copy now at: kxryzmor 36541977 (empty) G Working copy (@) now at: kxryzmor 36541977 (empty) G
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_short_log_output(&work_dir), @r" insta::assert_snapshot!(get_short_log_output(&work_dir), @r"
@ -536,8 +536,8 @@ fn test_new_insert_after_before() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: kxryzmor 78a97058 (empty) G Working copy (@) now at: kxryzmor 78a97058 (empty) G
Parent commit : mzvwutvl 83376b27 C | (empty) C Parent commit (@-) : mzvwutvl 83376b27 C | (empty) C
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_short_log_output(&work_dir), @r" 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" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 4 descendant commits Rebased 4 descendant commits
Working copy now at: uyznsvlq fcf8281b (empty) H Working copy (@) now at: uyznsvlq fcf8281b (empty) H
Parent commit : vruxwmqv c9257eff D | (empty) D Parent commit (@-) : vruxwmqv c9257eff D | (empty) D
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_short_log_output(&work_dir), @r" insta::assert_snapshot!(get_short_log_output(&work_dir), @r"

106
cli/tests/test_next_prev_commands.rs
View File

@ -59,8 +59,8 @@ fn test_next_simple() {
let output = work_dir.run_jj(["next"]); let output = work_dir.run_jj(["next"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: vruxwmqv 0c7d7732 (empty) (no description set) Working copy (@) now at: vruxwmqv 0c7d7732 (empty) (no description set)
Parent commit : kkmpptxz 30056b0c (empty) third Parent commit (@-) : kkmpptxz 30056b0c (empty) third
[EOF] [EOF]
"); ");
@ -101,8 +101,8 @@ fn test_next_multiple() {
let output = work_dir.run_jj(["next", "2"]); let output = work_dir.run_jj(["next", "2"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: vruxwmqv 41cc776d (empty) (no description set) Working copy (@) now at: vruxwmqv 41cc776d (empty) (no description set)
Parent commit : zsuskuln 9d7e5e99 (empty) fourth Parent commit (@-) : zsuskuln 9d7e5e99 (empty) fourth
[EOF] [EOF]
"); ");
@ -138,8 +138,8 @@ fn test_prev_simple() {
let output = work_dir.run_jj(["prev"]); let output = work_dir.run_jj(["prev"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: royxmykx 6db74f64 (empty) (no description set) Working copy (@) now at: royxmykx 6db74f64 (empty) (no description set)
Parent commit : rlvkpnrz 9ed53a4a (empty) second Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
[EOF] [EOF]
"); ");
@ -177,8 +177,8 @@ fn test_prev_multiple_without_root() {
let output = work_dir.run_jj(["prev", "2"]); let output = work_dir.run_jj(["prev", "2"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: yqosqzyt 794ffd20 (empty) (no description set) Working copy (@) now at: yqosqzyt 794ffd20 (empty) (no description set)
Parent commit : rlvkpnrz 9ed53a4a (empty) second Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
[EOF] [EOF]
"); ");
@ -250,8 +250,8 @@ fn test_next_parent_has_multiple_descendants() {
let output = work_dir.run_jj(["next", "--edit"]); let output = work_dir.run_jj(["next", "--edit"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: mzvwutvl 1b8531ce (empty) 4 Working copy (@) now at: mzvwutvl 1b8531ce (empty) 4
Parent commit : zsuskuln b1394455 (empty) 3 Parent commit (@-) : zsuskuln b1394455 (empty) 3
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" 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"]); let output = work_dir.run_jj(["next"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: vruxwmqv e2cefcb7 (empty) (no description set) Working copy (@) now at: vruxwmqv e2cefcb7 (empty) (no description set)
Parent commit : mzvwutvl b54bbdea (empty) 4 Parent commit (@-) : mzvwutvl b54bbdea (empty) 4
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" 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"]); let output = work_dir.run_jj(["next", "--edit"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: mzvwutvl b54bbdea (empty) 4 Working copy (@) now at: mzvwutvl b54bbdea (empty) 4
Parent commit : zsuskuln 5542f0b4 (empty) 3 Parent commit (@-) : zsuskuln 5542f0b4 (empty) 3
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -447,8 +447,8 @@ fn test_next_choose_bookmarking_child() {
2: zsuskuln 5f24490d (empty) third 2: zsuskuln 5f24490d (empty) third
3: rlvkpnrz 9ed53a4a (empty) second 3: rlvkpnrz 9ed53a4a (empty) second
q: quit the prompt q: quit the prompt
enter the index of the commit you want to target: Working copy now at: yostqsxw 5c8fa96d (empty) (no description set) 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 Parent commit (@-) : zsuskuln 5f24490d (empty) third
[EOF] [EOF]
"); ");
} }
@ -478,8 +478,8 @@ fn test_prev_on_merge_commit() {
let output = work_dir.run_jj(["prev"]); let output = work_dir.run_jj(["prev"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: vruxwmqv 41658cf4 (empty) (no description set) Working copy (@) now at: vruxwmqv 41658cf4 (empty) (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -495,8 +495,8 @@ fn test_prev_on_merge_commit() {
1: zsuskuln b0d21db3 right | (empty) second 1: zsuskuln b0d21db3 right | (empty) second
2: qpvuntsm fa15625b left | (empty) first 2: qpvuntsm fa15625b left | (empty) first
q: quit the prompt 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 fa15625b left | (empty) first
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
} }
@ -539,8 +539,8 @@ fn test_prev_on_merge_commit_with_parent_merge() {
2: qpvuntsm 6799aaa2 (empty) x 2: qpvuntsm 6799aaa2 (empty) x
3: zzzzzzzz 00000000 (empty) (no description set) 3: zzzzzzzz 00000000 (empty) (no description set)
q: quit the prompt q: quit the prompt
enter the index of the commit you want to target: Working copy now at: vruxwmqv e5a6794c (empty) (no description set) 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 Parent commit (@-) : qpvuntsm 6799aaa2 (empty) x
[EOF] [EOF]
"); ");
@ -556,9 +556,9 @@ fn test_prev_on_merge_commit_with_parent_merge() {
1: mzvwutvl 89b8a355 (empty) 1 1: mzvwutvl 89b8a355 (empty) 1
2: zsuskuln a83fc061 (empty) z 2: zsuskuln a83fc061 (empty) z
q: quit the prompt q: quit the prompt
enter the index of the commit you want to target: Working copy now at: zsuskuln a83fc061 (empty) z 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 (@-) : qpvuntsm 6799aaa2 (empty) x
Parent commit : kkmpptxz 146d5c67 (empty) y Parent commit (@-) : kkmpptxz 146d5c67 (empty) y
[EOF] [EOF]
"); ");
} }
@ -606,8 +606,8 @@ fn test_prev_prompts_on_multiple_parents() {
2: kkmpptxz b0d21db3 (empty) second 2: kkmpptxz b0d21db3 (empty) second
3: qpvuntsm fa15625b (empty) first 3: qpvuntsm fa15625b (empty) first
q: quit the prompt q: quit the prompt
enter the index of the commit you want to target: Working copy now at: kpqxywon ddac00b0 (empty) (no description set) 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 Parent commit (@-) : qpvuntsm fa15625b (empty) first
[EOF] [EOF]
"); ");
@ -707,8 +707,8 @@ fn test_prev_editing() {
let output = work_dir.run_jj(["prev", "--edit"]); let output = work_dir.run_jj(["prev", "--edit"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kkmpptxz 30056b0c (empty) third Working copy (@) now at: kkmpptxz 30056b0c (empty) third
Parent commit : rlvkpnrz 9ed53a4a (empty) second Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
[EOF] [EOF]
"); ");
@ -746,8 +746,8 @@ fn test_next_editing() {
let output = work_dir.run_jj(["next", "--edit"]); let output = work_dir.run_jj(["next", "--edit"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kkmpptxz 30056b0c (empty) third Working copy (@) now at: kkmpptxz 30056b0c (empty) third
Parent commit : rlvkpnrz 9ed53a4a (empty) second Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
[EOF] [EOF]
"); ");
@ -975,8 +975,8 @@ fn test_movement_edit_mode_true() {
let output = work_dir.run_jj(["prev"]); let output = work_dir.run_jj(["prev"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: rlvkpnrz 9ed53a4a (empty) second Working copy (@) now at: rlvkpnrz 9ed53a4a (empty) second
Parent commit : qpvuntsm fa15625b (empty) first Parent commit (@-) : qpvuntsm fa15625b (empty) first
[EOF] [EOF]
"); ");
@ -991,8 +991,8 @@ fn test_movement_edit_mode_true() {
let output = work_dir.run_jj(["prev"]); let output = work_dir.run_jj(["prev"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: qpvuntsm fa15625b (empty) first Working copy (@) now at: qpvuntsm fa15625b (empty) first
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -1015,8 +1015,8 @@ fn test_movement_edit_mode_true() {
let output = work_dir.run_jj(["next"]); let output = work_dir.run_jj(["next"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: rlvkpnrz 9ed53a4a (empty) second Working copy (@) now at: rlvkpnrz 9ed53a4a (empty) second
Parent commit : qpvuntsm fa15625b (empty) first Parent commit (@-) : qpvuntsm fa15625b (empty) first
[EOF] [EOF]
"); ");
@ -1031,8 +1031,8 @@ fn test_movement_edit_mode_true() {
let output = work_dir.run_jj(["next"]); let output = work_dir.run_jj(["next"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kkmpptxz 30056b0c (empty) third Working copy (@) now at: kkmpptxz 30056b0c (empty) third
Parent commit : rlvkpnrz 9ed53a4a (empty) second Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
[EOF] [EOF]
"); ");
@ -1047,8 +1047,8 @@ fn test_movement_edit_mode_true() {
let output = work_dir.run_jj(["prev", "--no-edit"]); let output = work_dir.run_jj(["prev", "--no-edit"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: uyznsvlq 7ad57fb8 (empty) (no description set) Working copy (@) now at: uyznsvlq 7ad57fb8 (empty) (no description set)
Parent commit : qpvuntsm fa15625b (empty) first Parent commit (@-) : qpvuntsm fa15625b (empty) first
[EOF] [EOF]
"); ");
@ -1065,8 +1065,8 @@ fn test_movement_edit_mode_true() {
let output = work_dir.run_jj(["next", "--no-edit"]); let output = work_dir.run_jj(["next", "--no-edit"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: xtnwkqum 7ac7a1c4 (empty) (no description set) Working copy (@) now at: xtnwkqum 7ac7a1c4 (empty) (no description set)
Parent commit : rlvkpnrz 9ed53a4a (empty) second Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
[EOF] [EOF]
"); ");
@ -1125,8 +1125,8 @@ fn test_movement_edit_mode_false() {
let output = work_dir.run_jj(["prev", "--no-edit"]); let output = work_dir.run_jj(["prev", "--no-edit"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: vruxwmqv 087a65b1 (empty) (no description set) Working copy (@) now at: vruxwmqv 087a65b1 (empty) (no description set)
Parent commit : qpvuntsm fa15625b (empty) first Parent commit (@-) : qpvuntsm fa15625b (empty) first
[EOF] [EOF]
"); ");
@ -1152,8 +1152,8 @@ fn test_movement_edit_mode_false() {
let output = work_dir.run_jj(["next"]); let output = work_dir.run_jj(["next"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kpqxywon d06750fb (empty) (no description set) Working copy (@) now at: kpqxywon d06750fb (empty) (no description set)
Parent commit : rlvkpnrz 9ed53a4a (empty) second Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
[EOF] [EOF]
"); ");
@ -1170,16 +1170,16 @@ fn test_movement_edit_mode_false() {
let output = work_dir.run_jj(["next", "--no-edit"]); let output = work_dir.run_jj(["next", "--no-edit"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: wqnwkozp 10fa181f (empty) (no description set) Working copy (@) now at: wqnwkozp 10fa181f (empty) (no description set)
Parent commit : kkmpptxz 30056b0c (empty) third Parent commit (@-) : kkmpptxz 30056b0c (empty) third
[EOF] [EOF]
"); ");
let output = work_dir.run_jj(["prev", "--edit", "2"]); let output = work_dir.run_jj(["prev", "--edit", "2"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: rlvkpnrz 9ed53a4a (empty) second Working copy (@) now at: rlvkpnrz 9ed53a4a (empty) second
Parent commit : qpvuntsm fa15625b (empty) first Parent commit (@-) : qpvuntsm fa15625b (empty) first
[EOF] [EOF]
"); ");
@ -1194,8 +1194,8 @@ fn test_movement_edit_mode_false() {
let output = work_dir.run_jj(["next", "--edit"]); let output = work_dir.run_jj(["next", "--edit"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kkmpptxz 30056b0c (empty) third Working copy (@) now at: kkmpptxz 30056b0c (empty) third
Parent commit : rlvkpnrz 9ed53a4a (empty) second Parent commit (@-) : rlvkpnrz 9ed53a4a (empty) second
[EOF] [EOF]
"); ");

40
cli/tests/test_operations.rs
View File

@ -1426,8 +1426,8 @@ fn test_op_diff() {
let output = work_dir.run_jj(["new", "bookmark-1@origin", "-m", "new commit"]); let output = work_dir.run_jj(["new", "bookmark-1@origin", "-m", "new commit"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: wvuyspvk fefb1e17 (empty) new commit Working copy (@) now at: wvuyspvk fefb1e17 (empty) new commit
Parent commit : zkmtkqvo 0dee6313 bookmark-1?? bookmark-1@origin | Commit 4 Parent commit (@-) : zkmtkqvo 0dee6313 bookmark-1?? bookmark-1@origin | Commit 4
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1493,8 +1493,8 @@ fn test_op_diff() {
Move forward bookmark bookmark-1 from 0dee631320b1 to fefb1e17c853 Move forward bookmark bookmark-1 from 0dee631320b1 to fefb1e17c853
Delete bookmark bookmark-2 from e1a239a57eb1 Delete bookmark bookmark-2 from e1a239a57eb1
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 'default' became immutable, so a new commit has been created on top of it.
Working copy now at: oupztwtk fe3ad088 (empty) (no description set) Working copy (@) now at: oupztwtk fe3ad088 (empty) (no description set)
Parent commit : wvuyspvk fefb1e17 bookmark-1 | (empty) new commit Parent commit (@-) : wvuyspvk fefb1e17 bookmark-1 | (empty) new commit
[EOF] [EOF]
"); ");
let output = work_dir.run_jj(["op", "diff"]); let output = work_dir.run_jj(["op", "diff"]);
@ -1531,8 +1531,8 @@ fn test_op_diff_patch() {
let output = work_dir.run_jj(["new"]); let output = work_dir.run_jj(["new"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: rlvkpnrz 56950632 (empty) (no description set) Working copy (@) now at: rlvkpnrz 56950632 (empty) (no description set)
Parent commit : qpvuntsm 6b1027d2 (no description set) Parent commit (@-) : qpvuntsm 6b1027d2 (no description set)
[EOF] [EOF]
"); ");
let output = work_dir.run_jj(["op", "diff", "--op", "@-", "-p", "--git"]); let output = work_dir.run_jj(["op", "diff", "--op", "@-", "-p", "--git"]);
@ -1575,8 +1575,8 @@ fn test_op_diff_patch() {
let output = work_dir.run_jj(["squash"]); let output = work_dir.run_jj(["squash"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: mzvwutvl 9f4fb57f (empty) (no description set) Working copy (@) now at: mzvwutvl 9f4fb57f (empty) (no description set)
Parent commit : qpvuntsm 2ac85fd1 (no description set) Parent commit (@-) : qpvuntsm 2ac85fd1 (no description set)
[EOF] [EOF]
"); ");
let output = work_dir.run_jj(["op", "diff", "-p", "--git"]); let output = work_dir.run_jj(["op", "diff", "-p", "--git"]);
@ -1616,8 +1616,8 @@ fn test_op_diff_patch() {
------- stderr ------- ------- stderr -------
Abandoned 1 commits: Abandoned 1 commits:
mzvwutvl 9f4fb57f (empty) (no description set) mzvwutvl 9f4fb57f (empty) (no description set)
Working copy now at: yqosqzyt 33f321c4 (empty) (no description set) Working copy (@) now at: yqosqzyt 33f321c4 (empty) (no description set)
Parent commit : qpvuntsm 2ac85fd1 (no description set) Parent commit (@-) : qpvuntsm 2ac85fd1 (no description set)
[EOF] [EOF]
"); ");
let output = work_dir.run_jj(["op", "diff", "-p", "--git"]); let output = work_dir.run_jj(["op", "diff", "-p", "--git"]);
@ -2146,8 +2146,8 @@ fn test_op_show() {
let output = work_dir.run_jj(["new", "bookmark-1@origin", "-m", "new commit"]); let output = work_dir.run_jj(["new", "bookmark-1@origin", "-m", "new commit"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: xznxytkn 560df364 (empty) new commit Working copy (@) now at: xznxytkn 560df364 (empty) new commit
Parent commit : zkmtkqvo 0dee6313 bookmark-1?? bookmark-1@origin | Commit 4 Parent commit (@-) : zkmtkqvo 0dee6313 bookmark-1?? bookmark-1@origin | Commit 4
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -2216,8 +2216,8 @@ fn test_op_show() {
Move forward bookmark bookmark-1 from 0dee631320b1 to 560df364f0a0 Move forward bookmark bookmark-1 from 0dee631320b1 to 560df364f0a0
Delete bookmark bookmark-2 from e1a239a57eb1 Delete bookmark bookmark-2 from e1a239a57eb1
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 'default' became immutable, so a new commit has been created on top of it.
Working copy now at: pzsxstzt 91310b51 (empty) (no description set) Working copy (@) now at: pzsxstzt 91310b51 (empty) (no description set)
Parent commit : xznxytkn 560df364 bookmark-1 | (empty) new commit Parent commit (@-) : xznxytkn 560df364 bookmark-1 | (empty) new commit
[EOF] [EOF]
"); ");
let output = work_dir.run_jj(["op", "show"]); let output = work_dir.run_jj(["op", "show"]);
@ -2255,8 +2255,8 @@ fn test_op_show_patch() {
let output = work_dir.run_jj(["new"]); let output = work_dir.run_jj(["new"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: rlvkpnrz 56950632 (empty) (no description set) Working copy (@) now at: rlvkpnrz 56950632 (empty) (no description set)
Parent commit : qpvuntsm 6b1027d2 (no description set) Parent commit (@-) : qpvuntsm 6b1027d2 (no description set)
[EOF] [EOF]
"); ");
let output = work_dir.run_jj(["op", "show", "@-", "-p", "--git"]); let output = work_dir.run_jj(["op", "show", "@-", "-p", "--git"]);
@ -2301,8 +2301,8 @@ fn test_op_show_patch() {
let output = work_dir.run_jj(["squash"]); let output = work_dir.run_jj(["squash"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: mzvwutvl 9f4fb57f (empty) (no description set) Working copy (@) now at: mzvwutvl 9f4fb57f (empty) (no description set)
Parent commit : qpvuntsm 2ac85fd1 (no description set) Parent commit (@-) : qpvuntsm 2ac85fd1 (no description set)
[EOF] [EOF]
"); ");
let output = work_dir.run_jj(["op", "show", "-p", "--git"]); let output = work_dir.run_jj(["op", "show", "-p", "--git"]);
@ -2343,8 +2343,8 @@ fn test_op_show_patch() {
------- stderr ------- ------- stderr -------
Abandoned 1 commits: Abandoned 1 commits:
mzvwutvl 9f4fb57f (empty) (no description set) mzvwutvl 9f4fb57f (empty) (no description set)
Working copy now at: yqosqzyt 33f321c4 (empty) (no description set) Working copy (@) now at: yqosqzyt 33f321c4 (empty) (no description set)
Parent commit : qpvuntsm 2ac85fd1 (no description set) Parent commit (@-) : qpvuntsm 2ac85fd1 (no description set)
[EOF] [EOF]
"); ");
let output = work_dir.run_jj(["op", "show", "-p", "--git"]); let output = work_dir.run_jj(["op", "show", "-p", "--git"]);

6
cli/tests/test_parallelize_command.rs
View File

@ -638,9 +638,9 @@ fn test_parallelize_complex_nonlinear_target() {
let output = work_dir.run_jj(["parallelize", "description(0)::description(4)"]); let output = work_dir.run_jj(["parallelize", "description(0)::description(4)"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: yostqsxw 59a216e5 (empty) 3c Working copy (@) now at: yostqsxw 59a216e5 (empty) 3c
Parent commit : rlvkpnrz 745bea80 (empty) 0 Parent commit (@-) : rlvkpnrz 745bea80 (empty) 0
Parent commit : mzvwutvl cb944786 (empty) 3 Parent commit (@-) : mzvwutvl cb944786 (empty) 3
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"

296
cli/tests/test_rebase_command.rs
View File

@ -207,8 +207,8 @@ fn test_rebase_bookmark() {
------- stderr ------- ------- stderr -------
Skipped rebase of 1 commits that were already in place Skipped rebase of 1 commits that were already in place
Rebased 1 commits onto destination Rebased 1 commits onto destination
Working copy now at: znkkpsqq 9ca2a154 e | e Working copy (@) now at: znkkpsqq 9ca2a154 e | e
Parent commit : zsuskuln 1394f625 b | b Parent commit (@-) : zsuskuln 1394f625 b | b
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -242,8 +242,8 @@ fn test_rebase_bookmark() {
------- stderr ------- ------- stderr -------
Skipped rebase of 1 commits that were already in place Skipped rebase of 1 commits that were already in place
Rebased 1 commits onto destination Rebased 1 commits onto destination
Working copy now at: znkkpsqq 817e3fb0 e | e Working copy (@) now at: znkkpsqq 817e3fb0 e | e
Parent commit : zsuskuln 1394f625 b | b Parent commit (@-) : zsuskuln 1394f625 b | b
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -289,9 +289,9 @@ fn test_rebase_bookmark_with_merge() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Working copy now at: znkkpsqq 5f8a3db2 e | e Working copy (@) now at: znkkpsqq 5f8a3db2 e | e
Parent commit : rlvkpnrz 2443ea76 a | a Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Parent commit : vruxwmqv 1677f795 d | d Parent commit (@-) : vruxwmqv 1677f795 d | d
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -312,9 +312,9 @@ fn test_rebase_bookmark_with_merge() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Working copy now at: znkkpsqq a331ac11 e | e Working copy (@) now at: znkkpsqq a331ac11 e | e
Parent commit : rlvkpnrz 2443ea76 a | a Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Parent commit : vruxwmqv 3d0f3644 d | d Parent commit (@-) : vruxwmqv 3d0f3644 d | d
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -362,8 +362,8 @@ fn test_rebase_single_revision() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: znkkpsqq 2668ffbe e | e Working copy (@) now at: znkkpsqq 2668ffbe e | e
Parent commit : vruxwmqv 7b370c85 d | d Parent commit (@-) : vruxwmqv 7b370c85 d | d
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -388,9 +388,9 @@ fn test_rebase_single_revision() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: znkkpsqq ed210c15 e | e Working copy (@) now at: znkkpsqq ed210c15 e | e
Parent commit : zsuskuln 1394f625 b | b Parent commit (@-) : zsuskuln 1394f625 b | b
Parent commit : royxmykx c0cb3a0b c | c Parent commit (@-) : royxmykx c0cb3a0b c | c
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -437,9 +437,9 @@ fn test_rebase_single_revision_merge_parent() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: vruxwmqv a37531e8 d | d Working copy (@) now at: vruxwmqv a37531e8 d | d
Parent commit : rlvkpnrz 2443ea76 a | a Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Parent commit : zsuskuln d370aee1 b | b Parent commit (@-) : zsuskuln d370aee1 b | b
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -495,8 +495,8 @@ fn test_rebase_multiple_revisions() {
------- stderr ------- ------- stderr -------
Rebased 2 commits onto destination Rebased 2 commits onto destination
Rebased 4 descendant commits Rebased 4 descendant commits
Working copy now at: xznxytkn 016685dc i | i Working copy (@) now at: xznxytkn 016685dc i | i
Parent commit : kmkuslsw e04d3932 f | f Parent commit (@-) : kmkuslsw e04d3932 f | f
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -528,8 +528,8 @@ fn test_rebase_multiple_revisions() {
------- stderr ------- ------- stderr -------
Rebased 2 commits onto destination Rebased 2 commits onto destination
Rebased 4 descendant commits Rebased 4 descendant commits
Working copy now at: xznxytkn 94538385 i | i Working copy (@) now at: xznxytkn 94538385 i | i
Parent commit : kmkuslsw dae8d293 f | f Parent commit (@-) : kmkuslsw dae8d293 f | f
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -562,9 +562,9 @@ fn test_rebase_multiple_revisions() {
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: xznxytkn 1868ded4 i | i Working copy (@) now at: xznxytkn 1868ded4 i | i
Parent commit : royxmykx 7e4fbf4f c | c Parent commit (@-) : royxmykx 7e4fbf4f c | c
Parent commit : vruxwmqv 4cc44fbf d | d Parent commit (@-) : vruxwmqv 4cc44fbf d | d
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -598,9 +598,9 @@ fn test_rebase_multiple_revisions() {
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: xznxytkn 9cfd1635 i | i Working copy (@) now at: xznxytkn 9cfd1635 i | i
Parent commit : royxmykx 7e4fbf4f c | c Parent commit (@-) : royxmykx 7e4fbf4f c | c
Parent commit : znkkpsqq ecf9a1d5 e | e Parent commit (@-) : znkkpsqq ecf9a1d5 e | e
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -630,8 +630,8 @@ fn test_rebase_multiple_revisions() {
------- stderr ------- ------- stderr -------
Rebased 2 commits onto destination Rebased 2 commits onto destination
Rebased 4 descendant commits Rebased 4 descendant commits
Working copy now at: xznxytkn 5d911e5c i | i Working copy (@) now at: xznxytkn 5d911e5c i | i
Parent commit : kmkuslsw d1bfda8c f | f Parent commit (@-) : kmkuslsw d1bfda8c f | f
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -682,9 +682,9 @@ fn test_rebase_revision_onto_descendant() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: vruxwmqv bff4a4eb merge | merge Working copy (@) now at: vruxwmqv bff4a4eb merge | merge
Parent commit : royxmykx c84e900d b | b Parent commit (@-) : royxmykx c84e900d b | b
Parent commit : zsuskuln d57db87b a | a Parent commit (@-) : zsuskuln d57db87b a | a
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -705,9 +705,9 @@ fn test_rebase_revision_onto_descendant() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Restored to operation: 60e340690be6 (2001-02-03 08:05:15) create bookmark merge pointing to commit b05964d109522cd06e48f1a2661e1a0f58be0984 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 Working copy (@) now at: vruxwmqv b05964d1 merge | merge
Parent commit : royxmykx cea87a87 b | b Parent commit (@-) : royxmykx cea87a87 b | b
Parent commit : zsuskuln 2c5b7858 a | a Parent commit (@-) : zsuskuln 2c5b7858 a | a
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -716,9 +716,9 @@ fn test_rebase_revision_onto_descendant() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: vruxwmqv 986b7a49 merge | merge Working copy (@) now at: vruxwmqv 986b7a49 merge | merge
Parent commit : royxmykx c07c677c b | b Parent commit (@-) : royxmykx c07c677c b | b
Parent commit : zsuskuln abc90087 a | a Parent commit (@-) : zsuskuln abc90087 a | a
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -874,8 +874,8 @@ fn test_rebase_with_descendants() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Working copy now at: vruxwmqv 705832bd d | d Working copy (@) now at: vruxwmqv 705832bd d | d
Parent commit : royxmykx 57c7246a c | c Parent commit (@-) : royxmykx 57c7246a c | c
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -895,8 +895,8 @@ fn test_rebase_with_descendants() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 2 commits onto destination Rebased 2 commits onto destination
Working copy now at: vruxwmqv 92c2bc9a d | d Working copy (@) now at: vruxwmqv 92c2bc9a d | d
Parent commit : rlvkpnrz 2443ea76 a | a Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -930,8 +930,8 @@ fn test_rebase_with_descendants() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Working copy now at: vruxwmqv f1e71cb7 d | d Working copy (@) now at: vruxwmqv f1e71cb7 d | d
Parent commit : rlvkpnrz 2443ea76 a | a Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -963,8 +963,8 @@ fn test_rebase_with_descendants() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Working copy now at: vruxwmqv d17539f7 d | d Working copy (@) now at: vruxwmqv d17539f7 d | d
Parent commit : rlvkpnrz 2443ea76 a | a Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -1083,8 +1083,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Working copy now at: znkkpsqq cf8ecff5 c | c Working copy (@) now at: znkkpsqq cf8ecff5 c | c
Parent commit : vruxwmqv 24e1a270 b | b Parent commit (@-) : vruxwmqv 24e1a270 b | b
[EOF] [EOF]
"); ");
// Commit "a" should be rebased onto the root commit. Commit "b" should have // 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" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 2 commits onto destination Rebased 2 commits onto destination
Working copy now at: znkkpsqq 76914dcc c | c Working copy (@) now at: znkkpsqq 76914dcc c | c
Parent commit : vruxwmqv f73f03c7 b | b Parent commit (@-) : vruxwmqv f73f03c7 b | b
[EOF] [EOF]
"); ");
// The commits in roots(a..c), i.e. commit "b" should be rebased onto "a", // 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 ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: znkkpsqq 45371aaf c | c Working copy (@) now at: znkkpsqq 45371aaf c | c
Parent commit : vruxwmqv c0a76bf4 b | b Parent commit (@-) : vruxwmqv c0a76bf4 b | b
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -1226,8 +1226,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: znkkpsqq e28fa972 c | c Working copy (@) now at: znkkpsqq e28fa972 c | c
Parent commit : vruxwmqv 8d0eeb6a b | b Parent commit (@-) : vruxwmqv 8d0eeb6a b | b
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -1252,8 +1252,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: znkkpsqq a9da974c c | c Working copy (@) now at: znkkpsqq a9da974c c | c
Parent commit : vruxwmqv 0072139c b | b Parent commit (@-) : vruxwmqv 0072139c b | b
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -1289,8 +1289,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: znkkpsqq 7210b05e c | c Working copy (@) now at: znkkpsqq 7210b05e c | c
Parent commit : vruxwmqv da3f7511 b | b Parent commit (@-) : vruxwmqv da3f7511 b | b
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -1313,9 +1313,9 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: znkkpsqq f280545e c | c Working copy (@) now at: znkkpsqq f280545e c | c
Parent commit : zsuskuln 0a7fb8f6 base | base Parent commit (@-) : zsuskuln 0a7fb8f6 base | base
Parent commit : royxmykx 86a06598 a | a Parent commit (@-) : royxmykx 86a06598 a | a
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -1341,9 +1341,9 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: znkkpsqq c0a7cd80 c | c Working copy (@) now at: znkkpsqq c0a7cd80 c | c
Parent commit : zsuskuln 0a7fb8f6 base | base Parent commit (@-) : zsuskuln 0a7fb8f6 base | base
Parent commit : royxmykx 86a06598 a | a Parent commit (@-) : royxmykx 86a06598 a | a
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -1366,8 +1366,8 @@ fn test_rebase_with_child_and_descendant_bug_2600() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Working copy now at: znkkpsqq 7a3bc050 c | c Working copy (@) now at: znkkpsqq 7a3bc050 c | c
Parent commit : royxmykx 86a06598 a | a Parent commit (@-) : royxmykx 86a06598 a | a
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -1475,8 +1475,8 @@ fn test_rebase_after() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: xznxytkn e0e873c8 f | f Working copy (@) now at: xznxytkn e0e873c8 f | f
Parent commit : kmkuslsw 754793f3 c | c Parent commit (@-) : kmkuslsw 754793f3 c | c
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -1503,8 +1503,8 @@ fn test_rebase_after() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: xznxytkn 9804b742 f | f Working copy (@) now at: xznxytkn 9804b742 f | f
Parent commit : kmkuslsw cd86b3e4 c | c Parent commit (@-) : kmkuslsw cd86b3e4 c | c
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -1532,8 +1532,8 @@ fn test_rebase_after() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 4 descendant commits Rebased 4 descendant commits
Working copy now at: xznxytkn 80c27408 f | f Working copy (@) now at: xznxytkn 80c27408 f | f
Parent commit : zsuskuln 072d5ae1 b1 | b1 Parent commit (@-) : zsuskuln 072d5ae1 b1 | b1
Added 0 files, modified 0 files, removed 5 files Added 0 files, modified 0 files, removed 5 files
[EOF] [EOF]
"); ");
@ -1561,8 +1561,8 @@ fn test_rebase_after() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: xznxytkn ebbc24b1 f | f Working copy (@) now at: xznxytkn ebbc24b1 f | f
Parent commit : royxmykx 2b8e1148 b2 | b2 Parent commit (@-) : royxmykx 2b8e1148 b2 | b2
Added 0 files, modified 0 files, removed 4 files Added 0 files, modified 0 files, removed 4 files
[EOF] [EOF]
"); ");
@ -1592,8 +1592,8 @@ fn test_rebase_after() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: xznxytkn 8f8c91d3 f | f Working copy (@) now at: xznxytkn 8f8c91d3 f | f
Parent commit : kmkuslsw cd86b3e4 c | c Parent commit (@-) : kmkuslsw cd86b3e4 c | c
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -1620,9 +1620,9 @@ fn test_rebase_after() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Working copy now at: xznxytkn 7784e5a0 f | f Working copy (@) now at: xznxytkn 7784e5a0 f | f
Parent commit : nkmrtpmo 858693f7 e | e Parent commit (@-) : nkmrtpmo 858693f7 e | e
Parent commit : lylxulpl 7d0512e5 d | d Parent commit (@-) : lylxulpl 7d0512e5 d | d
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1651,8 +1651,8 @@ fn test_rebase_after() {
------- stderr ------- ------- stderr -------
Rebased 2 commits onto destination Rebased 2 commits onto destination
Rebased 6 descendant commits Rebased 6 descendant commits
Working copy now at: xznxytkn 0b53613e f | f Working copy (@) now at: xznxytkn 0b53613e f | f
Parent commit : kmkuslsw 193687bb c | c Parent commit (@-) : kmkuslsw 193687bb c | c
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1682,8 +1682,8 @@ fn test_rebase_after() {
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: xznxytkn eaf1d6b8 f | f Working copy (@) now at: xznxytkn eaf1d6b8 f | f
Parent commit : nkmrtpmo 0d7e4ce9 e | e Parent commit (@-) : nkmrtpmo 0d7e4ce9 e | e
Added 0 files, modified 0 files, removed 3 files Added 0 files, modified 0 files, removed 3 files
[EOF] [EOF]
"); ");
@ -1713,8 +1713,8 @@ fn test_rebase_after() {
------- stderr ------- ------- stderr -------
Rebased 4 commits onto destination Rebased 4 commits onto destination
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: xznxytkn 9bc7e54c f | f Working copy (@) now at: xznxytkn 9bc7e54c f | f
Parent commit : nkmrtpmo 0f80251b e | e Parent commit (@-) : nkmrtpmo 0f80251b e | e
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1744,8 +1744,8 @@ fn test_rebase_after() {
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Rebased 6 descendant commits Rebased 6 descendant commits
Working copy now at: xznxytkn 0875aabc f | f Working copy (@) now at: xznxytkn 0875aabc f | f
Parent commit : nkmrtpmo d429661b e | e Parent commit (@-) : nkmrtpmo d429661b e | e
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1773,8 +1773,8 @@ fn test_rebase_after() {
------- stderr ------- ------- stderr -------
Rebased 2 commits onto destination Rebased 2 commits onto destination
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: xznxytkn 3238a418 f | f Working copy (@) now at: xznxytkn 3238a418 f | f
Parent commit : kmkuslsw 6a51bd41 c | c Parent commit (@-) : kmkuslsw 6a51bd41 c | c
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -1828,8 +1828,8 @@ fn test_rebase_after() {
------- stderr ------- ------- stderr -------
Rebased 4 commits onto destination Rebased 4 commits onto destination
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: xznxytkn a4ace41c f | f Working copy (@) now at: xznxytkn a4ace41c f | f
Parent commit : nkmrtpmo c7744d08 e | e Parent commit (@-) : nkmrtpmo c7744d08 e | e
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -1861,8 +1861,8 @@ fn test_rebase_after() {
------- stderr ------- ------- stderr -------
Rebased 6 commits onto destination Rebased 6 commits onto destination
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: xznxytkn b4078b57 f | f Working copy (@) now at: xznxytkn b4078b57 f | f
Parent commit : nkmrtpmo 1b95558f e | e Parent commit (@-) : nkmrtpmo 1b95558f e | e
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -1993,8 +1993,8 @@ fn test_rebase_before() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 8 descendant commits Rebased 8 descendant commits
Working copy now at: xznxytkn 24335685 f | f Working copy (@) now at: xznxytkn 24335685 f | f
Parent commit : nkmrtpmo e9a28d4b e | e Parent commit (@-) : nkmrtpmo e9a28d4b e | e
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -2021,8 +2021,8 @@ fn test_rebase_before() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: xznxytkn 8e3b728a f | f Working copy (@) now at: xznxytkn 8e3b728a f | f
Parent commit : kmkuslsw cd86b3e4 c | c Parent commit (@-) : kmkuslsw cd86b3e4 c | c
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -2050,8 +2050,8 @@ fn test_rebase_before() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 4 descendant commits Rebased 4 descendant commits
Working copy now at: xznxytkn 2b4f48f8 f | f Working copy (@) now at: xznxytkn 2b4f48f8 f | f
Parent commit : zsuskuln 072d5ae1 b1 | b1 Parent commit (@-) : zsuskuln 072d5ae1 b1 | b1
Added 0 files, modified 0 files, removed 5 files Added 0 files, modified 0 files, removed 5 files
[EOF] [EOF]
"); ");
@ -2079,8 +2079,8 @@ fn test_rebase_before() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 5 descendant commits Rebased 5 descendant commits
Working copy now at: xznxytkn 488ebb95 f | f Working copy (@) now at: xznxytkn 488ebb95 f | f
Parent commit : rlvkpnrz 2443ea76 a | a Parent commit (@-) : rlvkpnrz 2443ea76 a | a
Added 0 files, modified 0 files, removed 6 files Added 0 files, modified 0 files, removed 6 files
[EOF] [EOF]
"); ");
@ -2110,9 +2110,9 @@ fn test_rebase_before() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: xznxytkn aae1bc10 f | f Working copy (@) now at: xznxytkn aae1bc10 f | f
Parent commit : royxmykx 2b8e1148 b2 | b2 Parent commit (@-) : royxmykx 2b8e1148 b2 | b2
Parent commit : znkkpsqq a52a83a4 b4 | b4 Parent commit (@-) : znkkpsqq a52a83a4 b4 | b4
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -2140,8 +2140,8 @@ fn test_rebase_before() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 5 descendant commits Rebased 5 descendant commits
Working copy now at: xznxytkn 8268ec4d f | f Working copy (@) now at: xznxytkn 8268ec4d f | f
Parent commit : nkmrtpmo fd26fbd4 e | e Parent commit (@-) : nkmrtpmo fd26fbd4 e | e
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -2169,9 +2169,9 @@ fn test_rebase_before() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 5 descendant commits Rebased 5 descendant commits
Working copy now at: xznxytkn 7ba8014f f | f Working copy (@) now at: xznxytkn 7ba8014f f | f
Parent commit : zsuskuln 072d5ae1 b1 | b1 Parent commit (@-) : zsuskuln 072d5ae1 b1 | b1
Parent commit : vruxwmqv 523e6a8b b3 | b3 Parent commit (@-) : vruxwmqv 523e6a8b b3 | b3
Added 0 files, modified 0 files, removed 4 files Added 0 files, modified 0 files, removed 4 files
[EOF] [EOF]
"); ");
@ -2202,8 +2202,8 @@ fn test_rebase_before() {
------- stderr ------- ------- stderr -------
Rebased 2 commits onto destination Rebased 2 commits onto destination
Rebased 7 descendant commits Rebased 7 descendant commits
Working copy now at: xznxytkn fabd8dd7 f | f Working copy (@) now at: xznxytkn fabd8dd7 f | f
Parent commit : nkmrtpmo b5933877 e | e Parent commit (@-) : nkmrtpmo b5933877 e | e
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -2232,8 +2232,8 @@ fn test_rebase_before() {
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: xznxytkn cbe2be58 f | f Working copy (@) now at: xznxytkn cbe2be58 f | f
Parent commit : nkmrtpmo e31053d1 e | e Parent commit (@-) : nkmrtpmo e31053d1 e | e
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -2263,8 +2263,8 @@ fn test_rebase_before() {
------- stderr ------- ------- stderr -------
Rebased 2 commits onto destination Rebased 2 commits onto destination
Rebased 7 descendant commits Rebased 7 descendant commits
Working copy now at: xznxytkn 1c48b514 f | f Working copy (@) now at: xznxytkn 1c48b514 f | f
Parent commit : kmkuslsw c0fd979a c | c Parent commit (@-) : kmkuslsw c0fd979a c | c
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&work_dir), @r" insta::assert_snapshot!(get_log_output(&work_dir), @r"
@ -2293,8 +2293,8 @@ fn test_rebase_before() {
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Rebased 6 descendant commits Rebased 6 descendant commits
Working copy now at: xznxytkn f5991dc7 f | f Working copy (@) now at: xznxytkn f5991dc7 f | f
Parent commit : nkmrtpmo 37894e3c e | e Parent commit (@-) : nkmrtpmo 37894e3c e | e
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -2323,8 +2323,8 @@ fn test_rebase_before() {
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Rebased 6 descendant commits Rebased 6 descendant commits
Working copy now at: xznxytkn 308a31e9 f | f Working copy (@) now at: xznxytkn 308a31e9 f | f
Parent commit : nkmrtpmo 538444a5 e | e Parent commit (@-) : nkmrtpmo 538444a5 e | e
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -2378,8 +2378,8 @@ fn test_rebase_before() {
------- stderr ------- ------- stderr -------
Rebased 4 commits onto destination Rebased 4 commits onto destination
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: xznxytkn 84704387 f | f Working copy (@) now at: xznxytkn 84704387 f | f
Parent commit : nkmrtpmo cff61821 e | e Parent commit (@-) : nkmrtpmo cff61821 e | e
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -2412,8 +2412,8 @@ fn test_rebase_before() {
Skipped rebase of 2 commits that were already in place Skipped rebase of 2 commits that were already in place
Rebased 4 commits onto destination Rebased 4 commits onto destination
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: xznxytkn 16422f85 f | f Working copy (@) now at: xznxytkn 16422f85 f | f
Parent commit : nkmrtpmo ef9dea83 e | e Parent commit (@-) : nkmrtpmo ef9dea83 e | e
Added 0 files, modified 0 files, removed 2 files Added 0 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -2488,8 +2488,8 @@ fn test_rebase_after_before() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: nmzmmopx 56c81c6d f | f Working copy (@) now at: nmzmmopx 56c81c6d f | f
Parent commit : nkmrtpmo ff196f69 d | d Parent commit (@-) : nkmrtpmo ff196f69 d | d
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -2519,9 +2519,9 @@ fn test_rebase_after_before() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: nmzmmopx 398173ed f | f Working copy (@) now at: nmzmmopx 398173ed f | f
Parent commit : xznxytkn b3e6aadf e | e Parent commit (@-) : xznxytkn b3e6aadf e | e
Parent commit : nkmrtpmo db529447 d | d Parent commit (@-) : nkmrtpmo db529447 d | d
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -2555,8 +2555,8 @@ fn test_rebase_after_before() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: nmzmmopx 2be98daf f | f Working copy (@) now at: nmzmmopx 2be98daf f | f
Parent commit : xznxytkn 911fc846 e | e Parent commit (@-) : xznxytkn 911fc846 e | e
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -2591,11 +2591,11 @@ fn test_rebase_after_before() {
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: nmzmmopx bee09b10 f | f Working copy (@) now at: nmzmmopx bee09b10 f | f
Parent commit : znkkpsqq 9167144b b1 | b1 Parent commit (@-) : znkkpsqq 9167144b b1 | b1
Parent commit : kmkuslsw 87fed139 b2 | b2 Parent commit (@-) : kmkuslsw 87fed139 b2 | b2
Parent commit : nkmrtpmo 4a8ca156 d | d Parent commit (@-) : nkmrtpmo 4a8ca156 d | d
Parent commit : xznxytkn 0cc1825e e | e Parent commit (@-) : xznxytkn 0cc1825e e | e
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -2626,8 +2626,8 @@ fn test_rebase_after_before() {
------- stderr ------- ------- stderr -------
Rebased 4 commits onto destination Rebased 4 commits onto destination
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: nmzmmopx 951204cf f | f Working copy (@) now at: nmzmmopx 951204cf f | f
Parent commit : xznxytkn fe8ec4e2 e | e Parent commit (@-) : xznxytkn fe8ec4e2 e | e
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -2659,8 +2659,8 @@ fn test_rebase_after_before() {
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Rebased 4 descendant commits Rebased 4 descendant commits
Working copy now at: nmzmmopx 4496f88e f | f Working copy (@) now at: nmzmmopx 4496f88e f | f
Parent commit : xznxytkn a85404a6 e | e Parent commit (@-) : xznxytkn a85404a6 e | e
Added 3 files, modified 0 files, removed 0 files Added 3 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -2729,8 +2729,8 @@ fn test_rebase_skip_emptied() {
------- stderr ------- ------- stderr -------
Rebased 2 commits onto destination Rebased 2 commits onto destination
Abandoned 1 newly emptied commits Abandoned 1 newly emptied commits
Working copy now at: yostqsxw bc4222f2 (empty) also already empty Working copy (@) now at: yostqsxw bc4222f2 (empty) also already empty
Parent commit : vruxwmqv 6b41ecb2 (empty) already empty Parent commit (@-) : vruxwmqv 6b41ecb2 (empty) already empty
[EOF] [EOF]
"); ");
@ -2768,8 +2768,8 @@ fn test_rebase_skip_emptied() {
------- stderr ------- ------- stderr -------
Rebased 2 descendant commits Rebased 2 descendant commits
Abandoned 1 newly emptied commits Abandoned 1 newly emptied commits
Working copy now at: yostqsxw 74149b9b (empty) also already empty Working copy (@) now at: yostqsxw 74149b9b (empty) also already empty
Parent commit : vruxwmqv 3bdb2801 (empty) already empty Parent commit (@-) : vruxwmqv 3bdb2801 (empty) already empty
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -2824,8 +2824,8 @@ fn test_rebase_skip_emptied_descendants() {
------- stderr ------- ------- stderr -------
Skipped rebase of 1 commits that were already in place Skipped rebase of 1 commits that were already in place
Rebased 3 descendant commits Rebased 3 descendant commits
Working copy now at: znkkpsqq 353bac5c (empty) also already empty Working copy (@) now at: znkkpsqq 353bac5c (empty) also already empty
Parent commit : yostqsxw 0a3f76fd (empty) already empty Parent commit (@-) : yostqsxw 0a3f76fd (empty) already empty
[EOF] [EOF]
"); ");
@ -2946,8 +2946,8 @@ fn test_rebase_skip_if_on_destination() {
------- stderr ------- ------- stderr -------
Skipped rebase of 1 commits that were already in place Skipped rebase of 1 commits that were already in place
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: lylxulpl 77cb229f f | f Working copy (@) now at: lylxulpl 77cb229f f | f
Parent commit : vruxwmqv c41e416e c | c Parent commit (@-) : vruxwmqv c41e416e c | c
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");

40
cli/tests/test_repo_change_report.rs
View File

@ -31,8 +31,8 @@ fn test_report_conflicts() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Working copy now at: zsuskuln f8a2c4e0 (conflict) (empty) (no description set) Working copy (@) now at: zsuskuln f8a2c4e0 (conflict) (empty) (no description set)
Parent commit : kkmpptxz 2271a49e (conflict) C Parent commit (@-) : kkmpptxz 2271a49e (conflict) C
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict including 1 deletion file 2-sided conflict including 1 deletion
@ -51,8 +51,8 @@ fn test_report_conflicts() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Working copy now at: zsuskuln d70c003d (empty) (no description set) Working copy (@) now at: zsuskuln d70c003d (empty) (no description set)
Parent commit : kkmpptxz 43e94449 C Parent commit (@-) : kkmpptxz 43e94449 C
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Existing conflicts were resolved or abandoned from 2 commits. Existing conflicts were resolved or abandoned from 2 commits.
[EOF] [EOF]
@ -64,8 +64,8 @@ fn test_report_conflicts() {
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: zsuskuln 588bd15c (conflict) (empty) (no description set) Working copy (@) now at: zsuskuln 588bd15c (conflict) (empty) (no description set)
Parent commit : kkmpptxz 331a2fce (conflict) C Parent commit (@-) : kkmpptxz 331a2fce (conflict) C
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict file 2-sided conflict
@ -85,8 +85,8 @@ fn test_report_conflicts() {
let output = work_dir.run_jj(["new", "rlvkpnrzqnoo"]); let output = work_dir.run_jj(["new", "rlvkpnrzqnoo"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: vruxwmqv 0485e30f (conflict) (empty) (no description set) Working copy (@) now at: vruxwmqv 0485e30f (conflict) (empty) (no description set)
Parent commit : rlvkpnrz b42f84eb (conflict) B Parent commit (@-) : rlvkpnrz b42f84eb (conflict) B
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict including 1 deletion file 2-sided conflict including 1 deletion
@ -96,8 +96,8 @@ fn test_report_conflicts() {
let output = work_dir.run_jj(["squash"]); let output = work_dir.run_jj(["squash"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: yostqsxw f5a0cf8c (empty) (no description set) Working copy (@) now at: yostqsxw f5a0cf8c (empty) (no description set)
Parent commit : rlvkpnrz 87370844 B Parent commit (@-) : rlvkpnrz 87370844 B
Existing conflicts were resolved or abandoned from 1 commits. Existing conflicts were resolved or abandoned from 1 commits.
[EOF] [EOF]
"); ");
@ -125,8 +125,8 @@ fn test_report_conflicts_with_divergent_commits() {
------- stderr ------- ------- stderr -------
Concurrent modification detected, resolving automatically. Concurrent modification detected, resolving automatically.
Rebased 3 commits onto destination Rebased 3 commits onto destination
Working copy now at: zsuskuln?? 4ca807ad (conflict) C2 Working copy (@) now at: zsuskuln?? 4ca807ad (conflict) C2
Parent commit : kkmpptxz b42f84eb (conflict) B Parent commit (@-) : kkmpptxz b42f84eb (conflict) B
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict including 1 deletion file 2-sided conflict including 1 deletion
@ -146,8 +146,8 @@ fn test_report_conflicts_with_divergent_commits() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Working copy now at: zsuskuln?? f2d7a228 C2 Working copy (@) now at: zsuskuln?? f2d7a228 C2
Parent commit : kkmpptxz db069a22 B Parent commit (@-) : kkmpptxz db069a22 B
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Existing conflicts were resolved or abandoned from 3 commits. Existing conflicts were resolved or abandoned from 3 commits.
[EOF] [EOF]
@ -158,8 +158,8 @@ fn test_report_conflicts_with_divergent_commits() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Working copy now at: zsuskuln?? 3c36afc9 (conflict) C2 Working copy (@) now at: zsuskuln?? 3c36afc9 (conflict) C2
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict including 1 deletion file 2-sided conflict including 1 deletion
@ -191,8 +191,8 @@ fn test_report_conflicts_with_divergent_commits() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 1 commits onto destination Rebased 1 commits onto destination
Working copy now at: zsuskuln?? 1f9680bd C2 Working copy (@) now at: zsuskuln?? 1f9680bd C2
Parent commit : kkmpptxz db069a22 B Parent commit (@-) : kkmpptxz db069a22 B
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Existing conflicts were resolved or abandoned from 1 commits. Existing conflicts were resolved or abandoned from 1 commits.
[EOF] [EOF]
@ -229,8 +229,8 @@ fn test_report_conflicts_with_resolving_conflicts_hint_disabled() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 3 commits onto destination Rebased 3 commits onto destination
Working copy now at: zsuskuln f8a2c4e0 (conflict) (empty) (no description set) Working copy (@) now at: zsuskuln f8a2c4e0 (conflict) (empty) (no description set)
Parent commit : kkmpptxz 2271a49e (conflict) C Parent commit (@-) : kkmpptxz 2271a49e (conflict) C
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict including 1 deletion file 2-sided conflict including 1 deletion

90
cli/tests/test_resolve_command.rs
View File

@ -88,9 +88,9 @@ fn test_resolution() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Resolving conflicts in: file Resolving conflicts in: file
Working copy now at: vruxwmqv e069f073 conflict | conflict Working copy (@) now at: vruxwmqv e069f073 conflict | conflict
Parent commit : zsuskuln aa493daf a | a Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit : royxmykx db6a4daf b | b Parent commit (@-) : royxmykx db6a4daf b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -133,9 +133,9 @@ fn test_resolution() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Resolving conflicts in: file Resolving conflicts in: file
Working copy now at: vruxwmqv 1a70c7c6 conflict | conflict Working copy (@) now at: vruxwmqv 1a70c7c6 conflict | conflict
Parent commit : zsuskuln aa493daf a | a Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit : royxmykx db6a4daf b | b Parent commit (@-) : royxmykx db6a4daf b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -239,9 +239,9 @@ fn test_resolution() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Resolving conflicts in: file Resolving conflicts in: file
Working copy now at: vruxwmqv 608a2310 conflict | (conflict) conflict Working copy (@) now at: vruxwmqv 608a2310 conflict | (conflict) conflict
Parent commit : zsuskuln aa493daf a | a Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit : royxmykx db6a4daf b | b Parent commit (@-) : royxmykx db6a4daf b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict file 2-sided conflict
@ -314,9 +314,9 @@ fn test_resolution() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Resolving conflicts in: file Resolving conflicts in: file
Working copy now at: vruxwmqv 3166dfd2 conflict | conflict Working copy (@) now at: vruxwmqv 3166dfd2 conflict | conflict
Parent commit : zsuskuln aa493daf a | a Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit : royxmykx db6a4daf b | b Parent commit (@-) : royxmykx db6a4daf b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -385,9 +385,9 @@ fn test_resolution() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Resolving conflicts in: file Resolving conflicts in: file
Working copy now at: vruxwmqv 8e03fefa conflict | (conflict) conflict Working copy (@) now at: vruxwmqv 8e03fefa conflict | (conflict) conflict
Parent commit : zsuskuln aa493daf a | a Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit : royxmykx db6a4daf b | b Parent commit (@-) : royxmykx db6a4daf b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict file 2-sided conflict
@ -466,9 +466,9 @@ fn test_resolution() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Resolving conflicts in: file Resolving conflicts in: file
Working copy now at: vruxwmqv a786ac2f conflict | (conflict) conflict Working copy (@) now at: vruxwmqv a786ac2f conflict | (conflict) conflict
Parent commit : zsuskuln aa493daf a | a Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit : royxmykx db6a4daf b | b Parent commit (@-) : royxmykx db6a4daf b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict file 2-sided conflict
@ -868,9 +868,9 @@ fn test_simplify_conflict_sides() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Resolving conflicts in: fileB Resolving conflicts in: fileB
Working copy now at: nkmrtpmo 69cc0c2d conflict | (conflict) conflict Working copy (@) now at: nkmrtpmo 69cc0c2d conflict | (conflict) conflict
Parent commit : kmkuslsw 4601566f conflictA | (conflict) (empty) conflictA Parent commit (@-) : kmkuslsw 4601566f conflictA | (conflict) (empty) conflictA
Parent commit : lylxulpl 6f8d8381 conflictB | (conflict) (empty) conflictB Parent commit (@-) : lylxulpl 6f8d8381 conflictB | (conflict) (empty) conflictB
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
fileA 2-sided conflict fileA 2-sided conflict
@ -1146,9 +1146,9 @@ fn test_resolve_conflicts_with_executable() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Resolving conflicts in: file1 Resolving conflicts in: file1
Working copy now at: znkkpsqq eb159d56 conflict | (conflict) conflict Working copy (@) now at: znkkpsqq eb159d56 conflict | (conflict) conflict
Parent commit : mzvwutvl 08932848 a | a Parent commit (@-) : mzvwutvl 08932848 a | a
Parent commit : yqosqzyt b69b3de6 b | b Parent commit (@-) : yqosqzyt b69b3de6 b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file2 2-sided conflict including an executable file2 2-sided conflict including an executable
@ -1190,9 +1190,9 @@ fn test_resolve_conflicts_with_executable() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Resolving conflicts in: file2 Resolving conflicts in: file2
Working copy now at: znkkpsqq 4dccbb3c conflict | (conflict) conflict Working copy (@) now at: znkkpsqq 4dccbb3c conflict | (conflict) conflict
Parent commit : mzvwutvl 08932848 a | a Parent commit (@-) : mzvwutvl 08932848 a | a
Parent commit : yqosqzyt b69b3de6 b | b Parent commit (@-) : yqosqzyt b69b3de6 b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file1 2-sided conflict including an executable file1 2-sided conflict including an executable
@ -1299,9 +1299,9 @@ fn test_resolve_long_conflict_markers() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Resolving conflicts in: file Resolving conflicts in: file
Working copy now at: vruxwmqv 2b985546 conflict | (conflict) conflict Working copy (@) now at: vruxwmqv 2b985546 conflict | (conflict) conflict
Parent commit : zsuskuln 64177fd4 a | a Parent commit (@-) : zsuskuln 64177fd4 a | a
Parent commit : royxmykx db442c1e b | b Parent commit (@-) : royxmykx db442c1e b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict file 2-sided conflict
@ -1372,9 +1372,9 @@ fn test_resolve_long_conflict_markers() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Resolving conflicts in: file Resolving conflicts in: file
Working copy now at: vruxwmqv fac9406d conflict | (conflict) conflict Working copy (@) now at: vruxwmqv fac9406d conflict | (conflict) conflict
Parent commit : zsuskuln 64177fd4 a | a Parent commit (@-) : zsuskuln 64177fd4 a | a
Parent commit : royxmykx db442c1e b | b Parent commit (@-) : royxmykx db442c1e b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict file 2-sided conflict
@ -1451,9 +1451,9 @@ fn test_resolve_long_conflict_markers() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Resolving conflicts in: file Resolving conflicts in: file
Working copy now at: vruxwmqv 1b29631a conflict | (conflict) conflict Working copy (@) now at: vruxwmqv 1b29631a conflict | (conflict) conflict
Parent commit : zsuskuln 64177fd4 a | a Parent commit (@-) : zsuskuln 64177fd4 a | a
Parent commit : royxmykx db442c1e b | b Parent commit (@-) : royxmykx db442c1e b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict file 2-sided conflict
@ -1587,9 +1587,9 @@ fn test_multiple_conflicts() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Resolving conflicts in: another_file Resolving conflicts in: another_file
Working copy now at: vruxwmqv 309e981c conflict | (conflict) conflict Working copy (@) now at: vruxwmqv 309e981c conflict | (conflict) conflict
Parent commit : zsuskuln de7553ef a | a Parent commit (@-) : zsuskuln de7553ef a | a
Parent commit : royxmykx f68bc2f0 b | b Parent commit (@-) : royxmykx f68bc2f0 b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
this_file_has_a_very_long_name_to_test_padding 2-sided conflict this_file_has_a_very_long_name_to_test_padding 2-sided conflict
@ -1759,9 +1759,9 @@ fn test_multiple_conflicts_with_error() {
------- stderr ------- ------- stderr -------
Resolving conflicts in: file1 Resolving conflicts in: file1
Resolving conflicts in: file2 Resolving conflicts in: file2
Working copy now at: vruxwmqv d2f3f858 conflict | (conflict) conflict Working copy (@) now at: vruxwmqv d2f3f858 conflict | (conflict) conflict
Parent commit : zsuskuln 9db7fdfb a | a Parent commit (@-) : zsuskuln 9db7fdfb a | a
Parent commit : royxmykx d67e26e4 b | b Parent commit (@-) : royxmykx d67e26e4 b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file2 2-sided conflict file2 2-sided conflict
@ -1811,9 +1811,9 @@ fn test_multiple_conflicts_with_error() {
------- stderr ------- ------- stderr -------
Resolving conflicts in: file1 Resolving conflicts in: file1
Resolving conflicts in: file2 Resolving conflicts in: file2
Working copy now at: vruxwmqv 0a54e8ed conflict | (conflict) conflict Working copy (@) now at: vruxwmqv 0a54e8ed conflict | (conflict) conflict
Parent commit : zsuskuln 9db7fdfb a | a Parent commit (@-) : zsuskuln 9db7fdfb a | a
Parent commit : royxmykx d67e26e4 b | b Parent commit (@-) : royxmykx d67e26e4 b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file2 2-sided conflict file2 2-sided conflict

60
cli/tests/test_restore_command.rs
View File

@ -48,8 +48,8 @@ fn test_restore() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created kkmpptxz 370d81ea (empty) (no description set) Created kkmpptxz 370d81ea (empty) (no description set)
Working copy now at: kkmpptxz 370d81ea (empty) (no description set) Working copy (@) now at: kkmpptxz 370d81ea (empty) (no description set)
Parent commit : rlvkpnrz ef160660 (no description set) Parent commit (@-) : rlvkpnrz ef160660 (no description set)
Added 1 files, modified 1 files, removed 1 files Added 1 files, modified 1 files, removed 1 files
[EOF] [EOF]
"); ");
@ -68,8 +68,8 @@ fn test_restore() {
------- stderr ------- ------- stderr -------
Created rlvkpnrz b9b6011e (empty) (no description set) Created rlvkpnrz b9b6011e (empty) (no description set)
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: kkmpptxz 5b361547 (conflict) (no description set) Working copy (@) now at: kkmpptxz 5b361547 (conflict) (no description set)
Parent commit : rlvkpnrz b9b6011e (empty) (no description set) Parent commit (@-) : rlvkpnrz b9b6011e (empty) (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file2 2-sided conflict including 1 deletion file2 2-sided conflict including 1 deletion
@ -91,8 +91,8 @@ fn test_restore() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created kkmpptxz 1154634b (no description set) Created kkmpptxz 1154634b (no description set)
Working copy now at: kkmpptxz 1154634b (no description set) Working copy (@) now at: kkmpptxz 1154634b (no description set)
Parent commit : rlvkpnrz ef160660 (no description set) Parent commit (@-) : rlvkpnrz ef160660 (no description set)
Added 1 files, modified 0 files, removed 2 files Added 1 files, modified 0 files, removed 2 files
[EOF] [EOF]
"); ");
@ -109,8 +109,8 @@ fn test_restore() {
------- stderr ------- ------- stderr -------
Created rlvkpnrz ad805965 (no description set) Created rlvkpnrz ad805965 (no description set)
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: kkmpptxz 3fcdcbf2 (empty) (no description set) Working copy (@) now at: kkmpptxz 3fcdcbf2 (empty) (no description set)
Parent commit : rlvkpnrz ad805965 (no description set) Parent commit (@-) : rlvkpnrz ad805965 (no description set)
[EOF] [EOF]
"); ");
let output = test_env.run_jj_in(&repo_path, ["diff", "-s"]); let output = test_env.run_jj_in(&repo_path, ["diff", "-s"]);
@ -130,8 +130,8 @@ fn test_restore() {
------- stderr ------- ------- stderr -------
Created rlvkpnrz f256040a (no description set) Created rlvkpnrz f256040a (no description set)
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: kkmpptxz 9c6f2083 (empty) (no description set) Working copy (@) now at: kkmpptxz 9c6f2083 (empty) (no description set)
Parent commit : rlvkpnrz f256040a (no description set) Parent commit (@-) : rlvkpnrz f256040a (no description set)
[EOF] [EOF]
"); ");
let output = test_env.run_jj_in(&repo_path, ["diff", "-s"]); let output = test_env.run_jj_in(&repo_path, ["diff", "-s"]);
@ -150,8 +150,8 @@ fn test_restore() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created kkmpptxz 4ad35a2f (no description set) Created kkmpptxz 4ad35a2f (no description set)
Working copy now at: kkmpptxz 4ad35a2f (no description set) Working copy (@) now at: kkmpptxz 4ad35a2f (no description set)
Parent commit : rlvkpnrz ef160660 (no description set) Parent commit (@-) : rlvkpnrz ef160660 (no description set)
Added 0 files, modified 1 files, removed 1 files Added 0 files, modified 1 files, removed 1 files
[EOF] [EOF]
"); ");
@ -231,9 +231,9 @@ fn test_restore_conflicted_merge() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created vruxwmqv 25a37060 conflict | (conflict) (empty) conflict Created vruxwmqv 25a37060 conflict | (conflict) (empty) conflict
Working copy now at: vruxwmqv 25a37060 conflict | (conflict) (empty) conflict Working copy (@) now at: vruxwmqv 25a37060 conflict | (conflict) (empty) conflict
Parent commit : zsuskuln aa493daf a | a Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit : royxmykx db6a4daf b | b Parent commit (@-) : royxmykx db6a4daf b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict file 2-sided conflict
@ -273,9 +273,9 @@ fn test_restore_conflicted_merge() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created vruxwmqv f2c82b9c conflict | (conflict) (empty) conflict Created vruxwmqv f2c82b9c conflict | (conflict) (empty) conflict
Working copy now at: vruxwmqv f2c82b9c conflict | (conflict) (empty) conflict Working copy (@) now at: vruxwmqv f2c82b9c conflict | (conflict) (empty) conflict
Parent commit : zsuskuln aa493daf a | a Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit : royxmykx db6a4daf b | b Parent commit (@-) : royxmykx db6a4daf b | b
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict file 2-sided conflict
@ -348,9 +348,9 @@ fn test_restore_restore_descendants() {
------- stderr ------- ------- stderr -------
Created royxmykx 3fd5aa05 b | b Created royxmykx 3fd5aa05 b | b
Rebased 1 descendant commits (while preserving their content) Rebased 1 descendant commits (while preserving their content)
Working copy now at: vruxwmqv bf5491a0 ab | ab Working copy (@) now at: vruxwmqv bf5491a0 ab | ab
Parent commit : zsuskuln aa493daf a | a Parent commit (@-) : zsuskuln aa493daf a | a
Parent commit : royxmykx 3fd5aa05 b | b Parent commit (@-) : royxmykx 3fd5aa05 b | b
[EOF] [EOF]
"); ");
@ -433,8 +433,8 @@ fn test_restore_interactive() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created zsuskuln bccde490 b | b Created zsuskuln bccde490 b | b
Working copy now at: zsuskuln bccde490 b | b Working copy (@) now at: zsuskuln bccde490 b | b
Parent commit : rlvkpnrz 186caaef a | a Parent commit (@-) : rlvkpnrz 186caaef a | a
Added 0 files, modified 1 files, removed 1 files Added 0 files, modified 1 files, removed 1 files
[EOF] [EOF]
"); ");
@ -467,8 +467,8 @@ fn test_restore_interactive() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created zsuskuln 5921de19 b | b Created zsuskuln 5921de19 b | b
Working copy now at: zsuskuln 5921de19 b | b Working copy (@) now at: zsuskuln 5921de19 b | b
Parent commit : rlvkpnrz 186caaef a | a Parent commit (@-) : rlvkpnrz 186caaef a | a
Added 0 files, modified 1 files, removed 1 files Added 0 files, modified 1 files, removed 1 files
[EOF] [EOF]
"); ");
@ -543,9 +543,9 @@ fn test_restore_interactive_merge() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created royxmykx 72e0cbf4 c | c Created royxmykx 72e0cbf4 c | c
Working copy now at: royxmykx 72e0cbf4 c | c Working copy (@) now at: royxmykx 72e0cbf4 c | c
Parent commit : rlvkpnrz 79c1b823 a | a Parent commit (@-) : rlvkpnrz 79c1b823 a | a
Parent commit : zsuskuln 29e70804 b | b Parent commit (@-) : zsuskuln 29e70804 b | b
Added 0 files, modified 1 files, removed 1 files Added 0 files, modified 1 files, removed 1 files
[EOF] [EOF]
"); ");
@ -623,8 +623,8 @@ fn test_restore_interactive_with_paths() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Created zsuskuln 7187da33 b | b Created zsuskuln 7187da33 b | b
Working copy now at: zsuskuln 7187da33 b | b Working copy (@) now at: zsuskuln 7187da33 b | b
Parent commit : rlvkpnrz 186caaef a | a Parent commit (@-) : rlvkpnrz 186caaef a | a
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");

14
cli/tests/test_revert_command.rs
View File

@ -121,8 +121,8 @@ fn test_revert() {
Reverted 1 commits as follows: Reverted 1 commits as follows:
tlkvzzqu ff67400f Revert "a" tlkvzzqu ff67400f Revert "a"
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: vruxwmqv 37ad0315 d | (empty) d Working copy (@) now at: vruxwmqv 37ad0315 d | (empty) d
Parent commit : royxmykx ca80e93f c | (empty) c Parent commit (@-) : royxmykx ca80e93f c | (empty) c
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"#); "#);
@ -153,8 +153,8 @@ fn test_revert() {
Reverted 1 commits as follows: Reverted 1 commits as follows:
xlzxqlsl 0b91fe42 Revert "a" xlzxqlsl 0b91fe42 Revert "a"
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: vruxwmqv 3a8a8069 d | (empty) d Working copy (@) now at: vruxwmqv 3a8a8069 d | (empty) d
Parent commit : xlzxqlsl 0b91fe42 Revert "a" Parent commit (@-) : xlzxqlsl 0b91fe42 Revert "a"
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"#); "#);
@ -185,9 +185,9 @@ fn test_revert() {
Reverted 1 commits as follows: Reverted 1 commits as follows:
pkstwlsy 29508aef Revert "a" pkstwlsy 29508aef Revert "a"
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: vruxwmqv 3489c981 d | (empty) d Working copy (@) now at: vruxwmqv 3489c981 d | (empty) d
Parent commit : royxmykx 14e95430 c | (empty) c Parent commit (@-) : royxmykx 14e95430 c | (empty) c
Parent commit : pkstwlsy 29508aef Revert "a" Parent commit (@-) : pkstwlsy 29508aef Revert "a"
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"#); "#);

24
cli/tests/test_sign_unsign_commands.rs
View File

@ -63,8 +63,8 @@ backend = "test"
rlvkpnrz 6500b275 (empty) two rlvkpnrz 6500b275 (empty) two
kkmpptxz bcfaa4c3 (empty) three kkmpptxz bcfaa4c3 (empty) three
zsuskuln 4947c6dd (empty) (no description set) zsuskuln 4947c6dd (empty) (no description set)
Working copy now at: zsuskuln 4947c6dd (empty) (no description set) Working copy (@) now at: zsuskuln 4947c6dd (empty) (no description set)
Parent commit : kkmpptxz bcfaa4c3 (empty) three Parent commit (@-) : kkmpptxz bcfaa4c3 (empty) three
[EOF] [EOF]
"); ");
@ -92,8 +92,8 @@ backend = "test"
rlvkpnrz 2085a464 (empty) two rlvkpnrz 2085a464 (empty) two
kkmpptxz 227f5e15 (empty) three kkmpptxz 227f5e15 (empty) three
zsuskuln 15d1b128 (empty) (no description set) zsuskuln 15d1b128 (empty) (no description set)
Working copy now at: zsuskuln 15d1b128 (empty) (no description set) Working copy (@) now at: zsuskuln 15d1b128 (empty) (no description set)
Parent commit : kkmpptxz 227f5e15 (empty) three Parent commit (@-) : kkmpptxz 227f5e15 (empty) three
[EOF] [EOF]
"); ");
} }
@ -239,8 +239,8 @@ backend = "test"
kkmpptxz c2bc0eb0 (empty) three kkmpptxz c2bc0eb0 (empty) three
Warning: 3 of these commits are not authored by you Warning: 3 of these commits are not authored by you
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: zsuskuln ede04d15 (empty) (no description set) Working copy (@) now at: zsuskuln ede04d15 (empty) (no description set)
Parent commit : kkmpptxz c2bc0eb0 (empty) three Parent commit (@-) : kkmpptxz c2bc0eb0 (empty) three
[EOF] [EOF]
"); ");
@ -293,8 +293,8 @@ backend = "test"
qpvuntsm 034b975d (empty) A qpvuntsm 034b975d (empty) A
kkmpptxz 29dc7928 (empty) C kkmpptxz 29dc7928 (empty) C
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: kkmpptxz 29dc7928 (empty) C Working copy (@) now at: kkmpptxz 29dc7928 (empty) C
Parent commit : rlvkpnrz 014c011c (empty) B Parent commit (@-) : rlvkpnrz 014c011c (empty) B
[EOF] [EOF]
"); ");
@ -389,8 +389,8 @@ backend = "test"
rlvkpnrz deb0db4b (empty) two rlvkpnrz deb0db4b (empty) two
kkmpptxz 7c11ee12 (empty) three kkmpptxz 7c11ee12 (empty) three
zsuskuln be9daa4d (empty) (no description set) zsuskuln be9daa4d (empty) (no description set)
Working copy now at: zsuskuln be9daa4d (empty) (no description set) Working copy (@) now at: zsuskuln be9daa4d (empty) (no description set)
Parent commit : kkmpptxz 7c11ee12 (empty) three Parent commit (@-) : kkmpptxz 7c11ee12 (empty) three
[EOF] [EOF]
"); ");
@ -458,8 +458,8 @@ backend = "test"
kkmpptxz 8859969b (empty) three kkmpptxz 8859969b (empty) three
zsuskuln 8cea2d75 (empty) (no description set) zsuskuln 8cea2d75 (empty) (no description set)
Warning: 4 of these commits are not authored by you Warning: 4 of these commits are not authored by you
Working copy now at: zsuskuln 8cea2d75 (empty) (no description set) Working copy (@) now at: zsuskuln 8cea2d75 (empty) (no description set)
Parent commit : kkmpptxz 8859969b (empty) three Parent commit (@-) : kkmpptxz 8859969b (empty) three
[EOF] [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" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Removed 1 edges from 1 out of 3 commits. Removed 1 edges from 1 out of 3 commits.
Working copy now at: royxmykx 0ac2063b c | c Working copy (@) now at: royxmykx 0ac2063b c | c
Parent commit : zsuskuln 1394f625 b | b Parent commit (@-) : zsuskuln 1394f625 b | b
[EOF] [EOF]
"); ");
} }
@ -198,8 +198,8 @@ fn test_simplify_parents_multiple_redundant_parents() {
------- stderr ------- ------- stderr -------
Removed 2 edges from 2 out of 2 commits. Removed 2 edges from 2 out of 2 commits.
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: kmkuslsw 8cc01e1b f | f Working copy (@) now at: kmkuslsw 8cc01e1b f | f
Parent commit : znkkpsqq 040ae3a6 e | e Parent commit (@-) : znkkpsqq 040ae3a6 e | e
[EOF] [EOF]
"); ");
@ -224,8 +224,8 @@ fn test_simplify_parents_multiple_redundant_parents() {
------- stderr ------- ------- stderr -------
Removed 2 edges from 2 out of 4 commits. Removed 2 edges from 2 out of 4 commits.
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: kmkuslsw 70a39dff f | f Working copy (@) now at: kmkuslsw 70a39dff f | f
Parent commit : znkkpsqq a021fee9 e | e Parent commit (@-) : znkkpsqq a021fee9 e | e
[EOF] [EOF]
"); ");
@ -274,8 +274,8 @@ fn test_simplify_parents_no_args() {
------- stderr ------- ------- stderr -------
Removed 2 edges from 2 out of 6 commits. Removed 2 edges from 2 out of 6 commits.
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: kmkuslsw 8cc01e1b f | f Working copy (@) now at: kmkuslsw 8cc01e1b f | f
Parent commit : znkkpsqq 040ae3a6 e | e Parent commit (@-) : znkkpsqq 040ae3a6 e | e
[EOF] [EOF]
"); ");
@ -300,8 +300,8 @@ fn test_simplify_parents_no_args() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Removed 1 edges from 1 out of 3 commits. Removed 1 edges from 1 out of 3 commits.
Working copy now at: kmkuslsw 0c6b4c43 f | f Working copy (@) now at: kmkuslsw 0c6b4c43 f | f
Parent commit : znkkpsqq 6a679611 e | e Parent commit (@-) : znkkpsqq 6a679611 e | e
[EOF] [EOF]
"); ");

66
cli/tests/test_split_command.rs
View File

@ -69,8 +69,8 @@ fn test_split_by_paths() {
------- stderr ------- ------- stderr -------
First part: qpvuntsm 65569ca7 (no description set) First part: qpvuntsm 65569ca7 (no description set)
Second part: zsuskuln 709756f0 (no description set) Second part: zsuskuln 709756f0 (no description set)
Working copy now at: zsuskuln 709756f0 (no description set) Working copy (@) now at: zsuskuln 709756f0 (no description set)
Parent commit : qpvuntsm 65569ca7 (no description set) Parent commit (@-) : qpvuntsm 65569ca7 (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!( insta::assert_snapshot!(
@ -123,8 +123,8 @@ fn test_split_by_paths() {
Rebased 1 descendant commits Rebased 1 descendant commits
First part: qpvuntsm 9da0eea0 (no description set) First part: qpvuntsm 9da0eea0 (no description set)
Second part: znkkpsqq 5b5714a3 (empty) (no description set) Second part: znkkpsqq 5b5714a3 (empty) (no description set)
Working copy now at: zsuskuln 0c798ee7 (no description set) Working copy (@) now at: zsuskuln 0c798ee7 (no description set)
Parent commit : znkkpsqq 5b5714a3 (empty) (no description set) Parent commit (@-) : znkkpsqq 5b5714a3 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -154,8 +154,8 @@ fn test_split_by_paths() {
Rebased 1 descendant commits Rebased 1 descendant commits
First part: qpvuntsm bd42f95a (empty) (no description set) First part: qpvuntsm bd42f95a (empty) (no description set)
Second part: lylxulpl ed55c86b (no description set) Second part: lylxulpl ed55c86b (no description set)
Working copy now at: zsuskuln 1e1ed741 (no description set) Working copy (@) now at: zsuskuln 1e1ed741 (no description set)
Parent commit : lylxulpl ed55c86b (no description set) Parent commit (@-) : lylxulpl ed55c86b (no description set)
[EOF] [EOF]
"); ");
@ -204,8 +204,8 @@ fn test_split_with_non_empty_description() {
------- stderr ------- ------- stderr -------
First part: qpvuntsm 231a3c00 part 1 First part: qpvuntsm 231a3c00 part 1
Second part: kkmpptxz e96291aa part 2 Second part: kkmpptxz e96291aa part 2
Working copy now at: kkmpptxz e96291aa part 2 Working copy (@) now at: kkmpptxz e96291aa part 2
Parent commit : qpvuntsm 231a3c00 part 1 Parent commit (@-) : qpvuntsm 231a3c00 part 1
[EOF] [EOF]
"); ");
@ -258,8 +258,8 @@ fn test_split_with_default_description() {
------- stderr ------- ------- stderr -------
First part: qpvuntsm 02ee5d60 TESTED=TODO First part: qpvuntsm 02ee5d60 TESTED=TODO
Second part: rlvkpnrz 33cd046b (no description set) Second part: rlvkpnrz 33cd046b (no description set)
Working copy now at: rlvkpnrz 33cd046b (no description set) Working copy (@) now at: rlvkpnrz 33cd046b (no description set)
Parent commit : qpvuntsm 02ee5d60 TESTED=TODO Parent commit (@-) : qpvuntsm 02ee5d60 TESTED=TODO
[EOF] [EOF]
"); ");
@ -334,15 +334,15 @@ fn test_split_with_descendants() {
) )
.unwrap(); .unwrap();
let output = test_env.run_jj_in(&workspace_path, ["split", "file1", "-r", "qpvu"]); let output = test_env.run_jj_in(&workspace_path, ["split", "file1", "-r", "qpvu"]);
insta::assert_snapshot!(output, @r###" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 2 descendant commits Rebased 2 descendant commits
First part: qpvuntsm 34dd141b Add file1 First part: qpvuntsm 34dd141b Add file1
Second part: royxmykx 465e03d0 Add file2 Second part: royxmykx 465e03d0 Add file2
Working copy now at: kkmpptxz 2d5d641f Add file4 Working copy (@) now at: kkmpptxz 2d5d641f Add file4
Parent commit : rlvkpnrz b3bd9eb7 Add file3 Parent commit (@-) : rlvkpnrz b3bd9eb7 Add file3
[EOF] [EOF]
"###); ");
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###" insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###"
@ kkmpptxzrspx false Add file4 @ kkmpptxzrspx false Add file4
○ rlvkpnrzqnoo false Add file3 ○ rlvkpnrzqnoo false Add file3
@ -453,9 +453,9 @@ fn test_split_with_merge_child() {
Rebased 1 descendant commits Rebased 1 descendant commits
First part: kkmpptxz e8006b47 Add file1 First part: kkmpptxz e8006b47 Add file1
Second part: royxmykx 5e1b793d Add file2 Second part: royxmykx 5e1b793d Add file2
Working copy now at: zsuskuln 696935af (empty) 2 Working copy (@) now at: zsuskuln 696935af (empty) 2
Parent commit : qpvuntsm 8b64ddff (empty) 1 Parent commit (@-) : qpvuntsm 8b64ddff (empty) 1
Parent commit : royxmykx 5e1b793d Add file2 Parent commit (@-) : royxmykx 5e1b793d Add file2
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r" insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r"
@ -499,8 +499,8 @@ fn test_split_parallel_no_descendants() {
------- stderr ------- ------- stderr -------
First part: qpvuntsm 48018df6 TESTED=TODO First part: qpvuntsm 48018df6 TESTED=TODO
Second part: kkmpptxz 7eddbf93 (no description set) Second part: kkmpptxz 7eddbf93 (no description set)
Working copy now at: kkmpptxz 7eddbf93 (no description set) Working copy (@) now at: kkmpptxz 7eddbf93 (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -618,8 +618,8 @@ fn test_split_parallel_with_descendants() {
Rebased 2 descendant commits Rebased 2 descendant commits
First part: qpvuntsm 84df941d Add file1 First part: qpvuntsm 84df941d Add file1
Second part: vruxwmqv 94753be3 Add file2 Second part: vruxwmqv 94753be3 Add file2
Working copy now at: vruxwmqv 94753be3 Add file2 Working copy (@) now at: vruxwmqv 94753be3 Add file2
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
[EOF] [EOF]
"); ");
@ -705,10 +705,10 @@ fn test_split_parallel_with_merge_child() {
Rebased 1 descendant commits Rebased 1 descendant commits
First part: kkmpptxz e8006b47 Add file1 First part: kkmpptxz e8006b47 Add file1
Second part: royxmykx 2cc60f3d Add file2 Second part: royxmykx 2cc60f3d Add file2
Working copy now at: zsuskuln 35b5d7eb (empty) 2 Working copy (@) now at: zsuskuln 35b5d7eb (empty) 2
Parent commit : qpvuntsm 8b64ddff (empty) 1 Parent commit (@-) : qpvuntsm 8b64ddff (empty) 1
Parent commit : kkmpptxz e8006b47 Add file1 Parent commit (@-) : kkmpptxz e8006b47 Add file1
Parent commit : royxmykx 2cc60f3d Add file2 Parent commit (@-) : royxmykx 2cc60f3d Add file2
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r" insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r"
@ -786,8 +786,8 @@ fn test_split_interactive() {
------- stderr ------- ------- stderr -------
First part: qpvuntsm 0e15949e (no description set) First part: qpvuntsm 0e15949e (no description set)
Second part: rlvkpnrz 9ed12e4c (no description set) Second part: rlvkpnrz 9ed12e4c (no description set)
Working copy now at: rlvkpnrz 9ed12e4c (no description set) Working copy (@) now at: rlvkpnrz 9ed12e4c (no description set)
Parent commit : qpvuntsm 0e15949e (no description set) Parent commit (@-) : qpvuntsm 0e15949e (no description set)
[EOF] [EOF]
"); ");
@ -860,8 +860,8 @@ fn test_split_interactive_with_paths() {
------- stderr ------- ------- stderr -------
First part: rlvkpnrz e3d766b8 (no description set) First part: rlvkpnrz e3d766b8 (no description set)
Second part: kkmpptxz 4cf22d3b (no description set) Second part: kkmpptxz 4cf22d3b (no description set)
Working copy now at: kkmpptxz 4cf22d3b (no description set) Working copy (@) now at: kkmpptxz 4cf22d3b (no description set)
Parent commit : rlvkpnrz e3d766b8 (no description set) Parent commit (@-) : rlvkpnrz e3d766b8 (no description set)
[EOF] [EOF]
"); ");
@ -1089,8 +1089,8 @@ fn test_split_with_bookmarks(bookmark_behavior: BookmarkBehavior) {
------- stderr ------- ------- stderr -------
First part: qpvuntsm 63d0c5ed *le-signet* | first-commit First part: qpvuntsm 63d0c5ed *le-signet* | first-commit
Second part: mzvwutvl a9f5665f second-commit Second part: mzvwutvl a9f5665f second-commit
Working copy now at: mzvwutvl a9f5665f second-commit Working copy (@) now at: mzvwutvl a9f5665f second-commit
Parent commit : qpvuntsm 63d0c5ed *le-signet* | first-commit Parent commit (@-) : qpvuntsm 63d0c5ed *le-signet* | first-commit
[EOF] [EOF]
"); ");
} }
@ -1109,8 +1109,8 @@ fn test_split_with_bookmarks(bookmark_behavior: BookmarkBehavior) {
------- stderr ------- ------- stderr -------
First part: qpvuntsm 63d0c5ed first-commit First part: qpvuntsm 63d0c5ed first-commit
Second part: mzvwutvl a9f5665f *le-signet* | second-commit Second part: mzvwutvl a9f5665f *le-signet* | second-commit
Working copy now at: mzvwutvl a9f5665f *le-signet* | second-commit Working copy (@) now at: mzvwutvl a9f5665f *le-signet* | second-commit
Parent commit : qpvuntsm 63d0c5ed first-commit Parent commit (@-) : qpvuntsm 63d0c5ed first-commit
[EOF] [EOF]
"); ");
} }

76
cli/tests/test_squash_command.rs
View File

@ -51,8 +51,8 @@ fn test_squash() {
let output = test_env.run_jj_in(&repo_path, ["squash"]); let output = test_env.run_jj_in(&repo_path, ["squash"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: vruxwmqv f7bb78d8 (empty) (no description set) Working copy (@) now at: vruxwmqv f7bb78d8 (empty) (no description set)
Parent commit : kkmpptxz 59f44460 b c | (no description set) Parent commit (@-) : kkmpptxz 59f44460 b c | (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r"
@ -74,8 +74,8 @@ fn test_squash() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: mzvwutvl 1d70f50a c | (no description set) Working copy (@) now at: mzvwutvl 1d70f50a c | (no description set)
Parent commit : qpvuntsm 9146bcc8 a b | (no description set) Parent commit (@-) : qpvuntsm 9146bcc8 a b | (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r"
@ -134,8 +134,8 @@ fn test_squash() {
let output = test_env.run_jj_in(&repo_path, ["squash"]); let output = test_env.run_jj_in(&repo_path, ["squash"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: xlzxqlsl b50b843d (empty) (no description set) Working copy (@) now at: xlzxqlsl b50b843d (empty) (no description set)
Parent commit : nmzmmopx 338cbc05 e | (no description set) Parent commit (@-) : nmzmmopx 338cbc05 e | (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r"
@ -197,8 +197,8 @@ fn test_squash_partial() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: mzvwutvl 3c633226 c | (no description set) Working copy (@) now at: mzvwutvl 3c633226 c | (no description set)
Parent commit : qpvuntsm 38ffd8b9 a b | (no description set) Parent commit (@-) : qpvuntsm 38ffd8b9 a b | (no description set)
[EOF] [EOF]
"); ");
@ -235,8 +235,8 @@ fn test_squash_partial() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: mzvwutvl 57c3cf20 c | (no description set) Working copy (@) now at: mzvwutvl 57c3cf20 c | (no description set)
Parent commit : kkmpptxz c4925e01 b | (no description set) Parent commit (@-) : kkmpptxz c4925e01 b | (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r"
@ -275,8 +275,8 @@ fn test_squash_partial() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: mzvwutvl 64d7ad7c c | (no description set) Working copy (@) now at: mzvwutvl 64d7ad7c c | (no description set)
Parent commit : kkmpptxz 60a26452 b | (no description set) Parent commit (@-) : kkmpptxz 60a26452 b | (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r"
@ -361,8 +361,8 @@ fn test_squash_keep_emptied() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: mzvwutvl 7ee7f18a c | (no description set) Working copy (@) now at: mzvwutvl 7ee7f18a c | (no description set)
Parent commit : kkmpptxz 9490bd7f b | (empty) (no description set) Parent commit (@-) : kkmpptxz 9490bd7f b | (empty) (no description set)
[EOF] [EOF]
"); ");
// With --keep-emptied, b remains even though it is now empty. // With --keep-emptied, b remains even though it is now empty.
@ -455,8 +455,8 @@ fn test_squash_from_to() {
let output = test_env.run_jj_in(&repo_path, ["squash", "--from", "c"]); let output = test_env.run_jj_in(&repo_path, ["squash", "--from", "c"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kmkuslsw b902d1dd f | (no description set) Working copy (@) now at: kmkuslsw b902d1dd f | (no description set)
Parent commit : znkkpsqq c2f9de87 e | (no description set) Parent commit (@-) : znkkpsqq c2f9de87 e | (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -488,8 +488,8 @@ fn test_squash_from_to() {
let output = test_env.run_jj_in(&repo_path, ["squash", "--from", "@--"]); let output = test_env.run_jj_in(&repo_path, ["squash", "--from", "@--"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kmkuslsw cfc5eb87 f | (no description set) Working copy (@) now at: kmkuslsw cfc5eb87 f | (no description set)
Parent commit : znkkpsqq 4dc7c279 e | (no description set) Parent commit (@-) : znkkpsqq 4dc7c279 e | (no description set)
[EOF] [EOF]
"); ");
// The change has been removed from the source (the change pointed to by 'd' // The change has been removed from the source (the change pointed to by 'd'
@ -518,8 +518,8 @@ fn test_squash_from_to() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: kmkuslsw 6de62c22 f | (no description set) Working copy (@) now at: kmkuslsw 6de62c22 f | (no description set)
Parent commit : vruxwmqv 32196a11 d e | (no description set) Parent commit (@-) : vruxwmqv 32196a11 d e | (no description set)
[EOF] [EOF]
"); ");
// The change has been removed from the source (the change pointed to by 'e' // The change has been removed from the source (the change pointed to by 'e'
@ -594,8 +594,8 @@ fn test_squash_from_to_partial() {
let output = test_env.run_jj_in(&repo_path, ["squash", "-i", "--from", "c"]); let output = test_env.run_jj_in(&repo_path, ["squash", "-i", "--from", "c"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: vruxwmqv 987bcfb2 d | (no description set) Working copy (@) now at: vruxwmqv 987bcfb2 d | (no description set)
Parent commit : qpvuntsm b7b76717 a | (no description set) Parent commit (@-) : qpvuntsm b7b76717 a | (no description set)
Added 0 files, modified 2 files, removed 0 files Added 0 files, modified 2 files, removed 0 files
[EOF] [EOF]
"); ");
@ -631,8 +631,8 @@ fn test_squash_from_to_partial() {
let output = test_env.run_jj_in(&repo_path, ["squash", "-i", "--from", "c"]); let output = test_env.run_jj_in(&repo_path, ["squash", "-i", "--from", "c"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: vruxwmqv 576244e8 d | (no description set) Working copy (@) now at: vruxwmqv 576244e8 d | (no description set)
Parent commit : qpvuntsm b7b76717 a | (no description set) Parent commit (@-) : qpvuntsm b7b76717 a | (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -671,8 +671,8 @@ fn test_squash_from_to_partial() {
let output = test_env.run_jj_in(&repo_path, ["squash", "--from", "c", "file1"]); let output = test_env.run_jj_in(&repo_path, ["squash", "--from", "c", "file1"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: vruxwmqv 5b407c24 d | (no description set) Working copy (@) now at: vruxwmqv 5b407c24 d | (no description set)
Parent commit : qpvuntsm b7b76717 a | (no description set) Parent commit (@-) : qpvuntsm b7b76717 a | (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
[EOF] [EOF]
"); ");
@ -815,8 +815,8 @@ fn test_squash_from_multiple() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: kpqxywon 7ea39167 f | (no description set) Working copy (@) now at: kpqxywon 7ea39167 f | (no description set)
Parent commit : yostqsxw acfbf2a0 e | (no description set) Parent commit (@-) : yostqsxw acfbf2a0 e | (no description set)
New conflicts appeared in 1 commits: New conflicts appeared in 1 commits:
yqosqzyt 4df3b215 d | (conflict) (no description set) yqosqzyt 4df3b215 d | (conflict) (no description set)
Hint: To resolve the conflicts, start by updating to it: Hint: To resolve the conflicts, start by updating to it:
@ -858,8 +858,8 @@ fn test_squash_from_multiple() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: xznxytkn 6a670d1a (empty) (no description set) Working copy (@) now at: xznxytkn 6a670d1a (empty) (no description set)
Parent commit : yostqsxw c1293ff7 e f | (no description set) Parent commit (@-) : yostqsxw c1293ff7 e f | (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r"
@ -961,8 +961,8 @@ fn test_squash_from_multiple_partial() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 2 descendant commits Rebased 2 descendant commits
Working copy now at: kpqxywon a8530305 f | (no description set) Working copy (@) now at: kpqxywon a8530305 f | (no description set)
Parent commit : yostqsxw 0a3637fc e | (no description set) Parent commit (@-) : yostqsxw 0a3637fc e | (no description set)
New conflicts appeared in 1 commits: New conflicts appeared in 1 commits:
yqosqzyt 05a3ab3d d | (conflict) (no description set) yqosqzyt 05a3ab3d d | (conflict) (no description set)
Hint: To resolve the conflicts, start by updating to it: Hint: To resolve the conflicts, start by updating to it:
@ -1025,8 +1025,8 @@ fn test_squash_from_multiple_partial() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: kpqxywon 3b7559b8 f | (no description set) Working copy (@) now at: kpqxywon 3b7559b8 f | (no description set)
Parent commit : yostqsxw a3b1714c e | (no description set) Parent commit (@-) : yostqsxw a3b1714c e | (no description set)
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r" insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r"
@ -1119,8 +1119,8 @@ fn test_squash_from_multiple_partial_no_op() {
); );
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: mzvwutvl e178068a d Working copy (@) now at: mzvwutvl e178068a d
Parent commit : qpvuntsm 2443ea76 a Parent commit (@-) : qpvuntsm 2443ea76 a
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"); ");
@ -1338,8 +1338,8 @@ fn test_squash_empty() {
let output = test_env.run_jj_in(&repo_path, ["squash"]); let output = test_env.run_jj_in(&repo_path, ["squash"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kkmpptxz adece6e8 (empty) (no description set) Working copy (@) now at: kkmpptxz adece6e8 (empty) (no description set)
Parent commit : qpvuntsm 5076fc41 (empty) parent Parent commit (@-) : qpvuntsm 5076fc41 (empty) parent
[EOF] [EOF]
"); ");
insta::assert_snapshot!(get_description(&test_env, &repo_path, "@-"), @r" insta::assert_snapshot!(get_description(&test_env, &repo_path, "@-"), @r"

68
cli/tests/test_status_command.rs
View File

@ -43,8 +43,8 @@ fn test_status_copies() {
M copy-source M copy-source
C {copy-source => copy-target} C {copy-source => copy-target}
R {rename-source => rename-target} R {rename-source => rename-target}
Working copy : rlvkpnrz a96c3086 (no description set) Working copy (@) : rlvkpnrz a96c3086 (no description set)
Parent commit: qpvuntsm e3e2c703 (no description set) Parent commit (@-): qpvuntsm e3e2c703 (no description set)
[EOF] [EOF]
"); ");
} }
@ -73,9 +73,9 @@ fn test_status_merge() {
let output = test_env.run_jj_in(&repo_path, ["status"]); let output = test_env.run_jj_in(&repo_path, ["status"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
The working copy has no changes. The working copy has no changes.
Working copy : mzvwutvl a538c72d (empty) (no description set) Working copy (@) : mzvwutvl a538c72d (empty) (no description set)
Parent commit: rlvkpnrz d3dd19f1 left | (empty) left Parent commit (@-): rlvkpnrz d3dd19f1 left | (empty) left
Parent commit: zsuskuln 705a356d right Parent commit (@-): zsuskuln 705a356d right
[EOF] [EOF]
"); ");
} }
@ -100,8 +100,8 @@ fn test_status_ignored_gitignore() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
Working copy changes: Working copy changes:
A .gitignore A .gitignore
Working copy : qpvuntsm 3cef2183 (no description set) Working copy (@) : qpvuntsm 3cef2183 (no description set)
Parent commit: zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
} }
@ -120,8 +120,8 @@ fn test_status_filtered() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
Working copy changes: Working copy changes:
A file_1 A file_1
Working copy : qpvuntsm c8fb8395 (no description set) Working copy (@) : qpvuntsm c8fb8395 (no description set)
Parent commit: zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
} }
@ -200,8 +200,8 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
let output = test_env.run_jj_in(&repo_path, ["status"]); let output = test_env.run_jj_in(&repo_path, ["status"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
The working copy has no changes. The working copy has no changes.
Working copy : yqosqzyt dcb25635 (conflict) (empty) boom-cont-2 Working copy (@) : yqosqzyt dcb25635 (conflict) (empty) boom-cont-2
Parent commit: royxmykx 664a4c6c (conflict) (empty) boom-cont Parent commit (@-): royxmykx 664a4c6c (conflict) (empty) boom-cont
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
conflicted.txt 2-sided conflict conflicted.txt 2-sided conflict
Hint: To resolve the conflicts, start by updating to the first one: Hint: To resolve the conflicts, start by updating to the first one:
@ -215,8 +215,8 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
let output = test_env.run_jj_in(&repo_path, ["status", "--color=always"]); let output = test_env.run_jj_in(&repo_path, ["status", "--color=always"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
The working copy has no changes. The working copy has no changes.
Working copy : yqosqzyt dcb25635 (conflict) (empty) boom-cont-2 Working copy (@) : yqosqzyt dcb25635 (conflict) (empty) boom-cont-2
Parent commit: royxmykx 664a4c6c (conflict) (empty) boom-cont Parent commit (@-): royxmykx 664a4c6c (conflict) (empty) boom-cont
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
conflicted.txt 2-sided conflict conflicted.txt 2-sided conflict
Hint: To resolve the conflicts, start by updating to the first one: Hint: To resolve the conflicts, start by updating to the first one:
@ -233,8 +233,8 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
); );
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
The working copy has no changes. The working copy has no changes.
Working copy : yqosqzyt dcb25635 (conflict) (empty) boom-cont-2 Working copy (@) : yqosqzyt dcb25635 (conflict) (empty) boom-cont-2
Parent commit: royxmykx 664a4c6c (conflict) (empty) boom-cont Parent commit (@-): royxmykx 664a4c6c (conflict) (empty) boom-cont
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
conflicted.txt 2-sided conflict conflicted.txt 2-sided conflict
[EOF] [EOF]
@ -281,8 +281,8 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
Working copy changes: Working copy changes:
M conflicted.txt M conflicted.txt
Working copy : wqnwkozp c4a6dbc2 fixed 2 Working copy (@) : wqnwkozp c4a6dbc2 fixed 2
Parent commit: kmkuslsw fcebf6ee fixed 1 Parent commit (@-): kmkuslsw fcebf6ee fixed 1
[EOF] [EOF]
"); ");
@ -317,8 +317,8 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
Working copy changes: Working copy changes:
M conflicted.txt M conflicted.txt
Working copy : kmkuslsw fcebf6ee fixed 1 Working copy (@) : kmkuslsw fcebf6ee fixed 1
Parent commit: yqosqzyt dcb25635 (conflict) (empty) boom-cont-2 Parent commit (@-): yqosqzyt dcb25635 (conflict) (empty) boom-cont-2
Hint: Conflict in parent commit has been resolved in working copy Hint: Conflict in parent commit has been resolved in working copy
[EOF] [EOF]
"); ");
@ -357,8 +357,8 @@ fn test_status_display_relevant_working_commit_conflict_hints() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
Working copy changes: Working copy changes:
A conflicted.txt A conflicted.txt
Working copy : qpvuntsm aade7195 Initial contents Working copy (@) : qpvuntsm aade7195 Initial contents
Parent commit: zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
} }
@ -424,9 +424,9 @@ fn test_status_simplify_conflict_sides() {
insta::assert_snapshot!(test_env.run_jj_in(&repo_path, ["status"]), insta::assert_snapshot!(test_env.run_jj_in(&repo_path, ["status"]),
@r" @r"
The working copy has no changes. The working copy has no changes.
Working copy : nkmrtpmo 83c4b9e7 conflict | (conflict) (empty) conflict Working copy (@) : nkmrtpmo 83c4b9e7 conflict | (conflict) (empty) conflict
Parent commit: kmkuslsw 4601566f conflictA | (conflict) (empty) conflictA Parent commit (@-): kmkuslsw 4601566f conflictA | (conflict) (empty) conflictA
Parent commit: lylxulpl 6f8d8381 conflictB | (conflict) (empty) conflictB Parent commit (@-): lylxulpl 6f8d8381 conflictB | (conflict) (empty) conflictB
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
fileA 2-sided conflict fileA 2-sided conflict
fileB 2-sided conflict fileB 2-sided conflict
@ -461,8 +461,8 @@ fn test_status_untracked_files() {
? initially-untracked-file ? initially-untracked-file
? sub/always-untracked ? sub/always-untracked
? sub/initially-untracked ? sub/initially-untracked
Working copy : qpvuntsm 230dd059 (empty) (no description set) Working copy (@) : qpvuntsm 230dd059 (empty) (no description set)
Parent commit: zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -486,8 +486,8 @@ fn test_status_untracked_files() {
Untracked paths: Untracked paths:
? always-untracked-file ? always-untracked-file
? sub/always-untracked ? sub/always-untracked
Working copy : qpvuntsm 99798fcd (no description set) Working copy (@) : qpvuntsm 99798fcd (no description set)
Parent commit: zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
@ -498,8 +498,8 @@ fn test_status_untracked_files() {
Untracked paths: Untracked paths:
? always-untracked-file ? always-untracked-file
? sub/always-untracked ? sub/always-untracked
Working copy : mzvwutvl 30e53c74 (empty) (no description set) Working copy (@) : mzvwutvl 30e53c74 (empty) (no description set)
Parent commit: qpvuntsm 99798fcd (no description set) Parent commit (@-): qpvuntsm 99798fcd (no description set)
[EOF] [EOF]
"); ");
@ -524,8 +524,8 @@ fn test_status_untracked_files() {
? initially-untracked-file ? initially-untracked-file
? sub/always-untracked ? sub/always-untracked
? sub/initially-untracked ? sub/initially-untracked
Working copy : mzvwutvl bb362aaf (no description set) Working copy (@) : mzvwutvl bb362aaf (no description set)
Parent commit: qpvuntsm 99798fcd (no description set) Parent commit (@-): qpvuntsm 99798fcd (no description set)
[EOF] [EOF]
"); ");
@ -538,8 +538,8 @@ fn test_status_untracked_files() {
? initially-untracked-file ? initially-untracked-file
? sub/always-untracked ? sub/always-untracked
? sub/initially-untracked ? sub/initially-untracked
Working copy : yostqsxw 8e8c02fe (empty) (no description set) Working copy (@) : yostqsxw 8e8c02fe (empty) (no description set)
Parent commit: mzvwutvl bb362aaf (no description set) Parent commit (@-): mzvwutvl bb362aaf (no description set)
[EOF] [EOF]
"); ");
} }

12
cli/tests/test_undo.rs
View File

@ -505,8 +505,8 @@ fn test_shows_a_warning_when_undoing_an_undo_operation_as_bare_jj_undo() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Undid operation: 2d5b73a97567 (2001-02-03 08:05:09) undo operation 289cb69a8458456474a77cc432e8009b99f039cdcaf19ba4526753e97d70fee3fd0f410ff2b7c1d10cf0c2501702e7a85d58f9d813cdca567c377431ec4d2b97 Undid operation: 2d5b73a97567 (2001-02-03 08:05:09) undo operation 289cb69a8458456474a77cc432e8009b99f039cdcaf19ba4526753e97d70fee3fd0f410ff2b7c1d10cf0c2501702e7a85d58f9d813cdca567c377431ec4d2b97
Working copy now at: rlvkpnrz 65b6b74e (empty) (no description set) Working copy (@) now at: rlvkpnrz 65b6b74e (empty) (no description set)
Parent commit : qpvuntsm 230dd059 (empty) (no description set) Parent commit (@-) : qpvuntsm 230dd059 (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: 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. 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] [EOF]
@ -519,8 +519,8 @@ fn test_shows_a_warning_when_undoing_an_undo_operation_as_bare_jj_undo() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Undid operation: b16799358b33 (2001-02-03 08:05:12) undo operation b14487c6d6d98f7f575ea03c48ed92d899c2a0ecbe9458221b6fc11af2bf6d918c9620cae1f8268012b0e25c7dd6f78b19ec628d0504a0830dc562d6625ba9ec Undid operation: b16799358b33 (2001-02-03 08:05:12) undo operation b14487c6d6d98f7f575ea03c48ed92d899c2a0ecbe9458221b6fc11af2bf6d918c9620cae1f8268012b0e25c7dd6f78b19ec628d0504a0830dc562d6625ba9ec
Working copy now at: mzvwutvl 167f90e7 (empty) (no description set) Working copy (@) now at: mzvwutvl 167f90e7 (empty) (no description set)
Parent commit : qpvuntsm 230dd059 (empty) (no description set) Parent commit (@-) : qpvuntsm 230dd059 (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: 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. 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] [EOF]
@ -541,8 +541,8 @@ fn test_shows_no_warning_when_undoing_a_specific_undo_change() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Undid operation: 2d5b73a97567 (2001-02-03 08:05:09) undo operation 289cb69a8458456474a77cc432e8009b99f039cdcaf19ba4526753e97d70fee3fd0f410ff2b7c1d10cf0c2501702e7a85d58f9d813cdca567c377431ec4d2b97 Undid operation: 2d5b73a97567 (2001-02-03 08:05:09) undo operation 289cb69a8458456474a77cc432e8009b99f039cdcaf19ba4526753e97d70fee3fd0f410ff2b7c1d10cf0c2501702e7a85d58f9d813cdca567c377431ec4d2b97
Working copy now at: rlvkpnrz 65b6b74e (empty) (no description set) Working copy (@) now at: rlvkpnrz 65b6b74e (empty) (no description set)
Parent commit : qpvuntsm 230dd059 (empty) (no description set) Parent commit (@-) : qpvuntsm 230dd059 (empty) (no description set)
[EOF] [EOF]
"); ");
} }

20
cli/tests/test_working_copy.rs
View File

@ -155,8 +155,8 @@ fn test_snapshot_large_file_restore() {
- Run `jj --config snapshot.max-new-file-size=13 st` - 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. This will increase the maximum file size allowed for new files, for this command only.
Created kkmpptxz e3eb7e81 (no description set) Created kkmpptxz e3eb7e81 (no description set)
Working copy now at: kkmpptxz e3eb7e81 (no description set) Working copy (@) now at: kkmpptxz e3eb7e81 (no description set)
Parent commit : zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-) : zzzzzzzz 00000000 (empty) (no description set)
Added 1 files, modified 0 files, removed 0 files 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. 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`. Hint: Inspect the changes compared to the intended target with `jj diff --from e3eb7e819de5`.
@ -173,8 +173,8 @@ fn test_snapshot_large_file_restore() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
Working copy changes: Working copy changes:
A file A file
Working copy : kkmpptxz b75eed09 (no description set) Working copy (@) : kkmpptxz b75eed09 (no description set)
Parent commit: zzzzzzzz 00000000 (empty) (no description set) Parent commit (@-): zzzzzzzz 00000000 (empty) (no description set)
[EOF] [EOF]
"); ");
} }
@ -441,9 +441,9 @@ fn test_conflict_marker_length_stored_in_working_copy() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
Working copy changes: Working copy changes:
M file M file
Working copy : mzvwutvl 3a981880 (conflict) (no description set) Working copy (@) : mzvwutvl 3a981880 (conflict) (no description set)
Parent commit: rlvkpnrz ce613b49 side-a Parent commit (@-): rlvkpnrz ce613b49 side-a
Parent commit: zsuskuln 7b2b03ab side-b Parent commit (@-): zsuskuln 7b2b03ab side-b
Warning: There are unresolved conflicts at these paths: Warning: There are unresolved conflicts at these paths:
file 2-sided conflict file 2-sided conflict
[EOF] [EOF]
@ -496,9 +496,9 @@ fn test_conflict_marker_length_stored_in_working_copy() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
Working copy changes: Working copy changes:
M file M file
Working copy : mzvwutvl 1aefd866 (no description set) Working copy (@) : mzvwutvl 1aefd866 (no description set)
Parent commit: rlvkpnrz ce613b49 side-a Parent commit (@-): rlvkpnrz ce613b49 side-a
Parent commit: zsuskuln 7b2b03ab side-b Parent commit (@-): zsuskuln 7b2b03ab side-b
[EOF] [EOF]
"); ");

80
cli/tests/test_workspaces.rs
View File

@ -45,8 +45,8 @@ fn test_workspaces_add_second_workspace() {
insta::assert_snapshot!(output.normalize_backslash(), @r#" insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr ------- ------- stderr -------
Created workspace in "../secondary" Created workspace in "../secondary"
Working copy now at: rzvqmyuk 5ed2222c (empty) (no description set) Working copy (@) now at: rzvqmyuk 5ed2222c (empty) (no description set)
Parent commit : qpvuntsm 751b12b7 initial Parent commit (@-) : qpvuntsm 751b12b7 initial
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -226,8 +226,8 @@ fn test_workspaces_add_at_operation() {
let output = test_env.run_jj_in(&main_path, ["commit", "-m1"]); let output = test_env.run_jj_in(&main_path, ["commit", "-m1"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: rlvkpnrz 18d8b994 (empty) (no description set) Working copy (@) now at: rlvkpnrz 18d8b994 (empty) (no description set)
Parent commit : qpvuntsm 3364a7ed 1 Parent commit (@-) : qpvuntsm 3364a7ed 1
[EOF] [EOF]
"); ");
@ -235,8 +235,8 @@ fn test_workspaces_add_at_operation() {
let output = test_env.run_jj_in(&main_path, ["commit", "-m2"]); let output = test_env.run_jj_in(&main_path, ["commit", "-m2"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: kkmpptxz 2e7dc5ab (empty) (no description set) Working copy (@) now at: kkmpptxz 2e7dc5ab (empty) (no description set)
Parent commit : rlvkpnrz 0dbaa19a 2 Parent commit (@-) : rlvkpnrz 0dbaa19a 2
[EOF] [EOF]
"); ");
@ -250,8 +250,8 @@ fn test_workspaces_add_at_operation() {
insta::assert_snapshot!(output.normalize_backslash(), @r#" insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr ------- ------- stderr -------
Created workspace in "../secondary" Created workspace in "../secondary"
Working copy now at: rzvqmyuk a4d1cbc9 (empty) (no description set) Working copy (@) now at: rzvqmyuk a4d1cbc9 (empty) (no description set)
Parent commit : qpvuntsm 3364a7ed 1 Parent commit (@-) : qpvuntsm 3364a7ed 1
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -263,8 +263,8 @@ fn test_workspaces_add_at_operation() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
Working copy changes: Working copy changes:
A file4 A file4
Working copy : rzvqmyuk 2ba74f85 (no description set) Working copy (@) : rzvqmyuk 2ba74f85 (no description set)
Parent commit: qpvuntsm 3364a7ed 1 Parent commit (@-): qpvuntsm 3364a7ed 1
[EOF] [EOF]
------- stderr ------- ------- stderr -------
Concurrent modification detected, resolving automatically. Concurrent modification detected, resolving automatically.
@ -328,8 +328,8 @@ fn test_workspaces_add_workspace_at_revision() {
insta::assert_snapshot!(output.normalize_backslash(), @r#" insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr ------- ------- stderr -------
Created workspace in "../secondary" Created workspace in "../secondary"
Working copy now at: zxsnswpr e374e74a (empty) (no description set) Working copy (@) now at: zxsnswpr e374e74a (empty) (no description set)
Parent commit : qpvuntsm f6097c2f first Parent commit (@-) : qpvuntsm f6097c2f first
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -415,10 +415,10 @@ fn test_workspaces_add_workspace_multiple_revisions() {
insta::assert_snapshot!(output.normalize_backslash(), @r#" insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr ------- ------- stderr -------
Created workspace in "../merged" Created workspace in "../merged"
Working copy now at: wmwvqwsz f4fa64f4 (empty) (no description set) Working copy (@) now at: wmwvqwsz f4fa64f4 (empty) (no description set)
Parent commit : mzvwutvl 6c843d62 third Parent commit (@-) : mzvwutvl 6c843d62 third
Parent commit : kkmpptxz 544cd61f second Parent commit (@-) : kkmpptxz 544cd61f second
Parent commit : qpvuntsm f6097c2f first Parent commit (@-) : qpvuntsm f6097c2f first
Added 3 files, modified 0 files, removed 0 files Added 3 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -463,8 +463,8 @@ fn test_workspaces_add_workspace_from_subdir() {
insta::assert_snapshot!(output.normalize_backslash(), @r#" insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr ------- ------- stderr -------
Created workspace in "../../secondary" Created workspace in "../../secondary"
Working copy now at: rzvqmyuk 7ad84461 (empty) (no description set) Working copy (@) now at: rzvqmyuk 7ad84461 (empty) (no description set)
Parent commit : qpvuntsm a3a43d9e initial Parent commit (@-) : qpvuntsm a3a43d9e initial
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -495,8 +495,8 @@ fn test_workspaces_add_workspace_in_current_workspace() {
------- stderr ------- ------- stderr -------
Created workspace in "secondary" 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. 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) Working copy (@) now at: pmmvwywv 0a77a39d (empty) (no description set)
Parent commit : qpvuntsm 751b12b7 initial Parent commit (@-) : qpvuntsm 751b12b7 initial
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -514,8 +514,8 @@ fn test_workspaces_add_workspace_in_current_workspace() {
insta::assert_snapshot!(output.normalize_backslash(), @r#" insta::assert_snapshot!(output.normalize_backslash(), @r#"
------- stderr ------- ------- stderr -------
Created workspace in "third" Created workspace in "third"
Working copy now at: zxsnswpr 64746d4b (empty) (no description set) Working copy (@) now at: zxsnswpr 64746d4b (empty) (no description set)
Parent commit : qpvuntsm 751b12b7 initial Parent commit (@-) : qpvuntsm 751b12b7 initial
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
[EOF] [EOF]
"#); "#);
@ -574,8 +574,8 @@ fn test_workspaces_conflicting_edits() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: mzvwutvl a58c9a9b (empty) (no description set) Working copy (@) now at: mzvwutvl a58c9a9b (empty) (no description set)
Parent commit : qpvuntsm d4124476 (no description set) Parent commit (@-) : qpvuntsm d4124476 (no description set)
[EOF] [EOF]
"); ");
@ -615,8 +615,8 @@ fn test_workspaces_conflicting_edits() {
------- stderr ------- ------- stderr -------
Concurrent modification detected, resolving automatically. Concurrent modification detected, resolving automatically.
Rebased 1 descendant commits onto commits rewritten by other operation Rebased 1 descendant commits onto commits rewritten by other operation
Working copy now at: pmmvwywv?? e82cd4ee (empty) (no description set) Working copy (@) now at: pmmvwywv?? e82cd4ee (empty) (no description set)
Parent commit : qpvuntsm d4124476 (no description set) Parent commit (@-) : qpvuntsm d4124476 (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Updated working copy to fresh commit e82cd4ee8faa Updated working copy to fresh commit e82cd4ee8faa
[EOF] [EOF]
@ -675,8 +675,8 @@ fn test_workspaces_updated_by_other() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: mzvwutvl a58c9a9b (empty) (no description set) Working copy (@) now at: mzvwutvl a58c9a9b (empty) (no description set)
Parent commit : qpvuntsm d4124476 (no description set) Parent commit (@-) : qpvuntsm d4124476 (no description set)
[EOF] [EOF]
"); ");
@ -703,8 +703,8 @@ fn test_workspaces_updated_by_other() {
let output = test_env.run_jj_in(&secondary_path, ["workspace", "update-stale"]); let output = test_env.run_jj_in(&secondary_path, ["workspace", "update-stale"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Working copy now at: pmmvwywv e82cd4ee (empty) (no description set) Working copy (@) now at: pmmvwywv e82cd4ee (empty) (no description set)
Parent commit : qpvuntsm d4124476 (no description set) Parent commit (@-) : qpvuntsm d4124476 (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Updated working copy to fresh commit e82cd4ee8faa Updated working copy to fresh commit e82cd4ee8faa
[EOF] [EOF]
@ -752,8 +752,8 @@ fn test_workspaces_updated_by_other_automatic() {
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
------- stderr ------- ------- stderr -------
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: mzvwutvl a58c9a9b (empty) (no description set) Working copy (@) now at: mzvwutvl a58c9a9b (empty) (no description set)
Parent commit : qpvuntsm d4124476 (no description set) Parent commit (@-) : qpvuntsm d4124476 (no description set)
[EOF] [EOF]
"); ");
@ -771,12 +771,12 @@ fn test_workspaces_updated_by_other_automatic() {
let output = test_env.run_jj_in(&secondary_path, ["st"]); let output = test_env.run_jj_in(&secondary_path, ["st"]);
insta::assert_snapshot!(output, @r" insta::assert_snapshot!(output, @r"
The working copy has no changes. The working copy has no changes.
Working copy : pmmvwywv e82cd4ee (empty) (no description set) Working copy (@) : pmmvwywv e82cd4ee (empty) (no description set)
Parent commit: qpvuntsm d4124476 (no description set) Parent commit (@-): qpvuntsm d4124476 (no description set)
[EOF] [EOF]
------- stderr ------- ------- stderr -------
Working copy now at: pmmvwywv e82cd4ee (empty) (no description set) Working copy (@) now at: pmmvwywv e82cd4ee (empty) (no description set)
Parent commit : qpvuntsm d4124476 (no description set) Parent commit (@-) : qpvuntsm d4124476 (no description set)
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
Updated working copy to fresh commit e82cd4ee8faa Updated working copy to fresh commit e82cd4ee8faa
[EOF] [EOF]
@ -890,8 +890,8 @@ fn test_workspaces_current_op_discarded_by_other(automatic: bool) {
C {modified => added} C {modified => added}
D deleted D deleted
M modified M modified
Working copy : kmkuslsw 0b518140 RECOVERY COMMIT FROM `jj workspace update-stale` Working copy (@) : kmkuslsw 0b518140 RECOVERY COMMIT FROM `jj workspace update-stale`
Parent commit: rzvqmyuk 3df3bf89 (empty) (no description set) Parent commit (@-): rzvqmyuk 3df3bf89 (empty) (no description set)
[EOF] [EOF]
------- stderr ------- ------- stderr -------
Failed to read working copy's current operation; attempting recovery. Error message from read attempt: Object 129f2dca870b954e2966fba35893bb47a5bc6358db6e8c4065cee91d2d49073efc3e055b9b81269a13c443d964abb18e83d25de73db2376ff434c876c59976ac of type operation not found Failed to read working copy's current operation; attempting recovery. Error message from read attempt: Object 129f2dca870b954e2966fba35893bb47a5bc6358db6e8c4065cee91d2d49073efc3e055b9b81269a13c443d964abb18e83d25de73db2376ff434c876c59976ac of type operation not found
@ -947,8 +947,8 @@ fn test_workspaces_current_op_discarded_by_other(automatic: bool) {
C {modified => added} C {modified => added}
D deleted D deleted
M modified M modified
Working copy : kmkuslsw 0b518140 RECOVERY COMMIT FROM `jj workspace update-stale` Working copy (@) : kmkuslsw 0b518140 RECOVERY COMMIT FROM `jj workspace update-stale`
Parent commit: rzvqmyuk 3df3bf89 (empty) (no description set) Parent commit (@-): rzvqmyuk 3df3bf89 (empty) (no description set)
[EOF] [EOF]
"); ");
} }

26
docs/FAQ.md
View File

@ -240,8 +240,8 @@ First, create a new commit branched from main and add your private changes:
```shell ```shell
$ jj new main -m "private: my credentials" $ jj new main -m "private: my credentials"
Working copy now at: wwwwwwww 861de9eb (empty) private: my credentials Working copy (@) now at: wwwwwwww 861de9eb (empty) private: my credentials
Parent commit : yyyyyyyy b624cf12 main | Existing work Parent commit (@-) : yyyyyyyy b624cf12 main | Existing work
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
$ echo '{ "password": "p@ssw0rd1" }' > secret_config.json $ echo '{ "password": "p@ssw0rd1" }' > secret_config.json
@ -252,9 +252,9 @@ commit:
```shell ```shell
$ jj new xxxxxxxx wwwwwwww $ jj new xxxxxxxx wwwwwwww
Working copy now at: vvvvvvvv ac4d9fbe (empty) (no description set) Working copy (@) now at: vvvvvvvv ac4d9fbe (empty) (no description set)
Parent commit : xxxxxxxx ef612875 Add new feature Parent commit (@-) : xxxxxxxx ef612875 Add new feature
Parent commit : wwwwwwww 2106921e private: my credentials Parent commit (@-) : wwwwwwww 2106921e private: my credentials
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
$ jj log $ jj log
@ -283,13 +283,13 @@ If you need a new empty commit on top of `xxxxxxxx` you can use the
```shell ```shell
# Insert a new commit after xxxxxxxx # Insert a new commit after xxxxxxxx
$ jj new --no-edit -A xxxxxxxx -m "Another feature" $ jj new --no-edit -A xxxxxxxx -m "Another feature"
Working copy now at: uuuuuuuu 1c3cff09 (empty) Another feature Working copy (@) now at: uuuuuuuu 1c3cff09 (empty) Another feature
Parent commit : xxxxxxxx ef612875 Add new feature Parent commit (@-) : xxxxxxxx ef612875 Add new feature
# Insert a new commit between yyyyyyyy and vvvvvvvv # Insert a new commit between yyyyyyyy and vvvvvvvv
$ jj new --no-edit -A yyyyyyyy -B vvvvvvvv -m "Yet another feature" $ jj new --no-edit -A yyyyyyyy -B vvvvvvvv -m "Yet another feature"
Working copy now at: tttttttt 938ab831 (empty) Yet another feature Working copy (@) now at: tttttttt 938ab831 (empty) Yet another feature
Parent commit : yyyyyyyy b624cf12 Existing work Parent commit (@-) : yyyyyyyy b624cf12 Existing work
``` ```
To avoid pushing change _wwwwwwww_ by mistake, use the configuration To avoid pushing change _wwwwwwww_ by mistake, use the configuration
@ -406,8 +406,8 @@ contents as `31a`.
```console ```console
$ jj new -m "featureB" $ jj new -m "featureB"
Working copy now at: pvnrkl 47171aa (empty) featureB Working copy (@) now at: pvnrkl 47171aa (empty) featureB
Parent commit : lnvvtr 31a347e featureA Parent commit (@-) : lnvvtr 31a347e featureA
$ cat file $ cat file
Done with feature A Done with feature A
Working on feature B Working on feature B
@ -422,8 +422,8 @@ $ # We refer to `lnvvtr` as `@-` for brevity
$ jj restore --from b80 --into @- --restore-descendants $ jj restore --from b80 --into @- --restore-descendants
Created lnvvtr 599994e featureA Created lnvvtr 599994e featureA
Rebased 1 descendant commits (while preserving their content) Rebased 1 descendant commits (while preserving their content)
Working copy now at: pvnrkl 468104c featureB Working copy (@) now at: pvnrkl 468104c featureB
Parent commit : lnvvtr 599994e featureA Parent commit (@-) : lnvvtr 599994e featureA
``` ```
Even though `@-` was modified, `--restore-descendants` preserved the contents of Even though `@-` was modified, `--restore-descendants` preserved the contents of

84
docs/tutorial.md
View File

@ -27,8 +27,8 @@ bookmark: master@origin [new] untracked
bookmark: octocat-patch-1@origin [new] untracked bookmark: octocat-patch-1@origin [new] untracked
bookmark: test@origin [new] untracked bookmark: test@origin [new] untracked
Setting the revset alias "trunk()" to "master@origin" Setting the revset alias "trunk()" to "master@origin"
Working copy now at: kntqzsqt d7439b06 (empty) (no description set) Working copy (@) now at: kntqzsqt d7439b06 (empty) (no description set)
Parent commit : orrkosyo 7fd1a60b master | (empty) Merge pull request #6 from Spaceghost/patch-1 Parent commit (@-) : orrkosyo 7fd1a60b master | (empty) Merge pull request #6 from Spaceghost/patch-1
Added 1 files, modified 0 files, removed 0 files Added 1 files, modified 0 files, removed 0 files
$ cd Hello-World $ cd Hello-World
``` ```
@ -38,8 +38,8 @@ Running `jj st` (short for `jj status`) now yields something like this:
```shell ```shell
$ jj st $ jj st
The working copy has no changes. The working copy has no changes.
Working copy : kntqzsqt d7439b06 (empty) (no description set) Working copy (@) : kntqzsqt d7439b06 (empty) (no description set)
Parent commit: orrkosyo 7fd1a60b master | (empty) Merge pull request #6 from Spaceghost/patch-1 Parent commit (@-): orrkosyo 7fd1a60b master | (empty) Merge pull request #6 from Spaceghost/patch-1
``` ```
Let's look at that output as it introduces new concepts. You can see two Let's look at that output as it introduces new concepts. You can see two
@ -88,8 +88,8 @@ we don't forget what we're working on:
# Enter something like "Say goodbye" in the editor and then save the file and close # Enter something like "Say goodbye" in the editor and then save the file and close
# the editor. # the editor.
$ jj describe $ jj describe
Working copy now at: kntqzsqt e427edcf (empty) Say goodbye Working copy (@) now at: kntqzsqt e427edcf (empty) Say goodbye
Parent commit : orrkosyo 7fd1a60b master | (empty) Merge pull request #6 from Spaceghost/patch-1 Parent commit (@-) : orrkosyo 7fd1a60b master | (empty) Merge pull request #6 from Spaceghost/patch-1
``` ```
Now make the change in the README: Now make the change in the README:
@ -100,8 +100,8 @@ $ sed -i 's/Hello/Goodbye/' README
$ jj st $ jj st
Working copy changes: Working copy changes:
M README M README
Working copy : kntqzsqt 5d39e19d Say goodbye Working copy (@) : kntqzsqt 5d39e19d Say goodbye
Parent commit: orrkosyo 7fd1a60b master | (empty) Merge pull request #6 from Spaceghost/patch-1 Parent commit (@-): orrkosyo 7fd1a60b master | (empty) Merge pull request #6 from Spaceghost/patch-1
``` ```
Note that you didn't have to tell Jujutsu to add the change like you would with Note that you didn't have to tell Jujutsu to add the change like you would with
@ -141,12 +141,12 @@ So, let's say we're now done with this change, so we create a new change:
```shell ```shell
$ jj new $ jj new
Working copy now at: mpqrykyp aef4df99 (empty) (no description set) Working copy (@) now at: mpqrykyp aef4df99 (empty) (no description set)
Parent commit : kntqzsqt 5d39e19d Say goodbye Parent commit (@-) : kntqzsqt 5d39e19d Say goodbye
$ jj st $ jj st
The working copy has no changes. The working copy has no changes.
Working copy : mpqrykyp aef4df99 (empty) (no description set) Working copy (@) : mpqrykyp aef4df99 (empty) (no description set)
Parent commit: kntqzsqt 5d39e19d Say goodbye Parent commit (@-): kntqzsqt 5d39e19d Say goodbye
``` ```
If we later realize that we want to make further changes, we can make them in If we later realize that we want to make further changes, we can make them in
@ -233,18 +233,18 @@ descriptions (commit messages) right away.
```shell ```shell
# Start creating a chain of commits off of the `master` bookmark # Start creating a chain of commits off of the `master` bookmark
$ jj new master -m A; echo a > file1 $ jj new master -m A; echo a > file1
Working copy now at: nuvyytnq 00a2aeed (empty) A Working copy (@) now at: nuvyytnq 00a2aeed (empty) A
Parent commit : orrkosyo 7fd1a60b master | (empty) Merge pull request #6 from Spaceghost/patch-1 Parent commit (@-) : orrkosyo 7fd1a60b master | (empty) Merge pull request #6 from Spaceghost/patch-1
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
$ jj new -m B1; echo b1 > file1 $ jj new -m B1; echo b1 > file1
Working copy now at: ovknlmro 967d9f9f (empty) B1 Working copy (@) now at: ovknlmro 967d9f9f (empty) B1
Parent commit : nuvyytnq 5dda2f09 A Parent commit (@-) : nuvyytnq 5dda2f09 A
$ jj new -m B2; echo b2 > file1 $ jj new -m B2; echo b2 > file1
Working copy now at: puqltutt 8ebeaffa (empty) B2 Working copy (@) now at: puqltutt 8ebeaffa (empty) B2
Parent commit : ovknlmro 7d7c6e6b B1 Parent commit (@-) : ovknlmro 7d7c6e6b B1
$ jj new -m C; echo c > file2 $ jj new -m C; echo c > file2
Working copy now at: qzvqqupx 62a3c6d3 (empty) C Working copy (@) now at: qzvqqupx 62a3c6d3 (empty) C
Parent commit : puqltutt daa6ffd5 B2 Parent commit (@-) : puqltutt daa6ffd5 B2
$ jj log $ jj log
@ qzvqqupx martinvonz@google.com 2023-02-12 15:07:41.946 -08:00 2370ddf3 @ qzvqqupx martinvonz@google.com 2023-02-12 15:07:41.946 -08:00 2370ddf3
│ C │ C
@ -273,8 +273,8 @@ on A.
```shell ```shell
$ jj rebase -s puqltutt -d nuvyytnq # Replace the IDs by what you have for B2 and A $ jj rebase -s puqltutt -d nuvyytnq # Replace the IDs by what you have for B2 and A
Rebased 2 commits Rebased 2 commits
Working copy now at: qzvqqupx 1978b534 (conflict) C Working copy (@) now at: qzvqqupx 1978b534 (conflict) C
Parent commit : puqltutt f7fb5943 (conflict) B2 Parent commit (@-) : puqltutt f7fb5943 (conflict) B2
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
There are unresolved conflicts at these paths: There are unresolved conflicts at these paths:
file1 2-sided conflict file1 2-sided conflict
@ -321,8 +321,8 @@ resolution into the conflicted B2. That might look like this:
```shell ```shell
$ jj new puqltutt # Replace the ID by what you have for B2 $ jj new puqltutt # Replace the ID by what you have for B2
Working copy now at: zxoosnnp c7068d1c (conflict) (empty) (no description set) Working copy (@) now at: zxoosnnp c7068d1c (conflict) (empty) (no description set)
Parent commit : puqltutt f7fb5943 (conflict) B2 Parent commit (@-) : puqltutt f7fb5943 (conflict) B2
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
There are unresolved conflicts at these paths: There are unresolved conflicts at these paths:
file1 2-sided conflict file1 2-sided conflict
@ -331,8 +331,8 @@ $ jj st
The working copy has no changes. The working copy has no changes.
There are unresolved conflicts at these paths: There are unresolved conflicts at these paths:
file1 2-sided conflict file1 2-sided conflict
Working copy : zxoosnnp c7068d1c (conflict) (empty) (no description set) Working copy (@) : zxoosnnp c7068d1c (conflict) (empty) (no description set)
Parent commit: puqltutt f7fb5943 (conflict) B2 Parent commit (@-): puqltutt f7fb5943 (conflict) B2
To resolve the conflicts, start by updating to it: To resolve the conflicts, start by updating to it:
jj new puqltutt jj new puqltutt
Then use `jj resolve`, or edit the conflict markers in the file directly. Then use `jj resolve`, or edit the conflict markers in the file directly.
@ -353,14 +353,14 @@ $ echo resolved > file1
$ jj st $ jj st
Working copy changes: Working copy changes:
M file1 M file1
Working copy : zxoosnnp c2a31a06 (no description set) Working copy (@) : zxoosnnp c2a31a06 (no description set)
Parent commit: puqltutt f7fb5943 (conflict) B2 Parent commit (@-): puqltutt f7fb5943 (conflict) B2
Conflict in parent commit has been resolved in working copy Conflict in parent commit has been resolved in working copy
$ jj squash $ jj squash
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: ntxxqymr e3c279cc (empty) (no description set) Working copy (@) now at: ntxxqymr e3c279cc (empty) (no description set)
Parent commit : puqltutt 2c7a658e B2 Parent commit (@-) : puqltutt 2c7a658e B2
Existing conflicts were resolved or abandoned from these commits: Existing conflicts were resolved or abandoned from these commits:
qzvqqupx hidden 1978b534 (conflict) C qzvqqupx hidden 1978b534 (conflict) C
puqltutt hidden f7fb5943 (conflict) B2 puqltutt hidden f7fb5943 (conflict) B2
@ -430,8 +430,8 @@ To resolve the conflicts, start by updating to the first one:
Then use `jj resolve`, or edit the conflict markers in the file directly. Then use `jj resolve`, or edit the conflict markers in the file directly.
Once the conflicts are resolved, you may want to inspect the result with `jj diff`. Once the conflicts are resolved, you may want to inspect the result with `jj diff`.
Then run `jj squash` to move the resolution into the conflicted commit. Then run `jj squash` to move the resolution into the conflicted commit.
Working copy now at: zxoosnnp 63874fe6 (no description set) Working copy (@) now at: zxoosnnp 63874fe6 (no description set)
Parent commit : puqltutt f7fb5943 (conflict) B2 Parent commit (@-) : puqltutt f7fb5943 (conflict) B2
$ jj log $ jj log
@ zxoosnnp martinvonz@google.com 2023-02-12 19:34:09.000 -08:00 63874fe6 @ zxoosnnp martinvonz@google.com 2023-02-12 19:34:09.000 -08:00 63874fe6
@ -475,17 +475,17 @@ few more commits:
```shell ```shell
$ jj new master -m abc; printf 'a\nb\nc\n' > file $ jj new master -m abc; printf 'a\nb\nc\n' > file
Working copy now at: ztqrpvnw f94e49cf (empty) abc Working copy (@) now at: ztqrpvnw f94e49cf (empty) abc
Parent commit : orrkosyo 7fd1a60b master | (empty) Merge pull request #6 from Spaceghost/patch-1 Parent commit (@-) : orrkosyo 7fd1a60b master | (empty) Merge pull request #6 from Spaceghost/patch-1
Added 0 files, modified 0 files, removed 1 files Added 0 files, modified 0 files, removed 1 files
$ jj new -m ABC; printf 'A\nB\nc\n' > file $ jj new -m ABC; printf 'A\nB\nc\n' > file
Working copy now at: kwtuwqnm 6f30cd1f (empty) ABC Working copy (@) now at: kwtuwqnm 6f30cd1f (empty) ABC
Parent commit : ztqrpvnw 51002261 ab Parent commit (@-) : ztqrpvnw 51002261 ab
$ jj new -m ABCD; printf 'A\nB\nC\nD\n' > file $ jj new -m ABCD; printf 'A\nB\nC\nD\n' > file
Working copy now at: mrxqplyk a6749154 (empty) ABCD Working copy (@) now at: mrxqplyk a6749154 (empty) ABCD
Parent commit : kwtuwqnm 30aecc08 ABC Parent commit (@-) : kwtuwqnm 30aecc08 ABC
$ jj log -r master::@ $ jj log -r master::@
@ mrxqplyk martinvonz@google.com 2023-02-12 19:38:21.000 -08:00 b98c607b @ mrxqplyk martinvonz@google.com 2023-02-12 19:38:21.000 -08:00 b98c607b
@ -511,8 +511,8 @@ that:
$ jj squash -i $ jj squash -i
Hint: Using default editor ':builtin'; run `jj config set --user ui.diff-editor :builtin` to disable this message. Hint: Using default editor ':builtin'; run `jj config set --user ui.diff-editor :builtin` to disable this message.
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: mrxqplyk 52a6c7fd ABCD Working copy (@) now at: mrxqplyk 52a6c7fd ABCD
Parent commit : kwtuwqnm 643061ac ABC Parent commit (@-) : kwtuwqnm 643061ac ABC
``` ```
That will bring up the built-in diff editor[^alternative_diff_editors] with a That will bring up the built-in diff editor[^alternative_diff_editors] with a
@ -561,8 +561,8 @@ $ jj diffedit -r @-
Hint: Using default editor ':builtin'; run `jj config set --user ui.diff-editor :builtin` to disable this message. Hint: Using default editor ':builtin'; run `jj config set --user ui.diff-editor :builtin` to disable this message.
Created kwtuwqnm 70985eaa (empty) ABC Created kwtuwqnm 70985eaa (empty) ABC
Rebased 1 descendant commits Rebased 1 descendant commits
Working copy now at: mrxqplyk 1c72cd50 (conflict) ABCD Working copy (@) now at: mrxqplyk 1c72cd50 (conflict) ABCD
Parent commit : kwtuwqnm 70985eaa (empty) ABC Parent commit (@-) : kwtuwqnm 70985eaa (empty) ABC
Added 0 files, modified 1 files, removed 0 files Added 0 files, modified 1 files, removed 0 files
There are unresolved conflicts at these paths: There are unresolved conflicts at these paths:
file 2-sided conflict file 2-sided conflict