Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-23 08:58:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix diff binary file once more

Browse source
This commit is contained in:
Stephan Dilly 2020-05-02 14:13:01 +02:00
parent c0b48b8a51
commit 7407d46557
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
asyncgit/src/sync/diff.rs
View file

@ -3,10 +3,9 @@
use super::utils;
use crate::hash;
use git2::{
Delta, Diff, DiffDelta, DiffFlags, DiffFormat, DiffHunk,
DiffOptions, Patch, Repository,
Delta, Diff, DiffDelta, DiffFormat, DiffHunk, DiffOptions, Patch,
Repository,
};
use log::debug;
use scopetime::scope_time;
use std::{fs, path::Path};
@ -173,13 +172,8 @@ pub fn get_diff(repo_path: &str, p: String, stage: bool) -> FileDiff {
let newfile_path =
repo_path.join(delta.new_file().path().unwrap());
let newfile_content =
if delta.flags().contains(DiffFlags::NOT_BINARY) {
new_file_content(&newfile_path)
.unwrap_or(String::from("file not found"))
} else {
String::from("binary file")
};
let newfile_content = new_file_content(&newfile_path)
.unwrap_or(String::from("file not found"));
let mut patch = Patch::from_buffers(
&[],
@ -232,12 +226,12 @@ fn new_file_content(path: &Path) -> Option<String> {
} else if meta.file_type().is_file() {
if let Ok(content) = fs::read_to_string(path) {
return Some(content);
} else {
return Some(String::from("no text file"));
}
}
}
debug!("could not read: {:?}", path);
None
}