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

Use new integrate upstream in stacked up

Browse Source
This commit is contained in:
Kiril Videlov 2024-10-16 12:22:14 +02:00
parent b6ec442a4a
commit a2506177f1
No known key found for this signature in database
GPG Key ID: A4C733025427C471
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/desktop/src/lib/commit/StackingCommitList.svelte
View File

@ -24,6 +24,7 @@
interface Props {
remoteOnlyPatches: DetailedCommit[];
patches: DetailedCommit[];
seriesName: string;
isUnapplied: boolean;
pushButton?: Snippet<[{ disabled: boolean }]>;
localCommitsConflicted: boolean;
@ -34,6 +35,7 @@
const {
remoteOnlyPatches,
patches,
seriesName,
isUnapplied,
pushButton,
localAndRemoteCommitsConflicted,
@ -117,7 +119,7 @@
onclick={async () => {
isIntegratingCommits = true;
try {
await branchController.mergeUpstream($branch.id);
await branchController.mergeUpstreamForSeries($branch.id, seriesName);
} catch (e) {
console.error(e);
} finally {

1
apps/desktop/src/lib/stack/StackSeries.svelte
View File

@ -37,6 +37,7 @@
<StackingCommitList
remoteOnlyPatches={currentSeries.upstreamPatches}
patches={currentSeries.patches}
seriesName={currentSeries.name}
isUnapplied={false}
isBottom={idx === branch.series.length - 1}
{reorderDropzoneManager}

12
apps/desktop/src/lib/vbranches/branchController.ts
View File

@ -87,6 +87,18 @@ export class BranchController {
}
}
async mergeUpstreamForSeries(branch: string, seriesName: string) {
try {
await invoke<void>('integrate_upstream_commits', {
projectId: this.projectId,
branch,
seriesName
});
} catch (err) {
showError('Failed to merge upstream branch', err);
}
}
async updateBranchName(branchId: string, name: string) {
try {
await invoke<void>('update_virtual_branch', {

33
crates/gitbutler-branch-actions/src/branch_upstream_integration.rs
View File

@ -23,7 +23,7 @@ pub fn integrate_upstream_commits_for_series(
) -> Result<()> {
conflicts::is_conflicting(ctx, None)?;
let repository = ctx.repository();
let repo = ctx.repository();
let vb_state = ctx.project().virtual_branches();
let branch = vb_state.get_branch_in_workspace(branch_id)?;
@ -39,16 +39,9 @@ pub fn integrate_upstream_commits_for_series(
.find(|series| series.head.name == series_name)
.ok_or(anyhow!("Series not found"))?;
let upstream_reference = series.head.remote_reference(remote.as_str())?;
let remote_head = ctx
.repository()
.find_reference(&upstream_reference)?
.peel_to_commit()?;
let stack_merge_base = ctx
.repository()
.merge_base(branch.head(), default_target.sha)?;
let upstream_to_local_merge_base = ctx
.repository()
.merge_base(branch.head(), remote_head.id())?;
let remote_head = repo.find_reference(&upstream_reference)?.peel_to_commit()?;
let stack_merge_base = repo.merge_base(branch.head(), default_target.sha)?;
let upstream_to_local_merge_base = repo.merge_base(branch.head(), remote_head.id())?;
// Rebasing will be performed if configured.
// If the series to integrate is not the latest one, it will also do a rebase.
@ -61,7 +54,7 @@ pub fn integrate_upstream_commits_for_series(
for id in series.upstream_only_commits.iter() {
let commit = commit_by_oid_or_change_id(
id,
ctx,
repo,
remote_head.id(),
upstream_to_local_merge_base,
)?;
@ -70,12 +63,12 @@ pub fn integrate_upstream_commits_for_series(
}
// now add the existing local commits to the rebase list
for id in series.local_commits.iter() {
let commit = commit_by_oid_or_change_id(id, ctx, branch.head(), stack_merge_base)?;
let commit = commit_by_oid_or_change_id(id, repo, branch.head(), stack_merge_base)?;
ordered_commits_to_rebase.push(commit.id());
}
}
cherry_rebase_group(
repository,
repo,
upstream_to_local_merge_base,
&ordered_commits_to_rebase,
)?
@ -83,12 +76,12 @@ pub fn integrate_upstream_commits_for_series(
// If rebase is not allowed AND this is the latest series - create a merge commit on top
let series_head_commit = commit_by_oid_or_change_id(
&series.head.target,
ctx,
repo,
branch.head(),
upstream_to_local_merge_base,
)?;
let merge_commit = gitbutler_merge_commits(
repository,
repo,
series_head_commit,
remote_head.clone(),
&series.head.name, // for error messages only
@ -101,12 +94,8 @@ pub fn integrate_upstream_commits_for_series(
};
// Find what the new head and branch tree should be
let BranchHeadAndTree { head, tree } = compute_updated_branch_head_for_commits(
repository,
branch.head(),
branch.tree,
new_stack_head,
)?;
let BranchHeadAndTree { head, tree } =
compute_updated_branch_head_for_commits(repo, branch.head(), branch.tree, new_stack_head)?;
let mut branch = branch.clone();