Adds "merge changes" to files

Author: eamodio

contributions.json

@@ -7683,6 +7683,23 @@
 				]
 			}
 		},
+		"gitlens.views.mergeChangesWithWorking": {
+			"label": "Merge Changes (Manually)...",
+			"menus": {
+				"view/item/context": [
+					{
+						"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+stashed\\b)/ && !listMultiSelection",
+						"group": "1_gitlens_actions",
+						"order": 2
+					},
+					{
+						"when": "viewItem =~ /gitlens:file\\b((?=.*?\\b\\+committed\\b)|:results\\b)/ && !listMultiSelection",
+						"group": "8_gitlens_actions",
+						"order": 2
+					}
+				]
+			}
+		},
 		"gitlens.views.openBranchOnRemote": {
 			"label": "Open Branch on Remote",
 			"icon": "$(globe)",
@@ -9538,12 +9555,12 @@
 					{
 						"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+stashed\\b)/ && !listMultiSelection && !gitlens:hasVirtualFolders && !gitlens:readonly && !gitlens:untrusted",
 						"group": "1_gitlens_actions",
-						"order": 2
+						"order": 3
 					},
 					{
 						"when": "viewItem =~ /gitlens:file\\b((?=.*?\\b\\+committed\\b)|:results\\b)/ && !listMultiSelection && !gitlens:hasVirtualFolders && !gitlens:readonly && !gitlens:untrusted",
 						"group": "8_gitlens_actions",
-						"order": 2
+						"order": 3
 					}
 				]
 			}

package.json

@@ -8528,6 +8528,10 @@
 				"title": "Merge Branch into Current Branch...",
 				"enablement": "!operationInProgress"
 			},
+			{
+				"command": "gitlens.views.mergeChangesWithWorking",
+				"title": "Merge Changes (Manually)..."
+			},
 			{
 				"command": "gitlens.views.openBranchOnRemote",
 				"title": "Open Branch on Remote",
@@ -12274,6 +12278,10 @@
 					"command": "gitlens.views.mergeBranchInto",
 					"when": "false"
 				},
+				{
+					"command": "gitlens.views.mergeChangesWithWorking",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.views.openBranchOnRemote",
 					"when": "false"
@@ -16791,10 +16799,15 @@
 					"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+(un)?staged\\b)/ && !listMultiSelection && !gitlens:hasVirtualFolders && !gitlens:readonly && !gitlens:untrusted",
 					"group": "1_gitlens_actions@2"
 				},
+				{
+					"command": "gitlens.views.mergeChangesWithWorking",
+					"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+stashed\\b)/ && !listMultiSelection",
+					"group": "1_gitlens_actions@2"
+				},
 				{
 					"command": "gitlens.views.restore",
 					"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+stashed\\b)/ && !listMultiSelection && !gitlens:hasVirtualFolders && !gitlens:readonly && !gitlens:untrusted",
-					"group": "1_gitlens_actions@2"
+					"group": "1_gitlens_actions@3"
 				},
 				{
 					"command": "gitlens.views.openChanges",
@@ -16882,10 +16895,15 @@
 					"when": "viewItem =~ /gitlens:file\\b((?=.*?\\b\\+committed\\b)|:results\\b)/ && !listMultiSelection && !gitlens:hasVirtualFolders && !gitlens:readonly && !gitlens:untrusted",
 					"group": "8_gitlens_actions@1"
 				},
+				{
+					"command": "gitlens.views.mergeChangesWithWorking",
+					"when": "viewItem =~ /gitlens:file\\b((?=.*?\\b\\+committed\\b)|:results\\b)/ && !listMultiSelection",
+					"group": "8_gitlens_actions@2"
+				},
 				{
 					"command": "gitlens.views.restore",
 					"when": "viewItem =~ /gitlens:file\\b((?=.*?\\b\\+committed\\b)|:results\\b)/ && !listMultiSelection && !gitlens:hasVirtualFolders && !gitlens:readonly && !gitlens:untrusted",
-					"group": "8_gitlens_actions@2"
+					"group": "8_gitlens_actions@3"
 				},
 				{
 					"command": "gitlens.views.stageDirectory",

src/constants.commands.generated.ts

@@ -333,6 +333,7 @@ export type ContributedCommands =
 	| 'gitlens.views.loadAllChildren'
 	| 'gitlens.views.loadMoreChildren'
 	| 'gitlens.views.mergeBranchInto'
+	| 'gitlens.views.mergeChangesWithWorking'
 	| 'gitlens.views.openBranchOnRemote'
 	| 'gitlens.views.openBranchOnRemote.multi'
 	| 'gitlens.views.openChangedFileDiffs'

src/constants.commands.ts

@@ -233,6 +233,7 @@ export type GlCommands = ContributedCommands | InternalGlCommands | GlCommandsDe
 export type GlPaletteCommands = ContributedPaletteCommands;
 
 export type CoreCommands =
+	| '_open.mergeEditor'
 	| 'cursorMove'
 	| 'editor.action.showHover'
 	| 'editor.action.showReferences'

src/system/-webview/vscode.ts

@@ -368,6 +368,39 @@ export async function openDiffEditor(
 	}
 }
 
