mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-16 00:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

cli: move MergeArgsNotConfigured to ExternalToolError

Browse source 
Even though this is an error specific to merge operation, I think it's
rather a tool-level error than conflict resolution.
This commit is contained in:
Yuya Nishihara 2023-02-05 18:31:45 +09:00
parent 2f23d0dd10
commit 6f4522e34a
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/merge_tools.rs
View file

@ -41,6 +41,11 @@ use crate::ui::Ui;
pub enum ExternalToolError { pub enum ExternalToolError {
#[error("Invalid config: {0}")] #[error("Invalid config: {0}")]
ConfigError(#[from] ConfigError), ConfigError(#[from] ConfigError),
#[error(
"To use `{tool_name}` as a merge tool, the config `merge-tools.{tool_name}.merge-args` \
must be defined (see docs for details)"
)]
MergeArgsNotConfigured { tool_name: String },
#[error("Error setting up temporary directory: {0:?}")] #[error("Error setting up temporary directory: {0:?}")]
SetUpDirError(#[source] std::io::Error), SetUpDirError(#[source] std::io::Error),
// TODO: Remove the "(run with --verbose to see the exact invocation)" // TODO: Remove the "(run with --verbose to see the exact invocation)"
@ -79,11 +84,6 @@ pub enum DiffEditError {
pub enum ConflictResolveError { pub enum ConflictResolveError {
#[error(transparent)] #[error(transparent)]
ExternalToolError(#[from] ExternalToolError), ExternalToolError(#[from] ExternalToolError),
#[error(
"To use `{tool_name}` as a merge tool, the config `merge-tools.{tool_name}.merge-args` \
must be defined (see docs for details)"
)]
MergeArgsNotConfigured { tool_name: String },
#[error("Couldn't find the path {0:?} in this revision")] #[error("Couldn't find the path {0:?} in this revision")]
PathNotFoundError(RepoPath), PathNotFoundError(RepoPath),
#[error("Couldn't find any conflicts at {0:?} in this revision")] #[error("Couldn't find any conflicts at {0:?} in this revision")]
@ -449,11 +449,11 @@ fn get_diff_editor_from_settings(
fn get_merge_tool_from_settings( fn get_merge_tool_from_settings(
ui: &mut Ui, ui: &mut Ui,
settings: &UserSettings, settings: &UserSettings,
) -> Result<MergeTool, ConflictResolveError> { ) -> Result<MergeTool, ExternalToolError> {
let editor_name = editor_name_from_settings(ui, settings, "ui.merge-editor")?; let editor_name = editor_name_from_settings(ui, settings, "ui.merge-editor")?;
let editor = get_tool_config(settings, &editor_name).map_err(ExternalToolError::ConfigError)?; let editor = get_tool_config(settings, &editor_name)?;
if editor.merge_args.is_empty() { if editor.merge_args.is_empty() {
Err(ConflictResolveError::MergeArgsNotConfigured { Err(ExternalToolError::MergeArgsNotConfigured {
tool_name: editor_name, tool_name: editor_name,
}) })
} else { } else {