equal
deleted
inserted
replaced
204 } |
204 } |
205 } |
205 } |
206 |
206 |
207 impl From<RevlogError> for CommandError { |
207 impl From<RevlogError> for CommandError { |
208 fn from(err: RevlogError) -> CommandError { |
208 fn from(err: RevlogError) -> CommandError { |
209 match err { |
209 let err: HgError = err.into(); |
210 RevlogError::WDirUnsupported => CommandError::abort( |
210 err.into() |
211 "abort: working directory revision cannot be specified", |
|
212 ), |
|
213 RevlogError::InvalidRevision(r) => CommandError::abort(format!( |
|
214 "abort: invalid revision identifier: {}", |
|
215 r |
|
216 )), |
|
217 RevlogError::AmbiguousPrefix(r) => CommandError::abort(format!( |
|
218 "abort: ambiguous revision identifier: {}", |
|
219 r |
|
220 )), |
|
221 RevlogError::Other(error) => error.into(), |
|
222 } |
|
223 } |
211 } |
224 } |
212 } |
225 |
213 |
226 impl From<StatusError> for CommandError { |
214 impl From<StatusError> for CommandError { |
227 fn from(error: StatusError) -> Self { |
215 fn from(error: StatusError) -> Self { |