gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-06 01:27:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1258 from gitbutlerapp/Add-debugging-logs

Browse Source 
chore: refactor hunks_by_filepath function to simplify code and impro…
This commit is contained in:
Nikita Galaiko 2023-09-29 11:12:13 +02:00 committed by GitHub
commit bbbd363870
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/tauri/src/git/diff.rs
View File

@ -1,4 +1,4 @@
use std::{collections::HashMap, path};
use std::{collections::HashMap, path, str};
use anyhow::{Context, Result};
use serde::Serialize;
@ -135,12 +135,15 @@ fn hunks_by_filepath(
}
match line.origin() {
'+' | '-' | ' ' => current_diff.push_str(&format!("{}", line.origin())),
_ => {}
}
// is this a binary patch or a hunk?
match line.origin() {
'+' | '-' | ' ' => {
current_diff.push_str(&format!("{}", line.origin()));
current_diff.push_str(
str::from_utf8(line.content())
.map_err(|error| tracing::error!(?error, ?file_path))
.unwrap_or_default(),
);
current_binary = false;
}
'B' => {
let full_path = repository.workdir().unwrap().join(file_path);
// save the file_path to the odb
@ -152,8 +155,11 @@ fn hunks_by_filepath(
current_binary = true;
}
_ => {
current_diff.push_str(std::str::from_utf8(line.content()).unwrap());
current_binary = false;
current_diff.push_str(
str::from_utf8(line.content())
.map_err(|error| tracing::error!(?error, ?file_path))
.unwrap_or_default(),
);
}
}