Passes upstream name for push and recognizes default worktree

Author: axosoft-ramint

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

@@ -1,6 +1,5 @@
 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';
@@ -292,6 +291,7 @@ export class GlMergeTargetStatus extends LitElement {
 					repoPath: this.branch.repoPath,
 					branchId: this.mergedStatus.localBranchOnly.id!,
 					branchName: this.mergedStatus.localBranchOnly.name,
+					branchUpstreamName: this.mergedStatus.localBranchOnly.upstream?.name,
 				};
 				return html`<div class="header">
 						<span class="header__title"
@@ -323,7 +323,10 @@ export class GlMergeTargetStatus extends LitElement {
 									this.branchRef,
 									mergeTargetRef,
 								])}"
-								>Delete ${this.branch.worktree ? 'Worktree' : 'Branch'}
+								>Delete
+								${this.branch.worktree != null && !this.branch.worktree.isDefault
+									? 'Worktree'
+									: 'Branch'}
 								${renderBranchName(this.branch.name, this.branch.worktree != null)}</gl-button
 							>
 						</div>
@@ -348,7 +351,8 @@ export class GlMergeTargetStatus extends LitElement {
 						<gl-button
 							full
 							href="${createCommandLink('gitlens.home.deleteBranchOrWorktree', this.branchRef)}"
-							>Delete ${this.branch.worktree ? 'Worktree' : 'Branch'}
+							>Delete
+							${this.branch.worktree != null && !this.branch.worktree.isDefault ? 'Worktree' : 'Branch'}
 							${renderBranchName(this.branch.name, this.branch.worktree != null)}</gl-button
 						>
 					</div>

src/webviews/home/homeWebview.ts

@@ -1193,6 +1193,12 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 				refType: 'branch',
 				remote: false,
 				repoPath: ref.repoPath,
+				upstream: ref.branchUpstreamName
+					? {
+							name: ref.branchUpstreamName,
+							missing: false,
+					  }
+					: undefined,
 			},
 		});
 	}
@@ -1432,7 +1438,7 @@ function getOverviewBranchesCore(
 			state: branch.state,
 			status: branch.status,
 			upstream: branch.upstream,
-			worktree: wt ? { name: wt.name, uri: wt.uri.toString() } : undefined,
+			worktree: wt ? { name: wt.name, uri: wt.uri.toString(), isDefault: wt.isDefault } : undefined,
 		});
 	}
 

src/webviews/home/protocol.ts

@@ -182,6 +182,7 @@ export interface GetOverviewBranch {
 	worktree?: {
 		name: string;
 		uri: string;
+		isDefault: boolean;
 	};
 }
 
@@ -321,6 +322,7 @@ export interface BranchRef {
 	repoPath: string;
 	branchId: string;
 	branchName: string;
+	branchUpstreamName?: string;
 }
 
 export interface BranchAndTargetRefs extends BranchRef {