Implements push and adds checkout backup for delete

Author: axosoft-ramint

src/webviews/apps/plus/home/components/merge-target-status.ts

@@ -1,5 +1,6 @@
 import { css, html, LitElement, nothing } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
+import { merge } from '../../../../../git/actions/repository';
 import { createCommandLink } from '../../../../../system/commands';
 import { pluralize } from '../../../../../system/string';
 import type { BranchAndTargetRefs, BranchRef, GetOverviewBranch } from '../../../../home/protocol';
@@ -287,6 +288,11 @@ export class GlMergeTargetStatus extends LitElement {
 
 		if (this.mergedStatus?.merged) {
 			if (this.mergedStatus.localBranchOnly) {
+				const mergeTargetRef = {
+					repoPath: this.branch.repoPath,
+					branchId: this.mergedStatus.localBranchOnly.id!,
+					branchName: this.mergedStatus.localBranchOnly.name,
+				};
 				return html`<div class="header">
 						<span class="header__title"
 							><code-icon icon="git-merge"></code-icon> Branch
@@ -304,17 +310,19 @@ export class GlMergeTargetStatus extends LitElement {
 						<div class="button-container">
 							<gl-button
 								full
-								href="${createCommandLink('gitlens.home.pushBranch', {
-									repoPath: this.branch.repoPath,
-									branchId: this.mergedStatus.localBranchOnly.id!,
-									branchName: this.mergedStatus.localBranchOnly.name,
-								} satisfies BranchRef)}"
+								href="${createCommandLink(
+									'gitlens.home.pushBranch',
+									mergeTargetRef satisfies BranchRef,
+								)}"
 								>Push ${renderBranchName(this.mergedStatus.localBranchOnly.name)}</gl-button
 							>
 							<gl-button
 								full
 								appearance="secondary"
-								href="${createCommandLink('gitlens.home.deleteBranchOrWorktree', this.branchRef)}"
+								href="${createCommandLink('gitlens.home.deleteBranchOrWorktree', [
+									this.branchRef,
+									mergeTargetRef,
+								])}"
 								>Delete ${this.branch.worktree ? 'Worktree' : 'Branch'}
 								${renderBranchName(this.branch.name, this.branch.worktree != null)}</gl-button
 							>

src/webviews/home/homeWebview.ts

@@ -1187,10 +1187,15 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 		});
 	}
 
-	private deleteBranchOrWorktree(ref: BranchRef) {
+	private async deleteBranchOrWorktree(ref: BranchRef, mergeTarget?: BranchRef) {
 		const repo = this._repositoryBranches.get(ref.repoPath);
 		const branch = repo?.branches.find(b => b.id === ref.branchId);
 		if (branch == null) return;
+		if (branch.current) {
+			if (mergeTarget != null) {
+				await this.container.git.checkout(ref.repoPath, mergeTarget.branchName);
+			}
+		}
 
 		void executeGitCommand({
 			command: 'branch',
@@ -1202,8 +1207,16 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 		});
 	}
 
-	private pushBranch(_ref: BranchRef) {
-		// TODO
+	private pushBranch(ref: BranchRef) {
+		void this.container.git.push(ref.repoPath, {
+			reference: {
+				name: ref.branchName,
+				ref: ref.branchId,
+				refType: 'branch',
+				remote: false,
+				repoPath: ref.repoPath,
+			},
+		});
 	}
 
 	private mergeTargetCompare(ref: BranchAndTargetRefs) {