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

Merge pull request #3816 from gitbutlerapp/list-remote-branches-refactoring-fix

Browse Source 
refactor: Improve error handling in branch_to_remote_branch() and list_remote_branches() functions
This commit is contained in:
Kiril Videlov 2024-05-22 14:35:17 +02:00 committed by GitHub
commit 5006b6019d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,22 +56,23 @@ pub fn list_remote_branches(
) -> Result<Vec<RemoteBranch>, errors::ListRemoteBranchesError> {
let default_target = default_target(&project_repository.project().gb_dir())?;
let remote_branches = project_repository
let mut remote_branches = vec![];
for (branch, _) in project_repository
.git_repository
.branches(None)
.context("failed to list remote branches")?
.flatten()
.map(|(branch, _)| branch)
.map(|branch| branch_to_remote_branch(&branch))
.collect::<Result<Vec<_>>>()
.context("failed to convert branches")?
.into_iter()
.flatten()
.filter(|branch| branch.name.branch() != Some(default_target.branch.branch()))
.filter(|branch| branch.name.branch() != Some("gitbutler/integration"))
.filter(|branch| branch.name.branch() != Some("gitbutler/target"))
.collect::<Vec<_>>();
{
let branch = branch_to_remote_branch(&branch)?;
if let Some(branch) = branch {
if branch.name.branch() != Some(default_target.branch.branch())
&& branch.name.branch() != Some("gitbutler/integration")
&& branch.name.branch() != Some("gitbutler/target")
{
remote_branches.push(branch);
}
}
}
Ok(remote_branches)
}
@ -114,28 +115,34 @@ pub fn branch_to_remote_branch(branch: &git::Branch) -> Result<Option<RemoteBran
return Ok(None);
}
};
branch
.target()
.map(|sha| {
let name = git::Refname::try_from(branch).context("could not get branch name")?;
Ok(RemoteBranch {
sha,
upstream: if let git::Refname::Local(local_name) = &name {
local_name.remote().cloned()
} else {
None
},
name,
last_commit_timestamp_ms: commit
.time()
.seconds()
.try_into()
.map(|t: u128| t * 1000)
.ok(),
last_commit_author: commit.author().name().map(std::string::ToString::to_string),
let name = git::Refname::try_from(branch).context("could not get branch name");
match name {
Ok(name) => branch
.target()
.map(|sha| {
Ok(RemoteBranch {
sha,
upstream: if let git::Refname::Local(local_name) = &name {
local_name.remote().cloned()
} else {
None
},
name,
last_commit_timestamp_ms: commit
.time()
.seconds()
.try_into()
.map(|t: u128| t * 1000)
.ok(),
last_commit_author: commit
.author()
.name()
.map(std::string::ToString::to_string),
})
})
})
.transpose()
.transpose(),
Err(_) => Ok(None),
}
}
pub fn branch_to_remote_branch_data(