mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-07 21:27:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

cli: indent commits summary in single revset resolution hint

Browse source 
This is the same formatting as "jj abandon" output. It should improve the
discoverability of the trailing hint.
This commit is contained in:
Yuya Nishihara 2024-03-24 16:42:04 +09:00
parent 65ef700f94
commit 15ff7dfd48
4 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cli/src/cli_util.rs
View file

@ -800,11 +800,12 @@ impl WorkspaceCommandHelper {
let mut output = Vec::new(); let mut output = Vec::new();
let mut formatter = PlainTextFormatter::new(&mut output); let mut formatter = PlainTextFormatter::new(&mut output);
for commit in &commits { for commit in &commits {
write!(formatter, " ")?;
template.format(commit, &mut formatter).unwrap(); template.format(commit, &mut formatter).unwrap();
writeln!(formatter).unwrap(); writeln!(formatter).unwrap();
} }
if elided { if elided {
writeln!(formatter, "...").unwrap(); writeln!(formatter, " ...").unwrap();
} }
output.pop(); // drop last newline output.pop(); // drop last newline
String::from_utf8(output).expect("template output should be utf-8 bytes") String::from_utf8(output).expect("template output should be utf-8 bytes")

26
cli/tests/test_checkout.rs
View file

@ -70,12 +70,12 @@ fn test_checkout_not_single_rev() {
warning: `jj checkout` will be removed in a future version, and this will be a hard error warning: `jj checkout` will be removed in a future version, and this will be a hard error
Error: Revset "root()..@" resolved to more than one revision Error: Revset "root()..@" resolved to more than one revision
Hint: The revset "root()..@" resolved to these revisions: Hint: The revset "root()..@" resolved to these revisions:
royxmykx 2f859371 (empty) (no description set) royxmykx 2f859371 (empty) (no description set)
mzvwutvl 5c1afd8b (empty) fifth mzvwutvl 5c1afd8b (empty) fifth
zsuskuln 009f88bf (empty) fourth zsuskuln 009f88bf (empty) fourth
kkmpptxz 3fa8931e (empty) third kkmpptxz 3fa8931e (empty) third
rlvkpnrz 5c52832c (empty) second rlvkpnrz 5c52832c (empty) second
... ...
"###); "###);
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "root()..@-"]); let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "root()..@-"]);
@ -84,11 +84,11 @@ fn test_checkout_not_single_rev() {
warning: `jj checkout` will be removed in a future version, and this will be a hard error warning: `jj checkout` will be removed in a future version, and this will be a hard error
Error: Revset "root()..@-" resolved to more than one revision Error: Revset "root()..@-" resolved to more than one revision
Hint: The revset "root()..@-" resolved to these revisions: Hint: The revset "root()..@-" resolved to these revisions:
mzvwutvl 5c1afd8b (empty) fifth mzvwutvl 5c1afd8b (empty) fifth
zsuskuln 009f88bf (empty) fourth zsuskuln 009f88bf (empty) fourth
kkmpptxz 3fa8931e (empty) third kkmpptxz 3fa8931e (empty) third
rlvkpnrz 5c52832c (empty) second rlvkpnrz 5c52832c (empty) second
qpvuntsm 69542c19 (empty) first qpvuntsm 69542c19 (empty) first
"###); "###);
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "@-|@--"]); let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "@-|@--"]);
@ -97,8 +97,8 @@ fn test_checkout_not_single_rev() {
warning: `jj checkout` will be removed in a future version, and this will be a hard error warning: `jj checkout` will be removed in a future version, and this will be a hard error
Error: Revset "@-|@--" resolved to more than one revision Error: Revset "@-|@--" resolved to more than one revision
Hint: The revset "@-|@--" resolved to these revisions: Hint: The revset "@-|@--" resolved to these revisions:
mzvwutvl 5c1afd8b (empty) fifth mzvwutvl 5c1afd8b (empty) fifth
zsuskuln 009f88bf (empty) fourth zsuskuln 009f88bf (empty) fourth
"###); "###);
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "none()"]); let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "none()"]);

