gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-04 07:25:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5121 from gitbutlerapp/handle-undo-commit

Browse Source 
Stack - handle reorder correctly
This commit is contained in:
Kiril Videlov 2024-10-14 11:27:21 +02:00 committed by GitHub
commit 3a833261e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crates/gitbutler-branch-actions/src/reorder_commits.rs
View File

@ -54,15 +54,34 @@ pub(crate) fn reorder_commit(
let mut branch = vb_state.get_branch_in_workspace(branch_id)?;
let ReorderResult { tree, head } = inner_reorder_commit(
let original_commits = repository.l(branch.head(), LogUntil::Commit(merge_base))?;
let ReorderResult {
tree,
head,
reordered_commits,
} = inner_reorder_commit(
repository,
merge_base,
subject_commit_oid,
offset,
&repository.l(branch.head(), LogUntil::Commit(merge_base))?,
&original_commits,
&repository.find_tree(branch.tree)?,
)?;
let mut old_oid = None;
for (idx, oid) in reordered_commits.iter().enumerate() {
if *oid == subject_commit_oid {
old_oid = reordered_commits.get(idx + 1);
break;
}
}
let subject_commit = repository.find_commit(subject_commit_oid)?;
if let Some(old_oid) = old_oid {
let old_commit = repository.find_commit(*old_oid)?;
branch.replace_head(ctx, &old_commit, &subject_commit)?;
}
branch.replace_head(ctx, &subject_commit, &subject_commit.parent(0)?)?;
branch.set_stack_head(ctx, head, Some(tree))?;
checkout_branch_trees(ctx, perm)?;
@ -76,6 +95,7 @@ pub(crate) fn reorder_commit(
struct ReorderResult {
tree: git2::Oid,
head: git2::Oid,
reordered_commits: Vec<git2::Oid>,
}
/// Commit reordering implemented with libgit2 primatives
@ -112,6 +132,7 @@ fn inner_reorder_commit(
return Ok(ReorderResult {
tree: branch_tree.id(),
head: branch_commits[0],
reordered_commits: vec![],
});
};
@ -139,6 +160,7 @@ fn inner_reorder_commit(
Ok(ReorderResult {
head: new_head_oid,
tree: new_tree_oid,
reordered_commits,
})
}