@codingame/monaco-vscode-scm-service-override 8.0.4 → 9.0.2

package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js

@@ -2,7 +2,7 @@ import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { DirtyDiffWorkbenchController } from 'vscode/vscode/vs/workbench/contrib/scm/browser/dirtydiffDecorator';
-import { VIEWLET_ID, VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
+import { VIEWLET_ID, VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID, HISTORY_VIEW_PANE_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
@@ -29,9 +29,13 @@ import { Context } from 'vscode/vscode/vs/editor/contrib/suggest/browser/suggest
 import { WorkspaceTrustContext, MANAGE_TRUST_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/workspace/common/workspace';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import '../common/quickDiffService.js';
-import { getActiveElement } from 'vscode/vscode/vs/base/browser/dom';
+import { getActiveElement, isActiveElement } from 'vscode/vscode/vs/base/browser/dom';
 import { SCMWorkingSetController } from './workingSet.js';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
+import { WorkbenchList } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { IListService } from 'vscode/vscode/vs/platform/list/browser/listService.service';
+import { isSCMRepository } from './util.js';
+import { SCMHistoryViewPane } from './scmHistoryViewPane.js';
 
 ModesRegistry.registerLanguage({
     id: 'scminput',
@@ -41,10 +45,10 @@ ModesRegistry.registerLanguage({
 });
 ( (Registry.as(Extensions.Workbench)))
     .registerWorkbenchContribution(DirtyDiffWorkbenchController, LifecyclePhase.Restored);
-const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(2859, 'View icon of the Source Control view.')));
+const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(2870, 'View icon of the Source Control view.')));
 const viewContainer = ( (Registry.as(Extensions$1.ViewContainersRegistry))).registerViewContainer({
     id: VIEWLET_ID,
-    title: ( localize2(2860, 'Source Control')),
+    title: ( localize2(2871, 'Source Control')),
     ctorDescriptor: ( (new SyncDescriptor(SCMViewPaneContainer))),
     storageId: 'workbench.scm.views.state',
     icon: sourceControlViewIcon,
@@ -54,12 +58,12 @@ const viewContainer = ( (Registry.as(Extensions$1.ViewContainersRegistry))).regi
 }, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
 const viewsRegistry = ( (Registry.as(Extensions$1.ViewsRegistry)));
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
-    content: ( localize(2861, "No source control providers registered.")),
+    content: ( localize(2872, "No source control providers registered.")),
     when: 'default'
 });
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
     content: ( localize(
-        2862,
+        2873,
         "None of the registered source control providers work in Restricted Mode."
     )),
     when: ( (ContextKeyExpr.and(
@@ -69,7 +73,7 @@ viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
     )))
 });
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
-    content: `[${( localize(2863, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
+    content: `[${( localize(2874, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('scm.providerCount', 0)),
         WorkspaceTrustContext.IsEnabled,
@@ -78,16 +82,16 @@ viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
 });
 viewsRegistry.registerViews([{
         id: VIEW_PANE_ID,
-        name: ( localize2(2860, 'Source Control')),
+        name: ( localize2(2871, 'Source Control')),
         ctorDescriptor: ( (new SyncDescriptor(SCMViewPane))),
         canToggleVisibility: true,
         canMoveView: true,
-        weight: 80,
+        weight: 40,
         order: -999,
         containerIcon: sourceControlViewIcon,
         openCommandActionDescriptor: {
             id: viewContainer.id,
-            mnemonicTitle: ( localize(2864, "Source &&Control")),
+            mnemonicTitle: ( localize(2875, "Source &&Control")),
             keybindings: {
                 primary: 0,
                 win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
@@ -99,7 +103,7 @@ viewsRegistry.registerViews([{
     }], viewContainer);
 viewsRegistry.registerViews([{
         id: REPOSITORIES_VIEW_PANE_ID,
-        name: ( localize2(2865, "Source Control Repositories")),
+        name: ( localize2(2876, "Source Control Repositories")),
         ctorDescriptor: ( (new SyncDescriptor(SCMRepositoriesViewPane))),
         canToggleVisibility: true,
         hideByDefault: true,
@@ -112,6 +116,20 @@ viewsRegistry.registerViews([{
         ))),
         containerIcon: sourceControlViewIcon
     }], viewContainer);
+viewsRegistry.registerViews([{
+        id: HISTORY_VIEW_PANE_ID,
+        name: ( localize2(2877, "Source Control Graph")),
+        ctorDescriptor: ( (new SyncDescriptor(SCMHistoryViewPane))),
+        canToggleVisibility: true,
+        canMoveView: true,
+        weight: 40,
+        order: 2,
+        when: ( (ContextKeyExpr.and(
+             (ContextKeyExpr.has('scm.providerCount')),
+             (ContextKeyExpr.notEquals('scm.providerCount', 0))
+        ))),
+        containerIcon: sourceControlViewIcon
+    }], viewContainer);
 ( (Registry.as(Extensions.Workbench)))
     .registerWorkbenchContribution(SCMActiveRepositoryController, LifecyclePhase.Restored);
 ( (Registry.as(Extensions.Workbench)))
@@ -120,7 +138,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
 ( (Registry.as(Extensions$2.Configuration))).registerConfiguration({
     id: 'scm',
     order: 5,
-    title: ( localize(2866, "Source Control")),
+    title: ( localize(2878, "Source Control")),
     type: 'object',
     scope: ConfigurationScope.RESOURCE,
     properties: {
@@ -128,21 +146,21 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['all', 'gutter', 'overview', 'minimap', 'none'],
             enumDescriptions: [
-                ( localize(2867, "Show the diff decorations in all available locations.")),
-                ( localize(2868, "Show the diff decorations only in the editor gutter.")),
-                ( localize(2869, "Show the diff decorations only in the overview ruler.")),
-                ( localize(2870, "Show the diff decorations only in the minimap.")),
-                ( localize(2871, "Do not show the diff decorations."))
+                ( localize(2879, "Show the diff decorations in all available locations.")),
+                ( localize(2880, "Show the diff decorations only in the editor gutter.")),
+                ( localize(2881, "Show the diff decorations only in the overview ruler.")),
+                ( localize(2882, "Show the diff decorations only in the minimap.")),
+                ( localize(2883, "Do not show the diff decorations."))
             ],
             default: 'all',
-            description: ( localize(2872, "Controls diff decorations in the editor."))
+            description: ( localize(2884, "Controls diff decorations in the editor."))
         },
         'scm.diffDecorationsGutterWidth': {
             type: 'number',
             enum: [1, 2, 3, 4, 5],
             default: 3,
             description: ( localize(
-                2873,
+                2885,
                 "Controls the width(px) of diff decorations in gutter (added & modified)."
             ))
         },
@@ -150,11 +168,11 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['always', 'hover'],
             enumDescriptions: [
-                ( localize(2874, "Show the diff decorator in the gutter at all times.")),
-                ( localize(2875, "Show the diff decorator in the gutter only on hover."))
+                ( localize(2886, "Show the diff decorator in the gutter at all times.")),
+                ( localize(2887, "Show the diff decorator in the gutter only on hover."))
             ],
             description: ( localize(
-                2876,
+                2888,
                 "Controls the visibility of the Source Control diff decorator in the gutter."
             )),
             default: 'always'
@@ -163,27 +181,27 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['diff', 'none'],
             enumDescriptions: [
-                ( localize(2877, "Show the inline diff Peek view on click.")),
-                ( localize(2878, "Do nothing."))
+                ( localize(2889, "Show the inline diff Peek view on click.")),
+                ( localize(2890, "Do nothing."))
             ],
-            description: ( localize(2879, "Controls the behavior of Source Control diff gutter decorations.")),
+            description: ( localize(2891, "Controls the behavior of Source Control diff gutter decorations.")),
             default: 'diff'
         },
         'scm.diffDecorationsGutterPattern': {
             type: 'object',
             description: ( localize(
-                2880,
+                2892,
                 "Controls whether a pattern is used for the diff decorations in gutter."
             )),
             additionalProperties: false,
             properties: {
                 'added': {
                     type: 'boolean',
-                    description: ( localize(2881, "Use pattern for the diff decorations in gutter for added lines.")),
+                    description: ( localize(2893, "Use pattern for the diff decorations in gutter for added lines.")),
                 },
                 'modified': {
                     type: 'boolean',
-                    description: ( localize(2882, "Use pattern for the diff decorations in gutter for modified lines.")),
+                    description: ( localize(2894, "Use pattern for the diff decorations in gutter for modified lines.")),
                 },
             },
             default: {
@@ -195,12 +213,12 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['true', 'false', 'inherit'],
             enumDescriptions: [
-                ( localize(2883, "Ignore leading and trailing whitespace.")),
-                ( localize(2884, "Do not ignore leading and trailing whitespace.")),
-                ( localize(2885, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
+                ( localize(2895, "Ignore leading and trailing whitespace.")),
+                ( localize(2896, "Do not ignore leading and trailing whitespace.")),
+                ( localize(2897, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
             ],
             description: ( localize(
-                2886,
+                2898,
                 "Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
             )),
             default: 'false'
@@ -208,7 +226,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.alwaysShowActions': {
             type: 'boolean',
             description: ( localize(
-                2887,
+                2899,
                 "Controls whether inline actions are always visible in the Source Control view."
             )),
             default: false
@@ -217,12 +235,12 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['all', 'focused', 'off'],
             enumDescriptions: [
-                ( localize(2888, "Show the sum of all Source Control Provider count badges.")),
-                ( localize(2889, "Show the count badge of the focused Source Control Provider.")),
-                ( localize(2890, "Disable the Source Control count badge."))
+                ( localize(2900, "Show the sum of all Source Control Provider count badges.")),
+                ( localize(2901, "Show the count badge of the focused Source Control Provider.")),
+                ( localize(2902, "Disable the Source Control count badge."))
             ],
             description: ( localize(
-                2891,
+                2903,
                 "Controls the count badge on the Source Control icon on the Activity Bar."
             )),
             default: 'all'
@@ -231,12 +249,12 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['hidden', 'auto', 'visible'],
             enumDescriptions: [
-                ( localize(2892, "Hide Source Control Provider count badges.")),
-                ( localize(2893, "Only show count badge for Source Control Provider when non-zero.")),
-                ( localize(2894, "Show Source Control Provider count badges."))
+                ( localize(2904, "Hide Source Control Provider count badges.")),
+                ( localize(2905, "Only show count badge for Source Control Provider when non-zero.")),
+                ( localize(2906, "Show Source Control Provider count badges."))
             ],
             markdownDescription: ( localize(
-                2895,
+                2907,
                 "Controls the count badges on Source Control Provider headers. These headers appear in the Source Control view when there is more than one provider or when the {0} setting is enabled, and in the Source Control Repositories view.",
                 '\`#scm.alwaysShowRepositories#\`'
             )),
@@ -246,22 +264,22 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['tree', 'list'],
             enumDescriptions: [
-                ( localize(2896, "Show the repository changes as a tree.")),
-                ( localize(2897, "Show the repository changes as a list."))
+                ( localize(2908, "Show the repository changes as a tree.")),
+                ( localize(2909, "Show the repository changes as a list."))
             ],
-            description: ( localize(2898, "Controls the default Source Control repository view mode.")),
+            description: ( localize(2910, "Controls the default Source Control repository view mode.")),
             default: 'list'
         },
         'scm.defaultViewSortKey': {
             type: 'string',
             enum: ['name', 'path', 'status'],
             enumDescriptions: [
-                ( localize(2899, "Sort the repository changes by file name.")),
-                ( localize(2900, "Sort the repository changes by path.")),
-                ( localize(2901, "Sort the repository changes by Source Control status."))
+                ( localize(2911, "Sort the repository changes by file name.")),
+                ( localize(2912, "Sort the repository changes by path.")),
+                ( localize(2913, "Sort the repository changes by Source Control status."))
             ],
             description: ( localize(
-                2902,
+                2914,
                 "Controls the default Source Control repository changes sort order when viewed as a list."
             )),
             default: 'path'
@@ -269,7 +287,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.autoReveal': {
             type: 'boolean',
             description: ( localize(
-                2903,
+                2915,
                 "Controls whether the Source Control view should automatically reveal and select files when opening them."
             )),
             default: true
@@ -277,20 +295,20 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.inputFontFamily': {
             type: 'string',
             markdownDescription: ( localize(
-                2904,
+                2916,
                 "Controls the font for the input message. Use `default` for the workbench user interface font family, `editor` for the `#editor.fontFamily#`'s value, or a custom font family."
             )),
             default: 'default'
         },
         'scm.inputFontSize': {
             type: 'number',
-            markdownDescription: ( localize(2905, "Controls the font size for the input message in pixels.")),
+            markdownDescription: ( localize(2917, "Controls the font size for the input message in pixels.")),
             default: 13
         },
         'scm.inputMaxLineCount': {
             type: 'number',
             markdownDescription: ( localize(
-                2906,
+                2918,
                 "Controls the maximum number of lines that the input will auto-grow to."
             )),
             minimum: 1,
@@ -300,7 +318,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.inputMinLineCount': {
             type: 'number',
             markdownDescription: ( localize(
-                2907,
+                2919,
                 "Controls the minimum number of lines that the input will auto-grow from."
             )),
             minimum: 1,
@@ -310,7 +328,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.alwaysShowRepositories': {
             type: 'boolean',
             markdownDescription: ( localize(
-                2908,
+                2920,
                 "Controls whether repositories should always be visible in the Source Control view."
             )),
             default: false
@@ -320,20 +338,20 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             enum: ['discovery time', 'name', 'path'],
             enumDescriptions: [
                 ( localize(
-                    2909,
+                    2921,
                     "Repositories in the Source Control Repositories view are sorted by discovery time. Repositories in the Source Control view are sorted in the order that they were selected."
                 )),
                 ( localize(
-                    2910,
+                    2922,
                     "Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
                 )),
                 ( localize(
-                    2911,
+                    2923,
                     "Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
                 ))
             ],
             description: ( localize(
-                2912,
+                2924,
                 "Controls the sort order of the repositories in the source control repositories view."
             )),
             default: 'discovery time'
@@ -341,7 +359,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.repositories.visible': {
             type: 'number',
             description: ( localize(
-                2913,
+                2925,
                 "Controls how many repositories are visible in the Source Control Repositories section. Set to 0, to be able to manually resize the view."
             )),
             default: 10
@@ -349,7 +367,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.showActionButton': {
             type: 'boolean',
             markdownDescription: ( localize(
-                2914,
+                2926,
                 "Controls whether an action button can be shown in the Source Control view."
             )),
             default: true
@@ -357,57 +375,15 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.showInputActionButton': {
             type: 'boolean',
             markdownDescription: ( localize(
-                2915,
+                2927,
                 "Controls whether an action button can be shown in the Source Control input."
             )),
             default: true
         },
-        'scm.showIncomingChanges': {
-            type: 'string',
-            enum: ['always', 'never', 'auto'],
-            enumDescriptions: [
-                ( localize(2916, "Always show incoming changes in the Source Control view.")),
-                ( localize(2917, "Never show incoming changes in the Source Control view.")),
-                ( localize(
-                    2918,
-                    "Only show incoming changes in the Source Control view when any exist."
-                )),
-            ],
-            description: ( localize(
-                2919,
-                "Controls whether incoming changes are shown in the Source Control view."
-            )),
-            default: 'auto'
-        },
-        'scm.showOutgoingChanges': {
-            type: 'string',
-            enum: ['always', 'never', 'auto'],
-            enumDescriptions: [
-                ( localize(2920, "Always show outgoing changes in the Source Control view.")),
-                ( localize(2921, "Never show outgoing changes in the Source Control view.")),
-                ( localize(
-                    2922,
-                    "Only show outgoing changes in the Source Control view when any exist."
-                )),
-            ],
-            description: ( localize(
-                2923,
-                "Controls whether outgoing changes are shown in the Source Control view."
-            )),
-            default: 'auto'
-        },
-        'scm.showChangesSummary': {
-            type: 'boolean',
-            description: ( localize(
-                2924,
-                "Controls whether the All Changes entry is shown for incoming/outgoing changes in the Source Control view."
-            )),
-            default: true
-        },
         'scm.workingSets.enabled': {
             type: 'boolean',
             description: ( localize(
-                2925,
+                2928,
                 "Controls whether to store editor working sets when switching between source control history item groups."
             )),
             default: false
@@ -417,25 +393,25 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             enum: ['empty', 'current'],
             enumDescriptions: [
                 ( localize(
-                    2926,
+                    2929,
                     "Use an empty working set when switching to a source control history item group that does not have a working set."
                 )),
                 ( localize(
-                    2927,
+                    2930,
                     "Use the current working set when switching to a source control history item group that does not have a working set."
                 ))
             ],
             description: ( localize(
-                2928,
+                2931,
                 "Controls the default working set to use when switching to a source control history item group that does not have a working set."
             )),
             default: 'current'
         },
-        'scm.showHistoryGraph': {
+        'scm.compactFolders': {
             type: 'boolean',
             description: ( localize(
-                2929,
-                "Controls whether to render incoming/outgoing changes using a graph in the Source Control view."
+                2932,
+                "Controls whether the Source Control view should render folders in a compact form. In such a form, single child folders will be compressed in a combined tree element."
             )),
             default: true
         }
@@ -443,7 +419,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'scm.acceptInput',
-    metadata: { description: ( localize(2930, "Source Control: Accept Input")), args: [] },
+    metadata: { description: ( localize(2933, "Source Control: Accept Input")), args: [] },
     weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.has('scmRepository'))),
     primary: KeyMod.CtrlCmd | KeyCode.Enter,
@@ -483,7 +459,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 const viewNextCommitCommand = {
-    description: { description: ( localize(2931, "Source Control: View Next Commit")), args: [] },
+    description: { description: ( localize(2934, "Source Control: View Next Commit")), args: [] },
     weight: KeybindingWeight.WorkbenchContrib,
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
@@ -495,7 +471,7 @@ const viewNextCommitCommand = {
     }
 };
 const viewPreviousCommitCommand = {
-    description: { description: ( localize(2932, "Source Control: View Previous Commit")), args: [] },
+    description: { description: ( localize(2935, "Source Control: View Previous Commit")), args: [] },
     weight: KeybindingWeight.WorkbenchContrib,
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
@@ -538,11 +514,27 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     when: ( (ContextKeyExpr.has('scmRepository'))),
     primary: KeyMod.Alt | KeyCode.UpArrow
 });
-CommandsRegistry.registerCommand('scm.openInIntegratedTerminal', async (accessor, provider) => {
-    if (!provider || !provider.rootUri) {
+CommandsRegistry.registerCommand('scm.openInIntegratedTerminal', async (accessor, ...providers) => {
+    if (!providers || providers.length === 0) {
         return;
     }
     const commandService = accessor.get(ICommandService);
+    const listService = accessor.get(IListService);
+    let provider = providers.length === 1 ? providers[0] : undefined;
+    if (!provider) {
+        const list = listService.lastFocusedList;
+        const element = list?.getHTMLElement();
+        if (list instanceof WorkbenchList && element && isActiveElement(element)) {
+            const [index] = list.getFocus();
+            const focusedElement = list.element(index);
+            if (isSCMRepository(focusedElement)) {
+                provider = focusedElement.provider;
+            }
+        }
+    }
+    if (!provider?.rootUri) {
+        return;
+    }
     await commandService.executeCommand('openInIntegratedTerminal', provider.rootUri);
 });
 CommandsRegistry.registerCommand('scm.openInTerminal', async (accessor, provider) => {
@@ -556,7 +548,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
     group: '100_end',
     command: {
         id: 'scm.openInTerminal',
-        title: ( localize(2933, "Open in External Terminal"))
+        title: ( localize(2936, "Open in External Terminal"))
     },
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('scmProviderHasRootUri', true)),
@@ -570,7 +562,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
     group: '100_end',
     command: {
         id: 'scm.openInIntegratedTerminal',
-        title: ( localize(2934, "Open in Integrated Terminal"))
+        title: ( localize(2937, "Open in Integrated Terminal"))
     },
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('scmProviderHasRootUri', true)),

package/vscode/src/vs/workbench/contrib/scm/browser/scmHistory.js

@@ -14,19 +14,20 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { rot } from 'vscode/vscode/vs/base/common/numbers';
+import { svgElem } from 'vscode/vscode/vs/base/browser/dom';
 
 const SWIMLANE_HEIGHT = 22;
 const SWIMLANE_WIDTH = 11;
 const CIRCLE_RADIUS = 4;
 const SWIMLANE_CURVE_RADIUS = 5;
-const historyItemGroupLocal = registerColor('scm.historyGraph.historyItemGroupLocal', chartsBlue, ( localize(10425, "Local history item group color.")));
-const historyItemGroupRemote = registerColor('scm.historyGraph.historyItemGroupRemote', chartsPurple, ( localize(10426, "Remote history item group color.")));
-const historyItemGroupBase = registerColor('scm.historyGraph.historyItemGroupBase', chartsOrange, ( localize(10427, "Base history item group color.")));
-const historyItemGroupHoverLabelForeground = registerColor('scm.historyGraph.historyItemGroupHoverLabelForeground', buttonForeground, ( localize(10428, "History item group hover label foreground color.")));
+const historyItemGroupLocal = registerColor('scmGraph.historyItemGroupLocal', chartsBlue, ( localize(10520, "Local history item group color.")));
+const historyItemGroupRemote = registerColor('scmGraph.historyItemGroupRemote', chartsPurple, ( localize(10521, "Remote history item group color.")));
+const historyItemGroupBase = registerColor('scmGraph.historyItemGroupBase', chartsOrange, ( localize(10522, "Base history item group color.")));
+const historyItemGroupHoverLabelForeground = registerColor('scmGraph.historyItemHoverLabelForeground', buttonForeground, ( localize(10523, "History item hover label foreground color.")));
 const colorRegistry = [
-    registerColor('scm.historyGraph.green', chartsGreen, ( localize(10429, "The green color used in history graph."))),
-    registerColor('scm.historyGraph.red', chartsRed, ( localize(10430, "The red color used in history graph."))),
-    registerColor('scm.historyGraph.yellow', chartsYellow, ( localize(10431, "The yellow color used in history graph."))),
+    registerColor('scmGraph.foreground1', chartsGreen, ( localize(10524, "Source control graph foreground color (1)."))),
+    registerColor('scmGraph.foreground2', chartsRed, ( localize(10525, "Source control graph foreground color (2)."))),
+    registerColor('scmGraph.foreground3', chartsYellow, ( localize(10526, "Source control graph foreground color (3)."))),
 ];
 function getLabelColorIdentifier(historyItem, colorMap) {
     for (const label of historyItem.labels ?? []) {
@@ -74,7 +75,8 @@ function renderSCMHistoryItemGraph(historyItemViewModel) {
     const outputSwimlanes = historyItemViewModel.outputSwimlanes;
     const inputIndex = inputSwimlanes.findIndex(node => node.id === historyItem.id);
     const circleIndex = inputIndex !== -1 ? inputIndex : inputSwimlanes.length;
-    const circleColor = circleIndex < outputSwimlanes.length ? outputSwimlanes[circleIndex].color : inputSwimlanes[circleIndex].color;
+    const circleColor = circleIndex < outputSwimlanes.length ? outputSwimlanes[circleIndex].color :
+        circleIndex < inputSwimlanes.length ? inputSwimlanes[circleIndex].color : historyItemGroupLocal;
     let outputSwimlaneIndex = 0;
     for (let index = 0; index < inputSwimlanes.length; index++) {
         const color = inputSwimlanes[index].color;
@@ -155,6 +157,16 @@ function renderSCMHistoryItemGraph(historyItemViewModel) {
     svg.style.width = `${SWIMLANE_WIDTH * (Math.max(inputSwimlanes.length, outputSwimlanes.length, 1) + 1)}px`;
     return svg;
 }
+function renderSCMHistoryGraphPlaceholder(columns) {
+    const elements = svgElem('svg', {
+        style: { height: `${SWIMLANE_HEIGHT}px`, width: `${SWIMLANE_WIDTH * (columns.length + 1)}px`, }
+    });
+    for (let index = 0; index < columns.length; index++) {
+        const path = drawVerticalLine(SWIMLANE_WIDTH * (index + 1), 0, SWIMLANE_HEIGHT, columns[index].color);
+        elements.root.append(path);
+    }
+    return elements.root;
+}
 function toISCMHistoryItemViewModelArray(historyItems, colorMap = ( (new Map()))) {
     let colorIndex = -1;
     const viewModels = [];
@@ -163,8 +175,8 @@ function toISCMHistoryItemViewModelArray(historyItems, colorMap = ( (new Map()))
         const outputSwimlanesFromPreviousItem = lastOrDefault(viewModels)?.outputSwimlanes ?? [];
         const inputSwimlanes = ( (outputSwimlanesFromPreviousItem.map(i => deepClone(i))));
         const outputSwimlanes = [];
+        let firstParentAdded = false;
         if (historyItem.parentIds.length > 0) {
-            let firstParentAdded = false;
             for (const node of inputSwimlanes) {
                 if (node.id === historyItem.id) {
                     if (!firstParentAdded) {
@@ -178,25 +190,25 @@ function toISCMHistoryItemViewModelArray(historyItems, colorMap = ( (new Map()))
                 }
                 outputSwimlanes.push(deepClone(node));
             }
-            for (let i = firstParentAdded ? 1 : 0; i < historyItem.parentIds.length; i++) {
-                let colorIdentifier;
-                if (!firstParentAdded) {
-                    colorIdentifier = getLabelColorIdentifier(historyItem, colorMap);
-                }
-                else {
-                    const historyItemParent = historyItems
-                        .find(h => h.id === historyItem.parentIds[i]);
-                    colorIdentifier = historyItemParent ? getLabelColorIdentifier(historyItemParent, colorMap) : undefined;
-                }
-                if (!colorIdentifier) {
-                    colorIndex = rot(colorIndex + 1, colorRegistry.length);
-                    colorIdentifier = colorRegistry[colorIndex];
-                }
-                outputSwimlanes.push({
-                    id: historyItem.parentIds[i],
-                    color: colorIdentifier
-                });
+        }
+        for (let i = firstParentAdded ? 1 : 0; i < historyItem.parentIds.length; i++) {
+            let colorIdentifier;
+            if (!firstParentAdded) {
+                colorIdentifier = getLabelColorIdentifier(historyItem, colorMap);
+            }
+            else {
+                const historyItemParent = historyItems
+                    .find(h => h.id === historyItem.parentIds[i]);
+                colorIdentifier = historyItemParent ? getLabelColorIdentifier(historyItemParent, colorMap) : undefined;
+            }
+            if (!colorIdentifier) {
+                colorIndex = rot(colorIndex + 1, colorRegistry.length);
+                colorIdentifier = colorRegistry[colorIndex];
             }
+            outputSwimlanes.push({
+                id: historyItem.parentIds[i],
+                color: colorIdentifier
+            });
         }
         viewModels.push({
             historyItem,
@@ -207,4 +219,4 @@ function toISCMHistoryItemViewModelArray(historyItems, colorMap = ( (new Map()))
     return viewModels;
 }
 
-export { colorRegistry, historyItemGroupBase, historyItemGroupHoverLabelForeground, historyItemGroupLocal, historyItemGroupRemote, renderSCMHistoryItemGraph, toISCMHistoryItemViewModelArray };
+export { SWIMLANE_HEIGHT, SWIMLANE_WIDTH, colorRegistry, historyItemGroupBase, historyItemGroupHoverLabelForeground, historyItemGroupLocal, historyItemGroupRemote, renderSCMHistoryGraphPlaceholder, renderSCMHistoryItemGraph, toISCMHistoryItemViewModelArray };