gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-12 16:43:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1386 from gitbutlerapp/Refactor-add-wd-path

Browse Source 
do not use project_repository index while flushing
This commit is contained in:
Nikita Galaiko 2023-10-16 13:33:42 +02:00 committed by GitHub
commit a33857534d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/tauri/src/gb_repository/repository.rs
View File

@ -715,12 +715,6 @@ fn build_wd_tree_from_repo(
) -> Result<git::Oid> {
let mut index = git::Index::new()?;
// create a new in-memory git2 index and open the working one so we can cheat if none of the metadata of an entry has changed
let repo_index = &mut project_repository
.git_repository
.index()
.with_context(|| "failed to open repo index".to_string())?;
let mut added: HashMap<String, bool> = HashMap::new();
// first, add session/wd files. session/wd are written at the same time as deltas, so it's important to add them first
@ -742,7 +736,6 @@ fn build_wd_tree_from_repo(
add_wd_path(
&mut index,
repo_index,
&gb_repository.session_wd_path(),
file_path,
gb_repository,
@ -779,7 +772,6 @@ fn build_wd_tree_from_repo(
add_wd_path(
&mut index,
repo_index,
project_repository.root(),
file_path,
gb_repository,
@ -804,7 +796,6 @@ fn build_wd_tree_from_repo(
// TODO: actually upload the file to LFS
fn add_wd_path(
index: &mut git::Index,
repo_index: &mut git::Index,
dir: &std::path::Path,
rel_file_path: &std::path::Path,
gb_repository: &Repository,
@ -817,20 +808,6 @@ fn add_wd_path(
let mtime = FileTime::from_last_modification_time(&metadata);
let ctime = FileTime::from_creation_time(&metadata).unwrap_or(mtime);
if let Some(entry) = repo_index.get_path(rel_file_path, 0) {
// if we find the entry and the metadata of the file has not changed, we can just use the existing entry
if entry.mtime == mtime
&& entry.file_size == u32::try_from(metadata.len())?
&& entry.mode == metadata.mode()
// TODO: we need to normalize this mode to an acceptable git mode
{
index.add(&entry).unwrap();
return Ok(());
}
}
// something is different, or not found, so we need to create a new entry
// look for files that are bigger than 4GB, which are not supported by git
// insert a pointer as the blob content instead
// TODO: size limit should be configurable