Adds 'Open All Changes with Common Base' command to branches

Changes "Common (Merge) Base" to "Common Base"

Author: eamodio

CHANGELOG.md

@@ -9,7 +9,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ### Added
 
 - Adds support for Anthropic's Claude 3 Opus & Sonnet models for GitLens' experimental AI features
-- Adds a _Compare with Common (Merge) Base_ command to branches in the _Commit Graph_ and views to review the changes if the selected branch were to be merged by comparing the common ancestor (merge base) with the current branch to the selected branch
+- Adds a _Compare with Common Base_ command to branches in the _Commit Graph_ and views to review the changes if the selected branch were to be merged by comparing the common ancestor (merge base) with the current branch to the selected branch
+- Adds an _Open All Changes with Common Base_ command to branches in the _Commit Graph_ and views to review the changes if the selected branch were to be merged in the multi-diff editor
 - Adds a _Stash All Changes_ command to Source Control repository toolbar (off by default)
 - Adds the repository name as a prefix to worktree name when adding to the current workspace
 - Adds a better message when stashing only untracked files without including untracked files
@@ -18,7 +19,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Re-adds _Add to Workspace_ option when creating a worktree — closes [#3160](https://github.com/gitkraken/vscode-gitlens/issues/3160)
 - Changes _Commit Graph_ date style to default to the default date style — refs [#3153](https://github.com/gitkraken/vscode-gitlens/issues/3153)
-- Renames the _Compare Ancestry with Working Tree_ command on branches to _Compare Common (Merge) Base with Working Tree_ for better clarity
+- Renames the _Compare Ancestry with Working Tree_ command on branches to _Compare Common Base with Working Tree_ for better clarity
 - Improves _File Blame_ annotations performance and layout accuracy with certain character sets
 - Improves string formatting performance
 
@@ -28,7 +29,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Fixes [#3152](https://github.com/gitkraken/vscode-gitlens/issues/3152) - Fixes double encoding of redirect URLs during account sign-in which affects certain environments
 - Fixes [#3153](https://github.com/gitkraken/vscode-gitlens/issues/3153) - `gitlens.defaultDateStyle` not working in Commit Details view
 - Fixes the _Open Pull Request Changes_ & _Compare Pull Request_ commands to scope the changes only to the pull request
-- Fixes broken _Compare Common (Merge) Base with Working Tree_ (previously _Compare Ancestry with Working Tree_)
+- Fixes broken _Compare Common Base with Working Tree_ (previously _Compare Ancestry with Working Tree_)
 - Fixes issue when switching to a worktree via branch switch when there are multiple repos in the workspace
 
 ## [14.8.2] - 2024-02-16

package.json

@@ -6747,12 +6747,18 @@
 			},
 			{
 				"command": "gitlens.views.compareAncestryWithWorking",
-				"title": "Compare Common (Merge) Base with Working Tree",
+				"title": "Compare Common Base with Working Tree",
 				"category": "GitLens"
 			},
 			{
 				"command": "gitlens.views.compareWithMergeBase",
-				"title": "Compare with Common (Merge) Base",
+				"title": "Compare with Common Base",
+				"category": "GitLens"
+			},
+			{
+				"command": "gitlens.views.openChangedFileDiffsWithMergeBase",
+				"title": "Open All Changes with Common Base",
+				"icon": "$(diff-multiple)",
 				"category": "GitLens"
 			},
 			{
@@ -8408,12 +8414,18 @@
 			},
 			{
 				"command": "gitlens.graph.compareAncestryWithWorking",
-				"title": "Compare Common (Merge) Base with Working Tree",
+				"title": "Compare Common Base with Working Tree",
 				"category": "GitLens"
 			},
 			{
 				"command": "gitlens.graph.compareWithMergeBase",
-				"title": "Compare with Common (Merge) Base",
+				"title": "Compare with Common Base",
+				"category": "GitLens"
+			},
+			{
+				"command": "gitlens.graph.openChangedFileDiffsWithMergeBase",
+				"title": "Open All Changes with Common Base",
+				"icon": "$(diff-multiple)",
 				"category": "GitLens"
 			},
 			{
@@ -10056,6 +10068,10 @@
 					"command": "gitlens.views.compareWithMergeBase",
 					"when": "false"
 				},
+				{
+					"command": "gitlens.views.openChangedFileDiffsWithMergeBase",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.views.compareWithHead",
 					"when": "false"
@@ -11204,6 +11220,10 @@
 					"command": "gitlens.graph.compareWithMergeBase",
 					"when": "false"
 				},
+				{
+					"command": "gitlens.graph.openChangedFileDiffsWithMergeBase",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.graph.compareWithHead",
 					"when": "false"
@@ -12963,10 +12983,15 @@
 					"group": "2_gitlens_quickopen@1",
 					"alt": "gitlens.copyRemoteBranchUrl"
 				},
+				{
+					"command": "gitlens.views.openChangedFileDiffsWithMergeBase",
+					"when": "!gitlens:hasVirtualFolders && viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/",
+					"group": "3_gitlens_explore@11"
+				},
 				{
 					"command": "gitlens.views.openDirectoryDiffWithWorking",
 					"when": "!gitlens:hasVirtualFolders && viewItem =~ /gitlens:(branch|tag)\\b/",
-					"group": "3_gitlens_explore@11"
+					"group": "3_gitlens_explore@12"
 				},
 				{
 					"command": "gitlens.views.compareWithUpstream",
@@ -14584,6 +14609,11 @@
 					"when": "webviewItem =~ /gitlens:upstreamStatus\\b/",
 					"group": "1_gitlens_actions@3"
 				},
+				{
+					"command": "gitlens.graph.openChangedFileDiffsWithMergeBase",
+					"when": "!gitlens:hasVirtualFolders && webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/",
+					"group": "3_gitlens_explore@11"
+				},
 				{
 					"command": "gitlens.graph.compareWithUpstream",
 					"when": "!gitlens:hasVirtualFolders && webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+tracking\\b)/",

src/plus/webviews/graph/graphWebview.ts

@@ -463,6 +463,11 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 			this.host.registerWebviewCommand('gitlens.graph.openPullRequestComparison', this.openPullRequestComparison),
 			this.host.registerWebviewCommand('gitlens.graph.openPullRequestOnRemote', this.openPullRequestOnRemote),
 
+			this.host.registerWebviewCommand(
+				'gitlens.graph.openChangedFileDiffsWithMergeBase',
+				this.openChangedFileDiffsWithMergeBase,
+			),
+
 			this.host.registerWebviewCommand('gitlens.graph.compareWithUpstream', this.compareWithUpstream),
 			this.host.registerWebviewCommand('gitlens.graph.compareWithHead', this.compareHeadWith),
 			this.host.registerWebviewCommand('gitlens.graph.compareWithWorking', this.compareWorkingWith),
@@ -2780,6 +2785,28 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 		});
 	}
 
+	@debug()
+	private async openChangedFileDiffsWithMergeBase(item?: GraphItemContext) {
+		const ref = this.getGraphItemRef(item);
+		if (ref == null) return Promise.resolve();
+
+		const branch = await this.container.git.getBranch(ref.repoPath);
+		if (branch == null) return undefined;
+
+		const commonAncestor = await this.container.git.getMergeBase(ref.repoPath, branch.ref, ref.ref);
+		if (commonAncestor == null) return undefined;
+
+		return openComparisonChanges(
+			this.container,
+			{ repoPath: ref.repoPath, lhs: commonAncestor, rhs: ref.ref },
+			{
+				title: `Changes between ${branch.ref} (${shortenRevision(commonAncestor)}) ${
+					GlyphChars.ArrowLeftRightLong
+				} ${shortenRevision(ref.ref, { strings: { working: 'Working Tree' } })}`,
+			},
+		);
+	}
+
 	@debug()
 	private compareWithUpstream(item?: GraphItemContext) {
 		if (isGraphItemRefContext(item, 'branch')) {

src/views/viewCommands.ts

@@ -6,7 +6,7 @@ import type { DiffWithPreviousCommandArgs } from '../commands/diffWithPrevious';
 import type { DiffWithWorkingCommandArgs } from '../commands/diffWithWorking';
 import type { OpenFileAtRevisionCommandArgs } from '../commands/openFileAtRevision';
 import type { ViewShowBranchComparison } from '../config';
-import { Commands } from '../constants';
+import { Commands, GlyphChars } from '../constants';
 import type { Container } from '../container';
 import { browseAtRevision } from '../git/actions';
 import * as BranchActions from '../git/actions/branch';
@@ -253,6 +253,12 @@ export class ViewCommands {
 		registerViewCommand('gitlens.views.unstageDirectory', this.unstageDirectory, this);
 		registerViewCommand('gitlens.views.unstageFile', this.unstageFile, this);
 
+		registerViewCommand(
+			'gitlens.views.openChangedFileDiffsWithMergeBase',
+			this.openChangedFileDiffsWithMergeBase,
+			this,
+		);
+
 		registerViewCommand('gitlens.views.compareAncestryWithWorking', this.compareAncestryWithWorking, this);
 		registerViewCommand('gitlens.views.compareWithHead', this.compareHeadWith, this);
 		registerViewCommand('gitlens.views.compareWithMergeBase', this.compareWithMergeBase, this);
@@ -947,6 +953,27 @@ export class ViewCommands {
 		});
 	}
 
+	@log()
+	private async openChangedFileDiffsWithMergeBase(node: BranchNode) {
+		if (!node.is('branch')) return Promise.resolve();
+
+		const branch = await this.container.git.getBranch(node.repoPath);
+		if (branch == null) return undefined;
+
+		const commonAncestor = await this.container.git.getMergeBase(node.repoPath, branch.ref, node.ref.ref);
+		if (commonAncestor == null) return undefined;
+
+		return CommitActions.openComparisonChanges(
+			this.container,
+			{ repoPath: node.repoPath, lhs: commonAncestor, rhs: node.ref.ref },
+			{
+				title: `Changes between ${branch.ref} (${shortenRevision(commonAncestor)}) ${
+					GlyphChars.ArrowLeftRightLong
+				} ${shortenRevision(node.ref.ref, { strings: { working: 'Working Tree' } })}`,
+			},
+		);
+	}
+
 	@log()
 	private compareWithUpstream(node: BranchNode) {
 		if (!node.is('branch') || node.branch.upstream == null) return Promise.resolve();