SCM - Move "View Changes" action into core (microsoft#223485)

* Move "View Changes" action into core

* Verify that the first/last history item group are on the same branch

Author: lszomoru

extensions/git/package.json

@@ -1959,20 +1959,15 @@
         }
       ],
       "scm/historyItem/context": [
-        {
-          "command": "git.viewCommit",
-          "when": "scmProvider == git && config.multiDiffEditor.experimental.enabled",
-          "group": "1_view@1"
-        },
         {
           "command": "git.copyCommitId",
           "when": "scmProvider == git && !listMultiSelection",
-          "group": "3_copy@1"
+          "group": "1_copy@1"
         },
         {
           "command": "git.copyCommitMessage",
           "when": "scmProvider == git && !listMultiSelection",
-          "group": "3_copy@2"
+          "group": "1_copy@2"
         }
       ],
       "scm/incomingChanges": [

src/vs/workbench/contrib/scm/browser/scmViewPane.ts

@@ -860,17 +860,16 @@ class HistoryItemActionRunner2 extends ActionRunner {
 		const selection = this.getSelectedHistoryItems();
 		const contextIsSelected = selection.some(s => s === context);
 		if (contextIsSelected && selection.length > 1) {
-			args.push(...[selection[0], selection[selection.length - 1]]
-				.map(h => (
-					{
-						id: h.historyItemViewModel.historyItem.id,
-						parentIds: h.historyItemViewModel.historyItem.parentIds,
-						message: h.historyItemViewModel.historyItem.message,
-						author: h.historyItemViewModel.historyItem.author,
-						icon: h.historyItemViewModel.historyItem.icon,
-						timestamp: h.historyItemViewModel.historyItem.timestamp,
-						statistics: h.historyItemViewModel.historyItem.statistics,
-					} satisfies ISCMHistoryItem)));
+			args.push(...selection.map(h => (
+				{
+					id: h.historyItemViewModel.historyItem.id,
+					parentIds: h.historyItemViewModel.historyItem.parentIds,
+					message: h.historyItemViewModel.historyItem.message,
+					author: h.historyItemViewModel.historyItem.author,
+					icon: h.historyItemViewModel.historyItem.icon,
+					timestamp: h.historyItemViewModel.historyItem.timestamp,
+					statistics: h.historyItemViewModel.historyItem.statistics,
+				} satisfies ISCMHistoryItem)));
 		} else {
 			args.push({
 				id: context.historyItemViewModel.historyItem.id,
@@ -1905,6 +1904,60 @@ registerAction2(class extends Action2 {
 	}
 });
 
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.scm.action.scm.viewChanges',
+			title: localize('viewChanges', "View Changes"),
+			f1: false,
+			menu: [
+				{
+					id: MenuId.SCMChangesContext,
+					group: '0_view',
+					when: ContextKeyExpr.equals('config.multiDiffEditor.experimental.enabled', true)
+				}
+			]
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, provider: ISCMProvider, ...historyItems: ISCMHistoryItem[]) {
+		const commandService = accessor.get(ICommandService);
+
+		if (!provider || historyItems.length === 0) {
+			return;
+		}
+
+		const historyItem = historyItems[0];
+		const historyItemLast = historyItems[historyItems.length - 1];
+		const historyProvider = provider.historyProvider.get();
+
+		if (historyItems.length > 1) {
+			const ancestor = await historyProvider?.resolveHistoryItemGroupCommonAncestor2([historyItem.id, historyItemLast.id]);
+			if (!ancestor || (ancestor !== historyItem.id && ancestor !== historyItemLast.id)) {
+				return;
+			}
+		}
+
+		const historyItemParentId = historyItemLast.parentIds.length > 0 ? historyItemLast.parentIds[0] : undefined;
+		const historyItemChanges = await historyProvider?.provideHistoryItemChanges(historyItem.id, historyItemParentId);
+
+		if (!historyItemChanges?.length) {
+			return;
+		}
+
+		const title = historyItems.length === 1 ?
+			`${historyItems[0].id.substring(0, 8)} - ${historyItems[0].message}` :
+			localize('historyItemChangesEditorTitle', "All Changes ({0} ↔ {1})", historyItem.id.substring(0, 8), historyItemLast.id.substring(0, 8));
+
+		const rootUri = provider.rootUri;
+		const multiDiffSourceUri = rootUri ?
+			rootUri.with({ scheme: 'scm-history-item', path: `${rootUri.path}/${historyItem.id}..${historyItemParentId}` }) :
+			URI.from({ scheme: 'scm-history-item', path: `${provider.label}/${historyItem.id}..${historyItemParentId}` }, true);
+
+		commandService.executeCommand('_workbench.openMultiDiffEditor', { title, multiDiffSourceUri, resources: historyItemChanges });
+	}
+});
+
 class RepositoryVisibilityAction extends Action2 {
 
 	private repository: ISCMRepository;
@@ -3367,8 +3420,8 @@ export class SCMViewPane extends ViewPane {
 
 				const rootUri = e.element.repository.provider.rootUri;
 				const multiDiffSourceUri = rootUri ?
-					rootUri.with({ scheme: 'scm-history-item', path: `${rootUri.path}/${historyItem.id}` }) :
-					{ scheme: 'scm-history-item', path: `${e.element.repository.provider.label}/${historyItem.id}` };
+					rootUri.with({ scheme: 'scm-history-item', path: `${rootUri.path}/${historyItem.id}..${historyItemParentId}` }) :
+					URI.from({ scheme: 'scm-history-item', path: `${e.element.repository.provider.label}/${historyItem.id}..${historyItemParentId}` }, true);
 
 				await this.commandService.executeCommand('_workbench.openMultiDiffEditor', { title, multiDiffSourceUri, resources: historyItemChanges });
 			}