ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: lift a return statement out of an if-else block

Browse source 
As pointed out by IntelliJ (maybe it came from rust-analyzer or
something, I don't know). I also lifted out
`Err(CommandError::UserError())` and extracted a variable.
This commit is contained in:
Martin von Zweigbergk 2022-09-19 13:49:46 -07:00 committed by Martin von Zweigbergk
parent 8402dd8264
commit 5270c165ed
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

@ -2308,20 +2308,21 @@ fn cmd_untrack(
locked_working_copy.discard();
let path = &added_back[0].0;
let ui_path = workspace_command.format_file_path(path);
if added_back.len() > 1 {
return Err(CommandError::UserError(format!(
let message = if added_back.len() > 1 {
format!(
"'{}' and {} other files would be added back because they're not ignored. \
Make sure they're ignored, then try again.",
ui_path,
added_back.len() - 1
)));
)
} else {
return Err(CommandError::UserError(format!(
format!(
"'{}' would be added back because it's not ignored. Make sure it's ignored, \
then try again.",
ui_path
)));
}
)
};
return Err(CommandError::UserError(message));
} else {
// This means there were some concurrent changes made in the working copy. We
// don't want to mix those in, so reset the working copy again.