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

dont show weird 'no text file' when diffing binary

Browse source 
cleanup
This commit is contained in:
Stephan Dilly 2020-05-07 16:55:10 +02:00
parent 0598528f14
commit f3a67e878f
2 changed files with 64 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,14 +3,14 @@
use super::utils; use super::utils;
use crate::hash; use crate::hash;
use git2::{ use git2::{
Delta, Diff, DiffDelta, DiffFormat, DiffHunk, DiffOptions, Patch, Delta, Diff, DiffDelta, DiffFormat, DiffHunk, DiffOptions, Error,
Repository, Patch, Repository,
}; };
use scopetime::scope_time; use scopetime::scope_time;
use std::{fs, path::Path}; use std::{fs, path::Path};
/// type of diff of a single line /// type of diff of a single line
#[derive(Copy, Clone, PartialEq, Hash)] #[derive(Copy, Clone, PartialEq, Hash, Debug)]
pub enum DiffLineType { pub enum DiffLineType {
/// just surrounding line, no change /// just surrounding line, no change
None, None,
@ -29,7 +29,7 @@ impl Default for DiffLineType {
} }
/// ///
#[derive(Default, Clone, Hash)] #[derive(Default, Clone, Hash, Debug)]
pub struct DiffLine { pub struct DiffLine {
/// ///
pub content: String, pub content: String,
@ -57,7 +57,7 @@ impl From<DiffHunk<'_>> for HunkHeader {
} }
/// single diff hunk /// single diff hunk
#[derive(Default, Clone, Hash)] #[derive(Default, Clone, Hash, Debug)]
pub struct Hunk { pub struct Hunk {
/// hash of the hunk header /// hash of the hunk header
pub header_hash: u64, pub header_hash: u64,
@ -66,7 +66,7 @@ pub struct Hunk {
} }
/// collection of hunks, sum of all diff lines /// collection of hunks, sum of all diff lines
#[derive(Default, Clone, Hash)] #[derive(Default, Clone, Hash, Debug)]
pub struct FileDiff { pub struct FileDiff {
/// list of hunks /// list of hunks
pub hunks: Vec<Hunk>, pub hunks: Vec<Hunk>,
@ -79,7 +79,7 @@ pub(crate) fn get_diff_raw<'a>(
p: &str, p: &str,
stage: bool, stage: bool,
reverse: bool, reverse: bool,
) -> (Diff<'a>, DiffOptions) { ) -> Result<Diff<'a>, Error> {
let mut opt = DiffOptions::new(); let mut opt = DiffOptions::new();
opt.pathspec(p); opt.pathspec(p);
opt.reverse(reverse); opt.reverse(reverse);
@ -88,31 +88,30 @@ pub(crate) fn get_diff_raw<'a>(
// diff against head // diff against head
if let Ok(ref_head) = repo.head() { if let Ok(ref_head) = repo.head() {
let parent = let parent =
repo.find_commit(ref_head.target().unwrap()).unwrap(); repo.find_commit(ref_head.target().unwrap())?;
let tree = parent.tree().unwrap(); let tree = parent.tree()?;
repo.diff_tree_to_index( repo.diff_tree_to_index(
Some(&tree), Some(&tree),
Some(&repo.index().unwrap()), Some(&repo.index()?),
Some(&mut opt), Some(&mut opt),
) )?
.unwrap()
} else { } else {
repo.diff_tree_to_index( repo.diff_tree_to_index(
None, None,
Some(&repo.index().unwrap()), Some(&repo.index()?),
Some(&mut opt), Some(&mut opt),
) )?
.unwrap()
} }
} else { } else {
opt.include_untracked(true); opt.include_untracked(true);
opt.recurse_untracked_dirs(true); opt.recurse_untracked_dirs(true);
repo.diff_index_to_workdir(None, Some(&mut opt)).unwrap() repo.diff_index_to_workdir(None, Some(&mut opt))?
}; };
(diff, opt) Ok(diff)
} }
//TODO: return Option
/// ///
pub fn get_diff(repo_path: &str, p: String, stage: bool) -> FileDiff { pub fn get_diff(repo_path: &str, p: String, stage: bool) -> FileDiff {
scope_time!("get_diff"); scope_time!("get_diff");
@ -120,7 +119,7 @@ pub fn get_diff(repo_path: &str, p: String, stage: bool) -> FileDiff {
let repo = utils::repo(repo_path); let repo = utils::repo(repo_path);
let repo_path = repo.path().parent().unwrap(); let repo_path = repo.path().parent().unwrap();
let (diff, mut opt) = get_diff_raw(&repo, &p, stage, false); let diff = get_diff_raw(&repo, &p, stage, false).unwrap();
let mut res: FileDiff = FileDiff::default(); let mut res: FileDiff = FileDiff::default();
let mut current_lines = Vec::new(); let mut current_lines = Vec::new();
@ -172,26 +171,29 @@ pub fn get_diff(repo_path: &str, p: String, stage: bool) -> FileDiff {
let newfile_path = let newfile_path =
repo_path.join(delta.new_file().path().unwrap()); repo_path.join(delta.new_file().path().unwrap());
let newfile_content = new_file_content(&newfile_path) if let Some(newfile_content) =
.unwrap_or_else(|| String::from("file not found")); new_file_content(&newfile_path)
{
let mut patch = Patch::from_buffers( let mut patch = Patch::from_buffers(
&[], &[],
None, None,
newfile_content.as_bytes(), newfile_content.as_bytes(),
Some(&newfile_path), Some(&newfile_path),
Some(&mut opt), None,
) )
.unwrap();
patch
.print(&mut |_delta, hunk:Option<DiffHunk>, line: git2::DiffLine| {
put(hunk,line);
true
})
.unwrap(); .unwrap();
true patch
.print(&mut |_delta, hunk:Option<DiffHunk>, line: git2::DiffLine| {
put(hunk,line);
true
})
.unwrap();
true
} else {
false
}
} else { } else {
false false
} }
@ -226,8 +228,6 @@ fn new_file_content(path: &Path) -> Option<String> {
} else if meta.file_type().is_file() { } else if meta.file_type().is_file() {
if let Ok(content) = fs::read_to_string(path) { if let Ok(content) = fs::read_to_string(path) {
return Some(content); return Some(content);
} else {
return Some(String::from("no text file"));
} }
} }
} }
@ -245,7 +245,7 @@ mod tests {
}; };
use std::{ use std::{
fs::{self, File}, fs::{self, File},
io::Write, io::{Error, Write},
path::Path, path::Path,
}; };
@ -391,4 +391,26 @@ mod tests {
assert_eq!(diff.hunks[0].lines[1].content, "test"); assert_eq!(diff.hunks[0].lines[1].content, "test");
} }
#[test]
fn test_diff_new_binary_file_using_invalid_utf8(
) -> Result<(), Error> {
let file_path = Path::new("bar");
let (_td, repo) = repo_init_empty();
let root = repo.path().parent().unwrap();
let repo_path = root.as_os_str().to_str().unwrap();
File::create(&root.join(file_path))?
.write_all(b"\xc3\x28")?;
let diff = get_diff(
repo_path,
String::from(file_path.to_str().unwrap()),
false,
);
assert_eq!(diff.hunks.len(), 0);
Ok(())
}
} }

