mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-26 00:19:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

git_backend: translate io::Error of read_conflict() to ReadObject error

Browse source 
This is the last place in Git backend where io::Error is magically converted
to BackendError::Other.
This commit is contained in:
Yuya Nishihara 2023-07-06 14:01:25 +09:00
parent 4e4ca46998
commit 5346bd734f
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/src/git_backend.rs
View file

@ -531,7 +531,12 @@ impl Backend for GitBackend {
&FileId::new(id.to_bytes()),
)?;
let mut data = String::new();
file.read_to_string(&mut data)?;
file.read_to_string(&mut data)
.map_err(|err| BackendError::ReadObject {
object_type: "conflict".to_owned(),
hash: id.hex(),
source: err.into(),
})?;
let json: serde_json::Value = serde_json::from_str(&data).unwrap();
Ok(Conflict {
removes: conflict_term_list_from_json(json.get("removes").unwrap()),