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

Include fork point when getting remote branch data

Browse Source
This commit is contained in:
Mattias Granlund 2024-06-03 23:48:06 +02:00
parent e68dc45359
commit 30c1370140
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/gitbutler-core/src/virtual_branches/remote.rs
View File

@ -37,6 +37,7 @@ pub struct RemoteBranchData {
pub upstream: Option<git::RemoteRefname>,
pub behind: u32,
pub commits: Vec<RemoteCommit>,
pub fork_point: Option<git::Oid>,
}
#[derive(Debug, Clone, PartialEq, Serialize)]
@ -93,18 +94,8 @@ pub fn get_branch_data(
.find_branch(refname)
.context(format!("failed to find branch with refname {refname}"))?;
let branch_data = branch_to_remote_branch_data(project_repository, &branch, default_target.sha)
.context("failed to get branch data")?;
branch_data
.context("no data found for branch")
.map(|branch_data| RemoteBranchData {
sha: branch_data.sha,
name: branch_data.name,
upstream: branch_data.upstream,
behind: branch_data.behind,
commits: branch_data.commits,
})
branch_to_remote_branch_data(project_repository, &branch, default_target.sha)?
.context("failed to get branch data")
}
pub fn branch_to_remote_branch(branch: &git2::Branch) -> Result<Option<RemoteBranch>> {
@ -169,6 +160,11 @@ pub fn branch_to_remote_branch_data(
.distance(base, sha.into())
.context("failed to get behind count")?;
let fork_point = ahead
.last()
.and_then(|c| c.parent(0).ok())
.map(|c| c.id().into());
Ok(RemoteBranchData {
sha: sha.into(),
upstream: if let git::Refname::Local(local_name) = &name {
@ -182,6 +178,7 @@ pub fn branch_to_remote_branch_data(
.into_iter()
.map(|commit| commit_to_remote_commit(&commit))
.collect::<Vec<_>>(),
fork_point,
})
})
.transpose()