6
asyncgit/src/sync/hunks.rs
View file

@ -17,7 +17,7 @@ pub fn stage_hunk(
let repo = repo(repo_path); let repo = repo(repo_path);
let (diff, _) = get_diff_raw(&repo, &file_path, false, false); let diff = get_diff_raw(&repo, &file_path, false, false).unwrap();
let mut opt = ApplyOptions::new(); let mut opt = ApplyOptions::new();
opt.hunk_callback(|hunk| { opt.hunk_callback(|hunk| {
@ -65,7 +65,7 @@ pub fn unstage_hunk(
let repo = repo(repo_path); let repo = repo(repo_path);
let (diff, _) = get_diff_raw(&repo, &file_path, true, false); let diff = get_diff_raw(&repo, &file_path, true, false).unwrap();
let diff_count_positive = diff.deltas().len(); let diff_count_positive = diff.deltas().len();
let hunk_index = find_hunk_index(&diff, hunk_hash); let hunk_index = find_hunk_index(&diff, hunk_hash);
@ -75,7 +75,7 @@ pub fn unstage_hunk(
return false; return false;
} }
let (diff, _) = get_diff_raw(&repo, &file_path, true, true); let diff = get_diff_raw(&repo, &file_path, true, true).unwrap();
assert_eq!(diff.deltas().len(), diff_count_positive); assert_eq!(diff.deltas().len(), diff_count_positive);