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

rename tree writer functions to be actually descriptive of what they do

Browse Source
This commit is contained in:
Kiril Videlov 2024-07-21 15:59:30 +02:00
parent 4faaf77d08
commit 38e01c931c
No known key found for this signature in database
GPG Key ID: A4C733025427C471
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/gitbutler-branch-actions/src/base.rs
View File

@ -246,7 +246,7 @@ pub(crate) fn set_base_branch(
created_timestamp_ms: now_ms,
updated_timestamp_ms: now_ms,
head: current_head_commit.id(),
tree: vb::write_tree_onto_commit(
tree: vb::write_hunks_onto_commit(
project_repository,
current_head_commit.id(),
gitbutler_diff::diff_files_into_hunks(wd_diff),

5
crates/gitbutler-branch-actions/src/branch_manager/branch_removal.rs
View File

@ -2,7 +2,7 @@ use crate::{
conflicts::{self},
ensure_selected_for_changes, get_applied_status,
integration::get_integration_commiter,
write_tree, NameConflictResolution, VirtualBranchesExt,
write_hunks_onto_oid, NameConflictResolution, VirtualBranchesExt,
};
use anyhow::{anyhow, Context, Result};
use git2::build::TreeUpdateBuilder;
@ -87,7 +87,8 @@ impl BranchManager<'_> {
|final_tree, status| {
let final_tree = final_tree?;
let branch = status.0;
let tree_oid = write_tree(self.project_repository, &branch.head, status.1)?;
let tree_oid =
write_hunks_onto_oid(self.project_repository, &branch.head, status.1)?;
let branch_tree = repo.find_tree(tree_oid)?;
let mut result =
repo.merge_trees(&base_tree, &final_tree, &branch_tree, None)?;

6
crates/gitbutler-branch-actions/src/status.rs
View File

@ -15,8 +15,8 @@ use std::{
};
use crate::{
conflicts::RepoConflictsExt, integration::get_workspace_head, write_tree, BranchManagerExt,
HunkLock, MTimeCache, VirtualBranchHunk, VirtualBranchesExt,
conflicts::RepoConflictsExt, integration::get_workspace_head, write_hunks_onto_oid,
BranchManagerExt, HunkLock, MTimeCache, VirtualBranchHunk, VirtualBranchesExt,
};
pub struct VirtualBranchesStatus {
@ -189,7 +189,7 @@ pub fn get_applied_status(
if !project_repository.is_resolving() {
let vb_state = project_repository.project().virtual_branches();
for (vbranch, files) in &mut hunks_by_branch {
vbranch.tree = write_tree(project_repository, &vbranch.head, files)?;
vbranch.tree = write_hunks_onto_oid(project_repository, &vbranch.head, files)?;
vb_state
.set_branch(vbranch.clone())
.context(format!("failed to write virtual branch {}", vbranch.name))?;

27
crates/gitbutler-branch-actions/src/virtual.rs
View File

@ -269,7 +269,8 @@ pub fn unapply_ownership(
target_commit.tree().context("failed to get target tree"),
|final_tree, status| {
let final_tree = final_tree?;
let tree_oid = write_tree(project_repository, &integration_commit_id, status.1)?;
let tree_oid =
write_hunks_onto_oid(project_repository, &integration_commit_id, status.1)?;
let branch_tree = repo.find_tree(tree_oid)?;
let mut result = repo.merge_trees(&base_tree, &final_tree, &branch_tree, None)?;
let final_tree_oid = result.write_tree_to(project_repository.repo())?;
@ -278,7 +279,7 @@ pub fn unapply_ownership(
},
)?;
let final_tree_oid = write_tree_onto_tree(project_repository, &final_tree, diff)?;
let final_tree_oid = write_hunks_onto_tree(project_repository, &final_tree, diff)?;
let final_tree = repo
.find_tree(final_tree_oid)
.context("failed to find tree")?;
@ -1127,7 +1128,7 @@ fn diffs_into_virtual_files(
// this function takes a list of file ownership,
// constructs a tree from those changes on top of the target
// and writes it as a new tree for storage
pub(crate) fn write_tree<T>(
pub(crate) fn write_hunks_onto_oid<T>(
project_repository: &ProjectRepository,
target: &git2::Oid,
files: impl IntoIterator<Item = (impl Borrow<PathBuf>, impl Borrow<Vec<T>>)>,
@ -1135,10 +1136,10 @@ pub(crate) fn write_tree<T>(
where
T: Into<gitbutler_diff::GitHunk> + Clone,
{
write_tree_onto_commit(project_repository, *target, files)
write_hunks_onto_commit(project_repository, *target, files)
}
pub(crate) fn write_tree_onto_commit<T>(
pub(crate) fn write_hunks_onto_commit<T>(
project_repository: &ProjectRepository,
commit_oid: git2::Oid,
files: impl IntoIterator<Item = (impl Borrow<PathBuf>, impl Borrow<Vec<T>>)>,
@ -1152,10 +1153,10 @@ where
let head_commit = git_repository.find_commit(commit_oid)?;
let base_tree = head_commit.tree()?;
write_tree_onto_tree(project_repository, &base_tree, files)
write_hunks_onto_tree(project_repository, &base_tree, files)
}
pub(crate) fn write_tree_onto_tree<T>(
pub(crate) fn write_hunks_onto_tree<T>(
project_repository: &ProjectRepository,
base_tree: &git2::Tree,
files: impl IntoIterator<Item = (impl Borrow<PathBuf>, impl Borrow<Vec<T>>)>,
@ -1392,9 +1393,9 @@ pub fn commit(
Some((filepath, hunks))
}
});
write_tree_onto_commit(project_repository, branch.head, files)?
write_hunks_onto_commit(project_repository, branch.head, files)?
} else {
write_tree_onto_commit(project_repository, branch.head, files)?
write_hunks_onto_commit(project_repository, branch.head, files)?
};
let git_repository = project_repository.repo();
@ -1758,7 +1759,7 @@ pub(crate) fn move_commit_file(
// write our new tree and commit for the new "from" commit without the moved changes
let new_from_tree_id =
write_tree_onto_commit(project_repository, from_parent.id(), &diffs_to_keep)?;
write_hunks_onto_commit(project_repository, from_parent.id(), &diffs_to_keep)?;
let new_from_tree = &repo
.find_tree(new_from_tree_id)
.with_context(|| "tree {new_from_tree_oid} not found")?;
@ -1824,7 +1825,7 @@ pub(crate) fn move_commit_file(
// apply diffs_to_amend to the commit tree
// and write a new commit with the changes we're moving
let new_tree_oid = write_tree_onto_commit(project_repository, to_amend_oid, &diffs_to_amend)?;
let new_tree_oid = write_hunks_onto_commit(project_repository, to_amend_oid, &diffs_to_amend)?;
let new_tree = project_repository
.repo()
.find_tree(new_tree_oid)
@ -1953,7 +1954,7 @@ pub(crate) fn amend(
}
// apply diffs_to_amend to the commit tree
let new_tree_oid = write_tree_onto_commit(project_repository, commit_oid, &diffs_to_amend)?;
let new_tree_oid = write_hunks_onto_commit(project_repository, commit_oid, &diffs_to_amend)?;
let new_tree = project_repository
.repo()
.find_tree(new_tree_oid)
@ -2456,7 +2457,7 @@ pub(crate) fn move_commit(
destination_branch.ownership.put(ownership);
}
let new_destination_tree_oid = write_tree_onto_commit(
let new_destination_tree_oid = write_hunks_onto_commit(
project_repository,
destination_branch.head,
branch_head_diff,