Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 22 additions & 103 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
},
"dependencies": {
"@pierre/diffs": "^1.0.6",
"@sentry/react": "^10.36.0",
"@tanstack/react-virtual": "^3.13.18",
"@tauri-apps/api": "^2",
"@tauri-apps/plugin-dialog": "^2.6.0",
Expand Down
18 changes: 16 additions & 2 deletions src-tauri/src/git/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use tauri::State;

use crate::shared::process_core::tokio_command;
use crate::git_utils::{
checkout_branch, commit_to_entry, diff_patch_to_string, diff_stats_for_path,
image_mime_type, list_git_roots as scan_git_roots, parse_github_repo, resolve_git_root,
checkout_branch, commit_to_entry, diff_patch_to_string, diff_stats_for_path, image_mime_type,
list_git_roots as scan_git_roots, parse_github_repo, resolve_git_root,
};
use crate::state::AppState;
use crate::types::{
Expand Down Expand Up @@ -823,8 +823,13 @@ pub(crate) async fn get_git_diffs(
.get(&workspace_id)
.ok_or("workspace not found")?
.clone();
drop(workspaces);

let repo_root = resolve_git_root(&entry)?;
let ignore_whitespace_changes = {
let settings = state.app_settings.lock().await;
settings.git_diff_ignore_whitespace_changes
};
tokio::task::spawn_blocking(move || {
let repo = Repository::open(&repo_root).map_err(|e| e.to_string())?;
let head_tree = repo
Expand All @@ -837,6 +842,7 @@ pub(crate) async fn get_git_diffs(
.include_untracked(true)
.recurse_untracked_dirs(true)
.show_untracked_content(true);
options.ignore_whitespace_change(ignore_whitespace_changes);

let diff = match head_tree.as_ref() {
Some(tree) => repo
Expand Down Expand Up @@ -1054,6 +1060,12 @@ pub(crate) async fn get_git_commit_diff(
.get(&workspace_id)
.ok_or("workspace not found")?
.clone();
drop(workspaces);

let ignore_whitespace_changes = {
let settings = state.app_settings.lock().await;
settings.git_diff_ignore_whitespace_changes
};

let repo_root = resolve_git_root(&entry)?;
let repo = Repository::open(&repo_root).map_err(|e| e.to_string())?;
Expand All @@ -1066,6 +1078,7 @@ pub(crate) async fn get_git_commit_diff(
.and_then(|parent| parent.tree().ok());

let mut options = DiffOptions::new();
options.ignore_whitespace_change(ignore_whitespace_changes);
let diff = repo
.diff_tree_to_tree(parent_tree.as_ref(), Some(&commit_tree), Some(&mut options))
.map_err(|e| e.to_string())?;
Expand Down Expand Up @@ -1497,6 +1510,7 @@ pub(crate) async fn create_git_branch(
mod tests {
use super::*;
use std::fs;
use std::path::Path;

fn create_temp_repo() -> (PathBuf, Repository) {
let root = std::env::temp_dir().join(format!(
Expand Down
Loading