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

Revert "temporary fix for duplicated deltas issue"

Browse Source 
This reverts commit 6bb919b238.
This commit is contained in:
Kiril Videlov 2023-03-09 13:44:43 +01:00
parent 0d579f3d2c
commit c29439b0e5
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src-tauri/src/repositories/repositories.rs
View File

@ -62,37 +62,12 @@ impl Repository {
}
pub fn deltas(&self, session_id: &str) -> Result<HashMap<String, Vec<deltas::Delta>>> {
let session = sessions::get(
deltas::list(
&self.git_repository,
&self.project,
&self.reference()?,
session_id,
)?
.ok_or(anyhow::anyhow!("session {} not found", session_id))?;
let deltas = deltas::list(
&self.git_repository,
&self.project,
&self.reference()?,
session_id,
)?;
// NOTE: this is a hot fix for the issue where multiple sessions might contain the same
// deltas.
// TODO: find out the root cause of this issue and fix it.
let mut deltas_fixup = HashMap::new();
for (file, deltas) in deltas {
let mut deltas_fixup_file = Vec::new();
for delta in deltas {
if delta.timestamp_ms >= session.meta.start_timestamp_ms
&& delta.timestamp_ms <= session.meta.last_timestamp_ms
{
deltas_fixup_file.push(delta);
}
}
deltas_fixup.insert(file, deltas_fixup_file);
}
Ok(deltas_fixup)
)
}
}