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

cli: check value type of ui.diff/merge-editor config

Browse source
This commit is contained in:
Yuya Nishihara 2023-02-05 16:28:15 +09:00
parent 6f4522e34a
commit 78b63c8137
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/merge_tools.rs
View file

@ -471,7 +471,7 @@ fn editor_name_from_settings(
// best one here. // best one here.
match settings.config().get_string(key) { match settings.config().get_string(key) {
Ok(editor_binary) => Ok(editor_binary), Ok(editor_binary) => Ok(editor_binary),
Err(_) => { Err(config::ConfigError::NotFound(_)) => {
let default_editor = "meld".to_string(); let default_editor = "meld".to_string();
writeln!( writeln!(
ui.hint(), ui.hint(),
@ -479,6 +479,7 @@ fn editor_name_from_settings(
)?; )?;
Ok(default_editor) Ok(default_editor)
} }
Err(err) => Err(err.into()),
} }
} }
@ -549,6 +550,9 @@ mod tests {
merge_tool_edits_conflict_markers: false, merge_tool_edits_conflict_markers: false,
} }
"###); "###);
// Invalid type
assert!(get(r#"ui.diff-editor.k = 0"#).is_err());
} }
#[test] #[test]
@ -604,5 +608,8 @@ mod tests {
merge_tool_edits_conflict_markers: false, merge_tool_edits_conflict_markers: false,
} }
"###); "###);
// Invalid type
assert!(get(r#"ui.merge-editor.k = 0"#).is_err());
} }
} }