Mercurial > public > mercurial-scm > hg
diff rust/rhg/src/error.rs @ 46443:43d63979a75e
rust: use HgError in RevlogError and Vfs
Differential Revision: https://phab.mercurial-scm.org/D9897
| author | Simon Sapin <simon.sapin@octobus.net> |
|---|---|
| date | Wed, 27 Jan 2021 14:45:25 +0100 |
| parents | 02d3bb972121 |
| children | ca3f73cc3cf4 |
line wrap: on
line diff
--- a/rust/rhg/src/error.rs Wed Jan 27 14:59:09 2021 +0100 +++ b/rust/rhg/src/error.rs Wed Jan 27 14:45:25 2021 +0100 @@ -103,9 +103,6 @@ impl From<(RevlogError, &str)> for CommandError { fn from((err, rev): (RevlogError, &str)) -> CommandError { match err { - RevlogError::IoError(err) => CommandError::Abort(Some( - utf8_to_local(&format!("abort: {}\n", err)).into(), - )), RevlogError::InvalidRevision => CommandError::Abort(Some( utf8_to_local(&format!( "abort: invalid revision identifier {}\n", @@ -120,27 +117,7 @@ )) .into(), )), - RevlogError::UnsuportedVersion(version) => { - CommandError::Abort(Some( - utf8_to_local(&format!( - "abort: unsupported revlog version {}\n", - version - )) - .into(), - )) - } - RevlogError::Corrupted => { - CommandError::Abort(Some("abort: corrupted revlog\n".into())) - } - RevlogError::UnknowDataFormat(format) => { - CommandError::Abort(Some( - utf8_to_local(&format!( - "abort: unknow revlog dataformat {:?}\n", - format - )) - .into(), - )) - } + RevlogError::Other(err) => CommandError::Other(err), } } }