gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-10-06 08:58:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

check lines since snapshot for all dirty branches

Browse Source 
This is needed because new changes to a file may be locked to a branch which is not the "default" one
This commit is contained in:
Kiril Videlov 2024-05-23 22:37:10 +02:00
parent db4bb914cc
commit 879005ae20
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crates/gitbutler-core/src/ops/oplog.rs
View File

@ -9,6 +9,7 @@ use std::{fs, path::PathBuf};
use anyhow::Result;
use crate::git::diff::FileDiff;
use crate::virtual_branches::Branch;
use crate::{git::diff::hunks_by_filepath, projects::Project};
use super::{
@ -725,15 +726,26 @@ fn lines_since_snapshot(project: &Project) -> Result<usize> {
let vb_state = project.virtual_branches();
let binding = vb_state.list_branches()?;
let active_branch = binding
let dirty_branches: Vec<&Branch> = binding
.iter()
.filter(|b| b.applied)
.max_by_key(|branch| branch.selected_for_changes.unwrap_or(i64::MIN));
if active_branch.is_none() {
return Ok(0);
.filter(|b| !b.ownership.claims.is_empty())
.collect();
let mut lines_changed = 0;
for branch in dirty_branches {
lines_changed += branch_lines_since_snapshot(branch, &repo, head_sha.clone())?;
}
let active_branch = active_branch.unwrap();
let active_branch_tree = repo.find_tree(active_branch.tree.into())?;
Ok(lines_changed)
}
fn branch_lines_since_snapshot(
branch: &Branch,
repo: &git2::Repository,
head_sha: String,
) -> Result<usize> {
let active_branch_tree = repo.find_tree(branch.tree.into())?;
let commit = repo.find_commit(git2::Oid::from_str(&head_sha)?)?;
let head_tree = commit.tree()?;
@ -742,7 +754,7 @@ fn lines_since_snapshot(project: &Project) -> Result<usize> {
.ok_or(anyhow!("failed to get virtual_branches tree entry"))?;
let virtual_branches = repo.find_tree(virtual_branches.id())?;
let old_active_branch = virtual_branches
.get_name(active_branch.id.to_string().as_str())
.get_name(branch.id.to_string().as_str())
.ok_or(anyhow!("failed to get active branch from tree entry"))?;
let old_active_branch = repo.find_tree(old_active_branch.id())?;
let old_active_branch_tree = old_active_branch