+type MergeEditorInputData = { uri: Uri; title?: string; detail?: string; description?: string };
+export type MergeEditorInputs = {
+	base: Uri;
+	input1: MergeEditorInputData;
+	input2: MergeEditorInputData;
+	output: Uri;
+};
+
+export async function openMergeEditor(
+	inputs: MergeEditorInputs,
+	options?: TextDocumentShowOptions & { sourceViewColumn?: ViewColumn },
+): Promise<void> {
+	try {
+		if (options?.viewColumn === ViewColumn.Beside) {
+			let column = (options?.sourceViewColumn ?? window.tabGroups.activeTabGroup?.viewColumn ?? 0) + 1;
+			if (column > ViewColumn.Nine) {
+				column = ViewColumn.One;
+			}
+
+			if (window.tabGroups.all.some(g => g.viewColumn === column)) {
+				await executeCoreCommand('workbench.action.focusRightGroup');
+			} else {
+				await executeCoreCommand('workbench.action.newGroupRight');
+			}
+		}
+
+		await executeCoreCommand('_open.mergeEditor', inputs);
+	} catch (ex) {
+		Logger.error(ex, 'openMergeEditor');
+		debugger;
+	}
+}
+
 export async function openUrl(url: string): Promise<boolean>;
 export async function openUrl(url?: string): Promise<boolean | undefined>;
 export async function openUrl(url?: string): Promise<boolean | undefined> {

src/views/viewCommands.ts

@@ -49,14 +49,15 @@ import {
 } from '../system/-webview/command';
 import { configuration } from '../system/-webview/configuration';
 import { setContext } from '../system/-webview/context';
-import type { OpenWorkspaceLocation } from '../system/-webview/vscode';
-import { openUrl, openWorkspace, revealInFileExplorer } from '../system/-webview/vscode';
+import type { MergeEditorInputs, OpenWorkspaceLocation } from '../system/-webview/vscode';
+import { openMergeEditor, openUrl, openWorkspace, revealInFileExplorer } from '../system/-webview/vscode';
 import { filterMap } from '../system/array';
 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 { getSettledValue } from '../system/promise';
 import { DeepLinkActionType } from '../uris/deepLinks/deepLink';
 import type { LaunchpadItemNode } from './launchpadView';
 import type { RepositoryFolderNode } from './nodes/abstract/repositoryFolderNode';
@@ -281,6 +282,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.mergeChangesWithWorking', this.mergeChangesWithWorking, this),
 			registerViewCommand(
 				'gitlens.views.openPreviousChangesWithWorking',
 				this.openPreviousChangesWithWorking,
@@ -1538,6 +1540,48 @@ export class ViewCommands implements Disposable {
 		return CommitActions.openCommitChangesWithWorking(this.container, node.commit, individually, options);
 	}
 
+	private async mergeChangesWithWorking(node: ViewRefFileNode) {
+		if (!(node instanceof ViewRefFileNode)) return Promise.resolve();
+
+		const repo = this.container.git.getRepository(node.repoPath);
+		if (repo == null) return Promise.resolve();
+
+		const nodeUri = await this.container.git.getBestRevisionUri(node.repoPath, node.file.path, node.ref.ref);
+		if (nodeUri == null) return Promise.resolve();
+
+		const [mergeBaseResult, workingUriResult] = await Promise.allSettled([
+			repo.git.refs().getMergeBase(node.ref.ref, 'HEAD'),
+			this.container.git.getWorkingUri(node.repoPath, node.uri),
+		]);
+
+		const workingUri = getSettledValue(workingUriResult);
+		if (workingUri == null) {
+			void window.showWarningMessage('Unable to open the merge editor, no working file found');
+			return Promise.resolve();
+		}
+
+		const mergeBase = getSettledValue(mergeBaseResult);
+		const baseUri =
+			mergeBase != null
+				? await this.container.git.getBestRevisionUri(node.repoPath, node.file.path, mergeBase)
+				: undefined;
+
+		const inputs: MergeEditorInputs = {
+			base: baseUri ?? nodeUri,
+			input1: {
+				uri: nodeUri,
+				title: node.ref.name,
+			},
+			input2: {
+				uri: workingUri,
+				title: 'Working Tree',
+			},
+			output: workingUri,
+		};
+
+		return openMergeEditor(inputs);
+	}
+
 	@log()
 	private async openChangesWithMergeBase(node: ResultsFileNode) {
 		if (!node.is('results-file')) return Promise.resolve();