gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-10-07 01:18:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3266 from gitbutlerapp/add-diff-hash-function

Browse Source 
add-diff-hash-function
This commit is contained in:
Kiril Videlov 2024-03-21 22:58:15 +01:00 committed by GitHub
commit ce548aca55
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gitbutler-app/src/virtual_branches/branch/hunk.rs
View File

@ -17,7 +17,7 @@ impl From<&diff::GitHunk> for Hunk {
Hunk {
start: hunk.new_start,
end: hunk.new_start + hunk.new_lines,
hash: None,
hash: Some(Hunk::hash(&hunk.diff)),
timestamp_ms: None,
}
}
@ -156,6 +156,16 @@ impl Hunk {
pub fn shallow_eq(&self, other: &diff::GitHunk) -> bool {
self.start == other.new_start && self.end == other.new_start + other.new_lines
}
pub fn hash(diff: &str) -> String {
let addition = diff
.lines()
.skip(1) // skip the first line which is the diff header
.filter(|line| line.starts_with('+') || line.starts_with('-')) // exclude context lines
.collect::<Vec<_>>()
.join("\n");
format!("{:x}", md5::compute(addition))
}
}
#[cfg(test)]

16
gitbutler-app/src/virtual_branches/virtual.rs
View File

@ -1838,16 +1838,6 @@ fn get_mtime(cache: &mut HashMap<PathBuf, u128>, file_path: &PathBuf) -> u128 {
}
}
fn diff_hash(diff: &str) -> String {
let addition = diff
.lines()
.skip(1) // skip the first line which is the diff header
.filter(|line| line.starts_with('+') || line.starts_with('-')) // exclude context lines
.collect::<Vec<_>>()
.join("\n");
format!("{:x}", md5::compute(addition))
}
pub fn virtual_hunks_by_filepath(
project_path: &Path,
diff: &HashMap<PathBuf, Vec<diff::GitHunk>>,
@ -1866,7 +1856,7 @@ pub fn virtual_hunks_by_filepath(
start: hunk.new_start,
end: hunk.new_start + hunk.new_lines,
binary: hunk.binary,
hash: diff_hash(&hunk.diff),
hash: Hunk::hash(&hunk.diff),
locked: false,
locked_to: None,
change_type: hunk.change_type,
@ -2052,7 +2042,7 @@ fn get_applied_status(
.filter_map(|claimed_hunk| {
// if any of the current hunks intersects with the owned hunk, we want to keep it
for (i, git_diff_hunk) in git_diff_hunks.iter().enumerate() {
let hash = diff_hash(&git_diff_hunk.diff);
let hash = Hunk::hash(&git_diff_hunk.diff);
// Eq compares hashes first, and if one of the hunks lacks a hash, it compares line numbers
if claimed_hunk.eq(&Hunk::from(git_diff_hunk)) {
// try to re-use old timestamp
@ -2132,7 +2122,7 @@ fn get_applied_status(
file_path: filepath.clone(),
hunks: vec![Hunk::from(&hunk)
.with_timestamp(get_mtime(&mut mtimes, &filepath))
.with_hash(diff_hash(hunk.diff.as_str()).as_str())],
.with_hash(Hunk::hash(hunk.diff.as_str()).as_str())],
});
diffs_by_branch
.entry(virtual_branches[default_vbranch_pos].id)