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

applying a branch should use cherry rebase

Browse Source
This commit is contained in:
Kiril Videlov 2024-06-03 11:59:42 +02:00
parent 80bfaf0ca8
commit 3d925d9c53
2 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/gitbutler-core/src/virtual_branches/errors.rs
View File

@ -11,6 +11,8 @@ pub enum Marker {
///
/// See usages for details on what these conflicts can be.
ProjectConflict,
/// An indicator that a branch conflicted during applying to the workspace.
BranchConflict,
}
impl std::fmt::Display for Marker {
@ -18,6 +20,7 @@ impl std::fmt::Display for Marker {
match self {
Marker::VerificationFailure => f.write_str("<verification-failed>"),
Marker::ProjectConflict => f.write_str("<project-conflict>"),
Marker::BranchConflict => f.write_str("<branch-conflict>"),
}
}
}

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

@ -345,49 +345,37 @@ pub fn apply_branch(
// ok, update the virtual branch
branch.head = new_branch_head.into();
} else {
// branch was not pushed to upstream yet. attempt a rebase,
let (_, committer) =
project_repository::signatures::signatures(project_repository, user)
.context("failed to get signatures")?;
let mut rebase_options = git2::RebaseOptions::new();
rebase_options.quiet(true);
rebase_options.inmemory(true);
let mut rebase = repo
.rebase(
Some(branch.head),
Some(target_commit.id().into()),
None,
Some(&mut rebase_options),
)
.context("failed to rebase")?;
let rebase = cherry_rebase(
project_repository,
target_commit.id().into(),
target_commit.id().into(),
branch.head,
);
let mut rebase_success = true;
// check to see if these commits have already been pushed
let mut last_rebase_head = branch.head;
while rebase.next().is_some() {
let index = rebase
.inmemory_index()
.context("failed to get inmemory index")?;
if index.has_conflicts() {
rebase_success = false;
break;
match rebase {
Ok(rebase_oid) => {
if let Some(oid) = rebase_oid {
last_rebase_head = oid;
}
if let Ok(commit_id) = rebase.commit(None, &committer.clone(), None) {
last_rebase_head = commit_id.into();
} else {
}
Err(err)
if err
.downcast_ref()
.map_or(false, |marker: &Marker| *marker == Marker::ProjectConflict) =>
{
rebase_success = false;
break;
}
Err(err) => {
return Err(err).context("failed to apply branch");
}
}
if rebase_success {
// rebase worked out, rewrite the branch head
rebase.finish(None).context("failed to finish rebase")?;
branch.head = last_rebase_head;
} else {
// rebase failed, do a merge commit
rebase.abort().context("failed to abort rebase")?;
// get tree from merge_tree_oid
let merge_tree = repo
@ -3253,7 +3241,7 @@ fn cherry_rebase_group(
.context("failed to cherry pick")?;
if cherrypick_index.has_conflicts() {
bail!("failed to rebase");
return Err(anyhow!("failed to rebase")).context(Marker::BranchConflict);
}
let merge_tree_oid = cherrypick_index