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

Add integration_commit_id as optional param to update_gitbutler_integration

Browse Source
This commit is contained in:
Mattias Granlund 2024-04-23 16:48:32 +02:00
parent 811f0ee35b
commit 0a1fbdce9a
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/gitbutler-core/src/virtual_branches/integration.rs
View File

@ -121,10 +121,17 @@ fn write_integration_file(head: &git::Reference, path: PathBuf) -> Result<()> {
std::fs::write(path, format!(":{}", sha))?; std::fs::write(path, format!(":{}", sha))?;
Ok(()) Ok(())
} }
pub fn update_gitbutler_integration( pub fn update_gitbutler_integration(
vb_state: &VirtualBranchesHandle, vb_state: &VirtualBranchesHandle,
project_repository: &project_repository::Repository, project_repository: &project_repository::Repository,
) -> Result<git::Oid> {
update_gitbutler_integration_with_commit(vb_state, project_repository, None)
}
pub fn update_gitbutler_integration_with_commit(
vb_state: &VirtualBranchesHandle,
project_repository: &project_repository::Repository,
integration_commit_id: Option<git::Oid>,
) -> Result<git::Oid> { ) -> Result<git::Oid> {
let target = vb_state let target = vb_state
.get_default_target() .get_default_target()
@ -175,7 +182,10 @@ pub fn update_gitbutler_integration(
.filter(|branch| branch.applied) .filter(|branch| branch.applied)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let integration_commit_id = get_workspace_head(&vb_state, project_repository)?; let integration_commit_id = match integration_commit_id {
Some(commit_id) => commit_id,
_ => get_workspace_head(&vb_state, project_repository)?,
};
let integration_commit = repo.find_commit(integration_commit_id).unwrap(); let integration_commit = repo.find_commit(integration_commit_id).unwrap();
let integration_tree = integration_commit.tree()?; let integration_tree = integration_commit.tree()?;

6
crates/gitbutler-core/src/virtual_branches/virtual.rs
View File

@ -788,7 +788,11 @@ pub fn list_virtual_branches(
.find_commit(integration_commit_id) .find_commit(integration_commit_id)
.unwrap(); .unwrap();
super::integration::update_gitbutler_integration(&vb_state, project_repository)?; super::integration::update_gitbutler_integration_with_commit(
&vb_state,
project_repository,
Some(integration_commit_id),
)?;
let (statuses, skipped_files) = let (statuses, skipped_files) =
get_status_by_branch(project_repository, Some(&integration_commit.id()))?; get_status_by_branch(project_repository, Some(&integration_commit.id()))?;