Adds merge detect actions & squash merge detect (wip)

Author: eamodio

src/constants.commands.ts

@@ -148,6 +148,8 @@ type InternalGraphWebviewCommands =
 	| 'gitlens.graph.skipPausedOperation';
 
 type InternalHomeWebviewCommands =
+	| 'gitlens.home.deleteBranchOrWorktree'
+	| 'gitlens.home.pushBranch'
 	| 'gitlens.home.openMergeTargetComparison'
 	| 'gitlens.home.openPullRequestChanges'
 	| 'gitlens.home.openPullRequestComparison'

src/env/node/git/sub-providers/branches.ts

@@ -394,12 +394,33 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 			} catch {}
 
 			// Cherry-pick detection (handles cherry-picks, rebases, etc)
-			const data = await this.git.exec({ cwd: repoPath }, 'cherry', '--abbrev', '-v', into.name, branch.name);
+			let data = await this.git.exec({ cwd: repoPath }, 'cherry', '--abbrev', '-v', into.name, branch.name);
 			// Check if there are no lines or all lines startwith a `-` (i.e. likely merged)
 			if (!data || data.split('\n').every(l => l.startsWith('-'))) {
 				return { merged: true, confidence: 'high' };
 			}
 
+			// Attempt to detect squash merges by checking if the diff of the branch can be cleanly removed from the target
+			const mergeBase = await this.getMergeBase(repoPath, into.name, branch.name);
+			data = await this.git.exec<string>({ cwd: repoPath }, 'diff', mergeBase, branch.name);
+			if (data?.length) {
+				// Create a temporary index file
+				await using disposableIndex = await this.provider.staging!.createTemporaryIndex(repoPath, into.name);
+				const { env } = disposableIndex;
+
+				data = await this.git.exec<string>(
+					{ cwd: repoPath, env: env, stdin: data },
+					'apply',
+					'--cached',
+					'--reverse',
+					'--check',
+					'-',
+				);
+				if (!data?.trim().length) {
+					return { merged: true, confidence: 'medium' };
+				}
+			}
+
 			return { merged: false };
 		} catch (ex) {
 			Logger.error(ex, scope);

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

@@ -301,6 +301,24 @@ export class GlMergeTargetStatus extends LitElement {
 							${this.mergedStatus.confidence !== 'highest' ? 'likely ' : ''}been merged into its merge
 							target's local branch ${renderBranchName(this.mergedStatus.localBranchOnly.name)}.
 						</p>
+						<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)}"
+								>Push ${renderBranchName(this.mergedStatus.localBranchOnly.name)}</gl-button
+							>
+							<gl-button
+								full
+								appearance="secondary"
+								href="${createCommandLink('gitlens.home.deleteBranchOrWorktree', this.branchRef)}"
+								>Delete ${this.branch.worktree ? 'Worktree' : 'Branch'}
+								${renderBranchName(this.branch.name, this.branch.worktree != null)}</gl-button
+							>
+						</div>
 					</div>`;
 			}
 
@@ -318,6 +336,14 @@ export class GlMergeTargetStatus extends LitElement {
 						${this.mergedStatus.confidence !== 'highest' ? 'likely ' : ''}been merged into its merge target
 						${target}.
 					</p>
+					<div class="button-container">
+						<gl-button
+							full
+							href="${createCommandLink('gitlens.home.deleteBranchOrWorktree', this.branchRef)}"
+							>Delete ${this.branch.worktree ? 'Worktree' : 'Branch'}
+							${renderBranchName(this.branch.name, this.branch.worktree != null)}</gl-button
+						>
+					</div>
 				</div>`;
 		}
 

src/webviews/home/homeWebview.ts

@@ -321,6 +321,8 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 				(src?: Source) => this.container.subscription.validate({ force: true }, src),
 				this,
 			),
+			registerCommand('gitlens.home.deleteBranchOrWorktree', this.deleteBranchOrWorktree, this),
+			registerCommand('gitlens.home.pushBranch', this.pushBranch, this),
 			registerCommand('gitlens.home.openMergeTargetComparison', this.mergeTargetCompare, this),
 			registerCommand('gitlens.home.openPullRequestChanges', this.pullRequestChanges, this),
 			registerCommand('gitlens.home.openPullRequestComparison', this.pullRequestCompare, this),
@@ -1185,6 +1187,25 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 		});
 	}
 
+	private deleteBranchOrWorktree(ref: BranchRef) {
+		const repo = this._repositoryBranches.get(ref.repoPath);
+		const branch = repo?.branches.find(b => b.id === ref.branchId);
+		if (branch == null) return;
+
+		void executeGitCommand({
+			command: 'branch',
+			state: {
+				subcommand: 'delete',
+				repo: ref.repoPath,
+				references: branch,
+			},
+		});
+	}
+
+	private pushBranch(_ref: BranchRef) {
+		// TODO
+	}
+
 	private mergeTargetCompare(ref: BranchAndTargetRefs) {
 		return this.container.views.searchAndCompare.compare(ref.repoPath, ref.branchName, ref.mergeTargetName);
 	}