Adds compare w/ common base to results files

Author: eamodio

contributions.json

@@ -7829,6 +7829,18 @@
 				]
 			}
 		},
+		"gitlens.views.openChangesWithMergeBase": {
+			"label": "Open Changes with Common Base",
+			"menus": {
+				"gitlens/commit/file/changes": [
+					{
+						"when": "viewItem =~ /gitlens:file:results\\b/",
+						"group": "1_gitlens",
+						"order": 2
+					}
+				]
+			}
+		},
 		"gitlens.views.openChangesWithWorking": {
 			"label": "Open Changes with Working File",
 			"icon": "$(gitlens-compare-ref-working)",

package.json

@@ -8574,6 +8574,10 @@
 				"title": "Open Changes",
 				"icon": "$(compare-changes)"
 			},
+			{
+				"command": "gitlens.views.openChangesWithMergeBase",
+				"title": "Open Changes with Common Base"
+			},
 			{
 				"command": "gitlens.views.openChangesWithWorking",
 				"title": "Open Changes with Working File",
@@ -12310,6 +12314,10 @@
 					"command": "gitlens.views.openChanges",
 					"when": "false"
 				},
+				{
+					"command": "gitlens.views.openChangesWithMergeBase",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.views.openChangesWithWorking",
 					"when": "false"
@@ -13823,6 +13831,11 @@
 					"command": "gitlens.views.highlightRevisionChanges",
 					"when": "viewItem =~ /gitlens:file\\b((?=.*?\\b\\+committed\\b)|:results)/",
 					"group": "2_gitlens@2"
+				},
+				{
+					"command": "gitlens.views.openChangesWithMergeBase",
+					"when": "viewItem =~ /gitlens:file:results\\b/",
+					"group": "1_gitlens@2"
 				}
 			],
 			"gitlens/commit/file/commit": [

src/constants.commands.generated.ts

@@ -343,6 +343,7 @@ export type ContributedCommands =
 	| 'gitlens.views.openChangedFileRevisions'
 	| 'gitlens.views.openChangedFiles'
 	| 'gitlens.views.openChanges'
+	| 'gitlens.views.openChangesWithMergeBase'
 	| 'gitlens.views.openChangesWithWorking'
 	| 'gitlens.views.openCommitOnRemote'
 	| 'gitlens.views.openCommitOnRemote.multi'

src/views/viewCommands.ts

@@ -56,6 +56,7 @@ import { log } from '../system/decorators/log';
 import { partial, runSequentially } from '../system/function';
 import { join, map } from '../system/iterable';
 import { lazy } from '../system/lazy';
+import { basename } from '../system/path';
 import { DeepLinkActionType } from '../uris/deepLinks/deepLink';
 import type { LaunchpadItemNode } from './launchpadView';
 import type { RepositoryFolderNode } from './nodes/abstract/repositoryFolderNode';
@@ -278,6 +279,7 @@ export class ViewCommands implements Disposable {
 			),
 
 			registerViewCommand('gitlens.views.openChanges', this.openChanges, this),
+			registerViewCommand('gitlens.views.openChangesWithMergeBase', this.openChangesWithMergeBase, this),
 			registerViewCommand('gitlens.views.openChangesWithWorking', this.openChangesWithWorking, this),
 			registerViewCommand(
 				'gitlens.views.openPreviousChangesWithWorking',
@@ -1536,6 +1538,24 @@ export class ViewCommands implements Disposable {
 		return CommitActions.openCommitChangesWithWorking(this.container, node.commit, individually, options);
 	}
 
+	@log()
+	private async openChangesWithMergeBase(node: ResultsFileNode) {
+		if (!node.is('results-file')) return Promise.resolve();
+
+		const mergeBase = await this.container.git.refs(node.repoPath).getMergeBase(node.ref1, node.ref2 || 'HEAD');
+		if (mergeBase == null) return Promise.resolve();
+
+		return CommitActions.openChanges(
+			node.file,
+			{ repoPath: node.repoPath, lhs: mergeBase, rhs: node.ref1 },
+			{
+				preserveFocus: true,
+				preview: true,
+				lhsTitle: `${basename(node.uri.fsPath)} (Base)`,
+			},
+		);
+	}
+
 	@log()
 	private async openChangesWithWorking(node: ViewRefFileNode | MergeConflictFileNode | StatusFileNode) {
 		if (node.is('status-file')) {