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

bookmarks-list: fix typo

Browse Source
This commit is contained in:
dploch 2024-10-07 20:23:57 -04:00 committed by Daniel Ploch
parent 95344f9e05
commit eb09a3e965
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/src/commands/bookmark/list.rs
View File

@ -187,14 +187,14 @@ pub fn cmd_bookmark_list(
if found_deleted_tracking_local_bookmark { if found_deleted_tracking_local_bookmark {
writeln!( writeln!(
ui.hint_default(), ui.hint_default(),
"Bookmarkes marked as deleted will be *deleted permanently* on the remote on the next \ "Bookmarks marked as deleted will be *deleted permanently* on the remote on the next \
`jj git push`. Use `jj bookmark forget` to prevent this." `jj git push`. Use `jj bookmark forget` to prevent this."
)?; )?;
} else if found_deleted_local_bookmark { } else if found_deleted_local_bookmark {
writeln!( writeln!(
ui.hint_default(), ui.hint_default(),
"Bookmarkes marked as deleted will be deleted from the underlying Git repo on the \ "Bookmarks marked as deleted will be deleted from the underlying Git repo on the next \
next `jj git export`." `jj git export`."
)?; )?;
} }

18
cli/tests/test_bookmark_command.rs
View File

@ -655,7 +655,7 @@ fn test_bookmark_delete_export() {
@git: rlvkpnrz 65b6b74e (empty) (no description set) @git: rlvkpnrz 65b6b74e (empty) (no description set)
"###); "###);
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Hint: Bookmarkes marked as deleted will be deleted from the underlying Git repo on the next `jj git export`. Hint: Bookmarks marked as deleted will be deleted from the underlying Git repo on the next `jj git export`.
"###); "###);
test_env.jj_cmd_ok(&repo_path, &["git", "export"]); test_env.jj_cmd_ok(&repo_path, &["git", "export"]);
@ -1287,7 +1287,7 @@ fn test_bookmark_list() {
@origin (ahead by 1 commits, behind by 1 commits): qpsqxpyq 38ef8af7 (empty) remote-unsync @origin (ahead by 1 commits, behind by 1 commits): qpsqxpyq 38ef8af7 (empty) remote-unsync
"###); "###);
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Hint: Bookmarkes marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this. Hint: Bookmarks marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this.
"###); "###);
let (stdout, stderr) = test_env.jj_cmd_ok(&local_path, &["bookmark", "list", "--all-remotes"]); let (stdout, stderr) = test_env.jj_cmd_ok(&local_path, &["bookmark", "list", "--all-remotes"]);
@ -1302,7 +1302,7 @@ fn test_bookmark_list() {
remote-untrack@origin: vmortlor 71a16b05 (empty) remote-untrack remote-untrack@origin: vmortlor 71a16b05 (empty) remote-untrack
"###); "###);
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Hint: Bookmarkes marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this. Hint: Bookmarks marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this.
"###); "###);
let template = r#" let template = r#"
@ -1406,7 +1406,7 @@ fn test_bookmark_list() {
tracking_behind_count: <Error: Not a tracked remote ref> tracking_behind_count: <Error: Not a tracked remote ref>
"###); "###);
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Hint: Bookmarkes marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this. Hint: Bookmarks marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this.
"###); "###);
} }
@ -1471,7 +1471,7 @@ fn test_bookmark_list_filtered() {
@origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite @origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
"###); "###);
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Hint: Bookmarkes marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this. Hint: Bookmarks marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this.
"###); "###);
let query = let query =
@ -1540,7 +1540,7 @@ fn test_bookmark_list_filtered() {
@origin: yxusvupt dad5f298 (empty) remote-delete @origin: yxusvupt dad5f298 (empty) remote-delete
"###); "###);
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Hint: Bookmarkes marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this. Hint: Bookmarks marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this.
"###); "###);
let (stdout, stderr) = query(&["-rbookmarks(remote-delete)"]); let (stdout, stderr) = query(&["-rbookmarks(remote-delete)"]);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
@ -1560,7 +1560,7 @@ fn test_bookmark_list_filtered() {
remote-keep: nlwprzpn 911e9120 (empty) remote-keep remote-keep: nlwprzpn 911e9120 (empty) remote-keep
"###); "###);
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Hint: Bookmarkes marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this. Hint: Bookmarks marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this.
"###); "###);
// Unmatched name pattern shouldn't be an error. A warning can be added later. // Unmatched name pattern shouldn't be an error. A warning can be added later.
@ -1732,7 +1732,7 @@ fn test_bookmark_list_tracked() {
@upstream: lolpmnqw 32fa6da0 (empty) upstream-sync @upstream: lolpmnqw 32fa6da0 (empty) upstream-sync
"###); "###);
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Hint: Bookmarkes marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this. Hint: Bookmarks marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this.
"###); "###);
let (stdout, stderr) = test_env.jj_cmd_ok(&local_path, &["bookmark", "list", "--tracked"]); let (stdout, stderr) = test_env.jj_cmd_ok(&local_path, &["bookmark", "list", "--tracked"]);
@ -1749,7 +1749,7 @@ fn test_bookmark_list_tracked() {
"### "###
); );
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Hint: Bookmarkes marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this. Hint: Bookmarks marked as deleted will be *deleted permanently* on the remote on the next `jj git push`. Use `jj bookmark forget` to prevent this.
"###); "###);
let (stdout, stderr) = test_env.jj_cmd_ok( let (stdout, stderr) = test_env.jj_cmd_ok(