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

reformat

Browse Source
This commit is contained in:
Scott Chacon 2024-05-17 15:16:04 +02:00
parent dcc1b37331
commit 733780f302
2 changed files with 60 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,14 +151,22 @@ impl Oplog for Project {
commit_tree_builder.insert("tree", commit_tree.id(), FileMode::Tree.into())?;
let commit_tree_id = commit_tree_builder.write()?;
commits_tree_builder.insert(&commit_id.to_string(), commit_tree_id, FileMode::Tree.into())?;
commits_tree_builder.insert(
&commit_id.to_string(),
commit_tree_id,
FileMode::Tree.into(),
)?;
}
let commits_tree_id = commits_tree_builder.write()?;
branch_tree_builder.insert("commits",commits_tree_id, FileMode::Tree.into())?;
branch_tree_builder.insert("commits", commits_tree_id, FileMode::Tree.into())?;
let branch_tree_id = branch_tree_builder.write()?;
branches_tree_builder.insert(&branch.id.to_string(), branch_tree_id, FileMode::Tree.into())?;
branches_tree_builder.insert(
&branch.id.to_string(),
branch_tree_id,
FileMode::Tree.into(),
)?;
}
let branch_tree_id = branches_tree_builder.write()?;
@ -166,9 +174,11 @@ impl Oplog for Project {
// merge all the branch trees together, this should be our worktree
// TODO: when we implement sub-hunk splitting, this merge logic will need to incorporate that
if head_trees.is_empty() { // if there are no applied branches, then it's just the target tree
if head_trees.is_empty() {
// if there are no applied branches, then it's just the target tree
tree_builder.insert("workdir", target_tree_oid, FileMode::Tree.into())?;
} else if head_trees.len() == 1 { // if there is just one applied branch, then it's just that branch tree
} else if head_trees.len() == 1 {
// if there is just one applied branch, then it's just that branch tree
tree_builder.insert("workdir", head_trees[0].into(), FileMode::Tree.into())?;
} else {
// otherwise merge one branch tree at a time with target_tree_oid as the base
@ -180,18 +190,14 @@ impl Oplog for Project {
// iterate through all head trees
for head_tree in head_trees_iter {
let current_theirs = repo.find_tree(git2::Oid::from(*head_tree))?;
let mut workdir_temp_index = repo.merge_trees(
&base_tree,
&current_ours,
&current_theirs,
None
)?;
let mut workdir_temp_index =
repo.merge_trees(&base_tree, &current_ours, &current_theirs, None)?;
workdir_tree_oid = workdir_temp_index.write_tree_to(&repo)?;
current_ours = current_theirs;
}
tree_builder.insert("workdir", workdir_tree_oid, FileMode::Tree.into())?;
}
// ok, write out the final oplog tree
let tree_id = tree_builder.write()?;
let tree = repo.find_tree(tree_id)?;
@ -267,7 +273,7 @@ impl Oplog for Project {
}
let tree = commit.tree()?;
let wd_tree_entry = tree.get_name("workdir");
let wd_tree_entry = tree.get_name("workdir");
let tree = if let Some(wd_tree_entry) = wd_tree_entry {
repo.find_tree(wd_tree_entry.id())?
} else {
@ -352,18 +358,29 @@ impl Oplog for Project {
.ok_or(anyhow!("failed to get workdir tree entry"))?;
// make sure we reconstitute any commits that were in the snapshot that are not here for some reason
// for every entry in the virtual_branches subtree, reconsitute the commits
// for every entry in the virtual_branches subtree, reconsitute the commits
let vb_tree_entry = top_tree
.get_name("virtual_branches")
.ok_or(anyhow!("failed to get virtual_branches tree entry"))?;
let vb_tree = vb_tree_entry.to_object(&repo)?.into_tree().map_err(|_| anyhow!("failed to convert virtual_branches tree entry to tree"))?;
.ok_or(anyhow!("failed to get virtual_branches tree entry"))?;
let vb_tree = vb_tree_entry
.to_object(&repo)?
.into_tree()
.map_err(|_| anyhow!("failed to convert virtual_branches tree entry to tree"))?;
// walk through all the entries (branches)
let walker = vb_tree.iter();
for branch_entry in walker {
let branch_tree = branch_entry.to_object(&repo)?.into_tree().map_err(|_| anyhow!("failed to convert virtual_branches tree entry to tree"))?;
let commits_tree_entry = branch_tree.get_name("commits").ok_or(anyhow!("failed to get commits tree entry"))?;
let commits_tree = commits_tree_entry.to_object(&repo)?.into_tree().map_err(|_| anyhow!("failed to convert commits tree entry to tree"))?;
let branch_tree = branch_entry
.to_object(&repo)?
.into_tree()
.map_err(|_| anyhow!("failed to convert virtual_branches tree entry to tree"))?;
let commits_tree_entry = branch_tree
.get_name("commits")
.ok_or(anyhow!("failed to get commits tree entry"))?;
let commits_tree = commits_tree_entry
.to_object(&repo)?
.into_tree()
.map_err(|_| anyhow!("failed to convert commits tree entry to tree"))?;
// walk through all the commits in the branch
let commit_walker = commits_tree.iter();
@ -378,13 +395,20 @@ impl Oplog for Project {
// commit is not in the repo, let's build it from our data
// we get the data from the blob entry and create a commit object from it, which should match the oid of the entry
let commit_tree = commit_entry.to_object(&repo)?.into_tree().map_err(|_| anyhow!("failed to convert commit tree entry to tree"))?;
let commit_blob_entry = commit_tree.get_name("commit").ok_or(anyhow!("failed to get workdir tree entry"))?;
let commit_tree = commit_entry
.to_object(&repo)?
.into_tree()
.map_err(|_| anyhow!("failed to convert commit tree entry to tree"))?;
let commit_blob_entry = commit_tree
.get_name("commit")
.ok_or(anyhow!("failed to get workdir tree entry"))?;
let commit_blob = commit_blob_entry
.to_object(&repo)?
.into_blob()
.map_err(|_| anyhow!("failed to convert commit tree entry to blob"))?;
let new_commit_oid = repo.odb()?.write(git2::ObjectType::Commit, commit_blob.content())?;
let new_commit_oid = repo
.odb()?
.write(git2::ObjectType::Commit, commit_blob.content())?;
if new_commit_oid != commit_oid {
return Err(anyhow!("commit oid mismatch"));
}

26
crates/gitbutler-core/tests/suite/virtual_branches/oplog.rs
View File

@ -104,9 +104,7 @@ async fn test_basic_oplog() {
]
);
project
.restore_snapshot(snapshots[1].clone().id)
.unwrap();
project.restore_snapshot(snapshots[1].clone().id).unwrap();
// restores the conflict files
let file_lines = std::fs::read_to_string(&conflicts_path).unwrap();
@ -117,21 +115,23 @@ async fn test_basic_oplog() {
assert_eq!(snapshots[2].lines_added, 2);
assert_eq!(snapshots[2].lines_removed, 0);
project
.restore_snapshot(snapshots[3].clone().id)
.unwrap();
project.restore_snapshot(snapshots[3].clone().id).unwrap();
// the restore removed our new branch
let branches = controller.list_virtual_branches(project_id).await.unwrap();
assert_eq!(branches.0.len(), 1);
// assert that the conflicts file was removed
assert!(!&conflicts_path.try_exists().unwrap());
// remove commit2_oid from odb
let commit_str = &commit2_id.to_string();
// find file in odb
let file_path = repository.path().join(".git").join("objects").join(&commit_str[..2]);
let file_path = repository
.path()
.join(".git")
.join("objects")
.join(&commit_str[..2]);
let file_path = file_path.join(&commit_str[2..]);
assert!(file_path.exists());
// remove file
@ -142,9 +142,7 @@ async fn test_basic_oplog() {
let commit = repo.find_commit(commit2_id.into());
assert!(commit.is_err());
project
.restore_snapshot(snapshots[2].clone().id)
.unwrap();
project.restore_snapshot(snapshots[2].clone().id).unwrap();
// test missing commits are recreated
let commit = repo.find_commit(commit2_id.into());
@ -180,7 +178,11 @@ async fn test_oplog_head_corrupt() {
// overwrite oplog head with a non-commit sha
let file_path = repository.path().join(".git").join("operations-log.toml");
fs::write(file_path, "head_sha = \"758d54f587227fba3da3b61fbb54a99c17903d59\"").unwrap();
fs::write(
file_path,
"head_sha = \"758d54f587227fba3da3b61fbb54a99c17903d59\"",
)
.unwrap();
controller
.set_base_branch(project_id, &"refs/remotes/origin/master".parse().unwrap())