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

prevent files jumping when commited

Browse Source
This commit is contained in:
Nikita Galaiko 2023-07-24 15:03:45 +02:00
parent 02c25078e9
commit 3d7a632938
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src-tauri/src/virtual_branches/mod.rs
View File

@ -789,7 +789,7 @@ pub fn list_virtual_branches(
.context("failed to diff trees")?; .context("failed to diff trees")?;
let non_commited_hunks_by_filepath = hunks_by_filepath(project_repository, &diff); let non_commited_hunks_by_filepath = hunks_by_filepath(project_repository, &diff);
non_commited_hunks_by_filepath let mut vfiles = non_commited_hunks_by_filepath
.into_iter() .into_iter()
.map(|(file_path, non_commited_hunks)| VirtualBranchFile { .map(|(file_path, non_commited_hunks)| VirtualBranchFile {
id: file_path.display().to_string(), id: file_path.display().to_string(),
@ -819,7 +819,16 @@ pub fn list_virtual_branches(
) )
.unwrap_or(false), .unwrap_or(false),
}) })
.collect::<Vec<_>>() .collect::<Vec<_>>();
// stable files sort using virtual files position
vfiles.sort_by(|a, b| {
let pos_a = files.iter().position(|f| f.id == a.id).unwrap_or(0);
let pos_b = files.iter().position(|f| f.id == b.id).unwrap_or(0);
pos_a.cmp(&pos_b)
});
vfiles
} else { } else {
files files
}; };