Skip to content

Commit 3cdaa5b

Browse files
committed
cli: bookmark: remove hint about upsert behavior
It was added at 3c80e34 "cli: branch: make "set" do upsert as before" in order to remind behavior change.
1 parent fa3254b commit 3cdaa5b

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

cli/src/commands/bookmark/set.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,6 @@ pub fn cmd_bookmark_set(
117117
if bookmark_names.len() > 1 && args.revision.is_none() {
118118
writeln!(ui.hint_default(), "Use -r to specify the target revision.")?;
119119
}
120-
if new_bookmark_count > 0 {
121-
// TODO: delete this hint in jj 0.25+
122-
writeln!(
123-
ui.hint_default(),
124-
"Consider using `jj bookmark move` if your intention was to move existing bookmarks."
125-
)?;
126-
}
127120

128121
tx.finish(
129122
ui,

cli/tests/test_bookmark_command.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,10 @@ fn test_bookmark_multiple_names() {
8888
// Create and move with explicit -r
8989
let (_stdout, stderr) =
9090
test_env.jj_cmd_ok(&repo_path, &["bookmark", "set", "-r@", "bar", "baz"]);
91-
insta::assert_snapshot!(stderr, @r###"
91+
insta::assert_snapshot!(stderr, @r"
9292
Created 1 bookmarks pointing to zsuskuln 8bb159bc bar baz | (empty) (no description set)
9393
Moved 1 bookmarks to zsuskuln 8bb159bc bar baz | (empty) (no description set)
94-
Hint: Consider using `jj bookmark move` if your intention was to move existing bookmarks.
95-
"###);
94+
");
9695

9796
// Noop changes should not be included in the stats
9897
let (_stdout, stderr) =
@@ -164,10 +163,9 @@ fn test_bookmark_move() {
164163
"###);
165164

166165
let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["bookmark", "set", "foo", "--to=@"]);
167-
insta::assert_snapshot!(stderr, @r###"
166+
insta::assert_snapshot!(stderr, @r"
168167
Created 1 bookmarks pointing to qpvuntsm 230dd059 foo | (empty) (no description set)
169-
Hint: Consider using `jj bookmark move` if your intention was to move existing bookmarks.
170-
"###);
168+
");
171169

172170
test_env.jj_cmd_ok(&repo_path, &["new"]);
173171
let stderr = test_env.jj_cmd_failure(&repo_path, &["bookmark", "create", "-r@", "foo"]);
@@ -1925,7 +1923,6 @@ fn test_bookmark_set_with_default_target_revision() {
19251923
insta::assert_snapshot!(stderr, @r"
19261924
Warning: Target revision was not specified, defaulting to the working copy (--revision=@). In the near future it will be required to explicitly specify target revision.
19271925
Created 1 bookmarks pointing to qpvuntsm 230dd059 foo | (empty) (no description set)
1928-
Hint: Consider using `jj bookmark move` if your intention was to move existing bookmarks.
19291926
");
19301927
}
19311928

0 commit comments

Comments
 (0)