mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-11-28 09:14:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

cli: use separate hint for errors from jj branch

Browse source
This commit is contained in:
Martin von Zweigbergk 2022-11-12 15:57:18 -08:00 committed by Martin von Zweigbergk
parent 698bba387f
commit 7ce8138794
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/commands.rs
View file

@ -3248,10 +3248,10 @@ fn cmd_branch(
let branch_names: Vec<&str> = names
.iter()
.map(|branch_name| match view.get_local_branch(branch_name) {
Some(_) => Err(user_error(format!(
"Branch already exists: {} (use `jj branch set` to update it)",
branch_name
))),
Some(_) => Err(user_error_with_hint(
format!("Branch already exists: {}", branch_name),
"Use `jj branch set` to update it.",
)),
None => Ok(branch_name.as_str()),
})
.try_collect()?;
@ -3302,8 +3302,9 @@ fn cmd_branch(
)
})
{
return Err(user_error(
"Use --allow-backwards to allow moving a branch backwards or sideways",
return Err(user_error_with_hint(
"Refusing to move branch backwards or sideways.",
"Use --allow-backwards to allow it.",
));
}
let mut tx = workspace_command.start_transaction(&format!(