From e69a45d855ca6e10f6dd7b5dbdb0ef1ab529fa07 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Fri, 31 Oct 2025 14:44:45 +0000 Subject: [PATCH] SCM - disable context menu on incoming/outgoing changes nodes (#274355) --- src/vs/workbench/contrib/scm/browser/scmHistory.ts | 2 +- src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/scm/browser/scmHistory.ts b/src/vs/workbench/contrib/scm/browser/scmHistory.ts index 1a5926690ce..d1ac36b056a 100644 --- a/src/vs/workbench/contrib/scm/browser/scmHistory.ts +++ b/src/vs/workbench/contrib/scm/browser/scmHistory.ts @@ -240,7 +240,7 @@ export function renderSCMHistoryItemGraph(historyItemViewModel: ISCMHistoryItemV const innerCircle = drawCircle(circleIndex, CIRCLE_STROKE_WIDTH, CIRCLE_RADIUS + 5); svg.append(innerCircle); - const dashedCircle = drawDashedCircle(circleIndex, CIRCLE_RADIUS + 1, CIRCLE_STROKE_WIDTH, circleColor); + const dashedCircle = drawDashedCircle(circleIndex, CIRCLE_RADIUS + 1, CIRCLE_STROKE_WIDTH - 1, circleColor); svg.append(dashedCircle); } else { if (historyItem.parentIds.length > 1) { diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts index d67ea2f1331..012800e0453 100644 --- a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts +++ b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts @@ -2033,6 +2033,11 @@ export class SCMHistoryViewPane extends ViewPane { if (isSCMHistoryItemViewModelTreeElement(element)) { // HistoryItem + if (element.historyItemViewModel.kind === 'incoming-changes' || element.historyItemViewModel.kind === 'outgoing-changes') { + // Incoming/Outgoing changes node does not support any context menu actions + return; + } + this._contextMenuDisposables.value = new DisposableStore(); const historyProvider = element.repository.provider.historyProvider.get();