8
cli/tests/test_new_command.rs
View file

@ -495,8 +495,8 @@ fn test_new_conflicting_branches() {
Error: Revset "foo" resolved to more than one revision Error: Revset "foo" resolved to more than one revision
Hint: Branch foo resolved to multiple revisions because it's conflicted. Hint: Branch foo resolved to multiple revisions because it's conflicted.
It resolved to these revisions: It resolved to these revisions:
kkmpptxz 66c6502d foo?? | (empty) two kkmpptxz 66c6502d foo?? | (empty) two
qpvuntsm a9330854 foo?? | (empty) one qpvuntsm a9330854 foo?? | (empty) one
Hint: Set which revision the branch points to with `jj branch set foo -r <REVISION>`. Hint: Set which revision the branch points to with `jj branch set foo -r <REVISION>`.
"###); "###);
} }
@ -517,8 +517,8 @@ fn test_new_conflicting_change_ids() {
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Error: Revset "qpvuntsm" resolved to more than one revision Error: Revset "qpvuntsm" resolved to more than one revision
Hint: The revset "qpvuntsm" resolved to these revisions: Hint: The revset "qpvuntsm" resolved to these revisions:
qpvuntsm?? d2ae6806 (empty) two qpvuntsm?? d2ae6806 (empty) two
qpvuntsm?? a9330854 (empty) one qpvuntsm?? a9330854 (empty) one
Hint: Some of these commits have the same change id. Abandon one of them with `jj abandon -r <REVISION>`. Hint: Some of these commits have the same change id. Abandon one of them with `jj abandon -r <REVISION>`.
"###); "###);
} }

12
cli/tests/test_rebase_command.rs
View file

@ -167,8 +167,8 @@ fn test_rebase_branch() {
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Error: Revset "e|d" resolved to more than one revision Error: Revset "e|d" resolved to more than one revision
Hint: The revset "e|d" resolved to these revisions: Hint: The revset "e|d" resolved to these revisions:
znkkpsqq e52756c8 e | e znkkpsqq e52756c8 e | e
vruxwmqv 514fa6b2 d | d vruxwmqv 514fa6b2 d | d
Hint: Prefix the expression with 'all:' to allow any number of revisions (i.e. 'all:e|d'). Hint: Prefix the expression with 'all:' to allow any number of revisions (i.e. 'all:e|d').
"###); "###);
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-b=all:e|d", "-d=b"]); let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-b=all:e|d", "-d=b"]);
@ -478,8 +478,8 @@ fn test_rebase_multiple_destinations() {
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Error: Revset "b|c" resolved to more than one revision Error: Revset "b|c" resolved to more than one revision
Hint: The revset "b|c" resolved to these revisions: Hint: The revset "b|c" resolved to these revisions:
royxmykx fe2e8e8b c | c royxmykx fe2e8e8b c | c
zsuskuln d370aee1 b | b zsuskuln d370aee1 b | b
Hint: Prefix the expression with 'all:' to allow any number of revisions (i.e. 'all:b|c'). Hint: Prefix the expression with 'all:' to allow any number of revisions (i.e. 'all:b|c').
"###); "###);
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "a", "-d", "all:b|c"]); let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "a", "-d", "all:b|c"]);
@ -614,8 +614,8 @@ fn test_rebase_with_descendants() {
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Error: Revset "b|d" resolved to more than one revision Error: Revset "b|d" resolved to more than one revision
Hint: The revset "b|d" resolved to these revisions: Hint: The revset "b|d" resolved to these revisions:
vruxwmqv df54a9fd d | d vruxwmqv df54a9fd d | d
zsuskuln d370aee1 b | b zsuskuln d370aee1 b | b
Hint: Prefix the expression with 'all:' to allow any number of revisions (i.e. 'all:b|d'). Hint: Prefix the expression with 'all:' to allow any number of revisions (i.e. 'all:b|d').
"###); "###);
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-s=all:b|d", "-d=a"]); let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["rebase", "-s=all:b|d", "-d=a"]);