From 9808d4e655214cbf4407f3b03026b3a1d710dcb2 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:34:27 +0100
Subject: [PATCH] SCM - rename incoming/outgoing menu contribution (#202068)

---
 extensions/git/package.json                          |  4 ++--
 src/vs/platform/actions/common/actions.ts            |  4 ++--
 src/vs/workbench/contrib/scm/browser/menus.ts        |  2 +-
 .../services/actions/common/menusExtensionPoint.ts   | 12 ++++++------
 ...proposed.contribSourceControlHistoryItemMenu.d.ts |  3 ++-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index c41d7ceb386..0dbe6d739e8 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -1765,14 +1765,14 @@
           "group": "1_modification@3"
         }
       ],
-      "scm/incoming/historyItem/context": [
+      "scm/incomingChanges/historyItem/context": [
         {
           "command": "git.openCommit",
           "when": "scmProvider == git && config.multiDiffEditor.experimental.enabled",
           "group": "inline@1"
         }
       ],
-      "scm/outgoing/historyItem/context": [
+      "scm/outgoingChanges/historyItem/context": [
         {
           "command": "git.openCommit",
           "when": "scmProvider == git && config.multiDiffEditor.experimental.enabled",
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index 9346da55bbf..ba21daa8d9d 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -107,8 +107,8 @@ export class MenuId {
 	static readonly OpenEditorsContextShare = new MenuId('OpenEditorsContextShare');
 	static readonly ProblemsPanelContext = new MenuId('ProblemsPanelContext');
 	static readonly SCMInputBox = new MenuId('SCMInputBox');
-	static readonly SCMIncomingHistoryItemContext = new MenuId('SCMIncomingHistoryItemContext');
-	static readonly SCMOutgoingHistoryItemContext = new MenuId('SCMOutgoingHistoryItemContext');
+	static readonly SCMIncomingChangesHistoryItemContext = new MenuId('SCMIncomingChangesHistoryItemContext');
+	static readonly SCMOutgoingChangesHistoryItemContext = new MenuId('SCMOutgoingChangesHistoryItemContext');
 	static readonly SCMChangeContext = new MenuId('SCMChangeContext');
 	static readonly SCMResourceContext = new MenuId('SCMResourceContext');
 	static readonly SCMResourceContextShare = new MenuId('SCMResourceContextShare');
diff --git a/src/vs/workbench/contrib/scm/browser/menus.ts b/src/vs/workbench/contrib/scm/browser/menus.ts
index fecb988c5ad..7b1b601cea2 100644
--- a/src/vs/workbench/contrib/scm/browser/menus.ts
+++ b/src/vs/workbench/contrib/scm/browser/menus.ts
@@ -274,7 +274,7 @@ export class SCMHistoryProviderMenus implements ISCMHistoryProviderMenus, IDispo
 			]);
 
 			const menuId = historyItemGroup.direction === 'incoming' ?
-				MenuId.SCMIncomingHistoryItemContext : MenuId.SCMOutgoingHistoryItemContext;
+				MenuId.SCMIncomingChangesHistoryItemContext : MenuId.SCMOutgoingChangesHistoryItemContext;
 
 			result = this.menuService.createMenu(menuId, contextKeyService);
 			this.historyItemMenus.set(historyItem, result);
diff --git a/src/vs/workbench/services/actions/common/menusExtensionPoint.ts b/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
index 3d62dc3f751..51b6081d9eb 100644
--- a/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
+++ b/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
@@ -151,15 +151,15 @@ const apiMenus: IAPIMenu[] = [
 		proposed: 'contribSourceControlInputBoxMenu'
 	},
 	{
-		key: 'scm/incoming/historyItem/context',
-		id: MenuId.SCMIncomingHistoryItemContext,
-		description: localize('menus.incomingHistoryItemContext', "The Source Control incoming history item context menu"),
+		key: 'scm/incomingChanges/historyItem/context',
+		id: MenuId.SCMIncomingChangesHistoryItemContext,
+		description: localize('menus.incomingChangesHistoryItemContext', "The Source Control incoming changes history item context menu"),
 		proposed: 'contribSourceControlHistoryItemMenu'
 	},
 	{
-		key: 'scm/outgoing/historyItem/context',
-		id: MenuId.SCMOutgoingHistoryItemContext,
-		description: localize('menus.outgoingHistoryItemContext', "The Source Control outgoing history item context menu"),
+		key: 'scm/outgoingChanges/historyItem/context',
+		id: MenuId.SCMOutgoingChangesHistoryItemContext,
+		description: localize('menus.outgoingChangesHistoryItemContext', "The Source Control outgoing changes history item context menu"),
 		proposed: 'contribSourceControlHistoryItemMenu'
 	},
 	{
diff --git a/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts b/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts
index 44bfaf17b01..fc6181be77f 100644
--- a/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts
+++ b/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts
@@ -3,5 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// empty placeholder declaration for the `scm/historyItem/context`-menu contribution point
+// empty placeholder declaration for the `scm/incomingChanges/historyItem/context`-menu contribution point
+// empty placeholder declaration for the `scm/outgoingChanges/historyItem/context`-menu contribution point
 // https://github.com/microsoft/vscode/issues/201997