martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-21 02:38:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

merge_tools: don't use debug format to embed source error message

Browse Source
This commit is contained in:
Yuya Nishihara 2023-08-02 18:29:27 +09:00
parent a16c92b59f
commit 36cc1fbfdd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/merge_tools.rs
View File

@ -47,7 +47,7 @@ pub enum ExternalToolError {
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}")]
SetUpDir(#[source] std::io::Error),
// TODO: Remove the "(run with --verbose to see the exact invocation)"
// from this and other errors. Print it as a hint but only if --verbose is *not* set.
@ -67,7 +67,7 @@ pub enum ExternalToolError {
ToolAborted {
exit_status: std::process::ExitStatus,
},
#[error("I/O error: {0:?}")]
#[error("I/O error: {0}")]
Io(#[from] std::io::Error),
}
@ -75,9 +75,9 @@ pub enum ExternalToolError {
pub enum DiffEditError {
#[error(transparent)]
ExternalTool(#[from] ExternalToolError),
#[error("Failed to write directories to diff: {0:?}")]
#[error("Failed to write directories to diff: {0}")]
Checkout(#[from] CheckoutError),
#[error("Failed to snapshot changes: {0:?}")]
#[error("Failed to snapshot changes: {0}")]
Snapshot(#[from] SnapshotError),
#[error(transparent)]
Config(#[from] config::ConfigError),
@ -105,7 +105,7 @@ pub enum ConflictResolveError {
to see the exact invocation)."
)]
EmptyOrUnchanged,
#[error("Backend error: {0:?}")]
#[error("Backend error: {0}")]
Backend(#[from] jj_lib::backend::BackendError),
}