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

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

@@ -1,41 +1,41 @@
 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 { Extensions, registerWorkbenchContribution2 } 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, 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 { VIEWLET_ID, VIEW_PANE_ID, HISTORY_VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
+import { ISCMService, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { SCMActiveRepositoryController, SCMActiveResourceContextKeyController } from './activity.js';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { Extensions as Extensions$2, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
-import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
-import '../common/scmService.js';
-import { Extensions as Extensions$1, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
+import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { registerSingleton } from 'vscode/vscode/vs/platform/instantiation/common/extensions';
+import { SCMService } from '../common/scmService.js';
+import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/views';
 import { SCMViewPaneContainer } from './scmViewPaneContainer.js';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { ModesRegistry } from 'vscode/vscode/vs/editor/common/languages/modesRegistry';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
-import { SCMViewPane, ContextKeys } from './scmViewPane.js';
-import './scmViewService.js';
+import { ContextKeys, SCMViewPane } from './scmViewPane.js';
+import { SCMViewService } from './scmViewService.js';
 import { SCMRepositoriesViewPane } from './scmRepositoriesViewPane.js';
 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 { IQuickDiffService } from 'vscode/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
+import { QuickDiffService } from '../common/quickDiffService.js';
 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 { isSCMRepository } from 'vscode/vscode/vs/workbench/contrib/scm/browser/util';
 import { SCMHistoryViewPane } from './scmHistoryViewPane.js';
+import { IsWebContext } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
+import { RemoteNameContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 
 ModesRegistry.registerLanguage({
     id: 'scminput',
@@ -44,26 +44,26 @@ ModesRegistry.registerLanguage({
     mimetypes: ['text/x-scm-input']
 });
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(DirtyDiffWorkbenchController, LifecyclePhase.Restored);
-const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(2870, 'View icon of the Source Control view.')));
+    .registerWorkbenchContribution(DirtyDiffWorkbenchController, 3 );
+const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(2894, 'View icon of the Source Control view.')));
 const viewContainer = ( (Registry.as(Extensions$1.ViewContainersRegistry))).registerViewContainer({
     id: VIEWLET_ID,
-    title: ( localize2(2871, 'Source Control')),
+    title: ( localize2(2895, 'Source Control')),
     ctorDescriptor: ( (new SyncDescriptor(SCMViewPaneContainer))),
     storageId: 'workbench.scm.views.state',
     icon: sourceControlViewIcon,
     alwaysUseContainerInfo: true,
     order: 2,
     hideIfEmpty: true,
-}, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
+}, 0 , { doNotRegisterOpenCommand: true });
 const viewsRegistry = ( (Registry.as(Extensions$1.ViewsRegistry)));
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
-    content: ( localize(2872, "No source control providers registered.")),
+    content: ( localize(2896, "No source control providers registered.")),
     when: 'default'
 });
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
     content: ( localize(
-        2873,
+        2897,
         "None of the registered source control providers work in Restricted Mode."
     )),
     when: ( (ContextKeyExpr.and(
@@ -73,94 +73,103 @@ viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
     )))
 });
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
-    content: `[${( localize(2874, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
+    content: `[${( localize(2898, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('scm.providerCount', 0)),
         WorkspaceTrustContext.IsEnabled,
          (WorkspaceTrustContext.IsTrusted.toNegated())
     )))
 });
+viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
+    content: ( localize(
+        2899,
+        "The selected source control provider does not have any source control history items."
+    )),
+    when: ( (ContextKeys.SCMHistoryItemCount.isEqualTo(0)))
+});
+viewsRegistry.registerViews([{
+        id: REPOSITORIES_VIEW_PANE_ID,
+        name: ( localize2(2900, "Source Control Repositories")),
+        ctorDescriptor: ( (new SyncDescriptor(SCMRepositoriesViewPane))),
+        canToggleVisibility: true,
+        hideByDefault: true,
+        canMoveView: true,
+        weight: 20,
+        order: 0,
+        when: ( (ContextKeyExpr.and(
+             (ContextKeyExpr.has('scm.providerCount')),
+             (ContextKeyExpr.notEquals('scm.providerCount', 0))
+        ))),
+        containerIcon: sourceControlViewIcon
+    }], viewContainer);
 viewsRegistry.registerViews([{
         id: VIEW_PANE_ID,
-        name: ( localize2(2871, 'Source Control')),
+        name: ( localize2(2895, 'Source Control')),
         ctorDescriptor: ( (new SyncDescriptor(SCMViewPane))),
         canToggleVisibility: true,
         canMoveView: true,
         weight: 40,
-        order: -999,
+        order: 1,
         containerIcon: sourceControlViewIcon,
         openCommandActionDescriptor: {
             id: viewContainer.id,
-            mnemonicTitle: ( localize(2875, "Source &&Control")),
+            mnemonicTitle: ( localize(2901, "Source &&Control")),
             keybindings: {
                 primary: 0,
-                win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
-                linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
-                mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KeyG },
+                win: { primary: 2048  | 1024  | 37  },
+                linux: { primary: 2048  | 1024  | 37  },
+                mac: { primary: 256  | 1024  | 37  },
             },
             order: 2,
         }
     }], viewContainer);
-viewsRegistry.registerViews([{
-        id: REPOSITORIES_VIEW_PANE_ID,
-        name: ( localize2(2876, "Source Control Repositories")),
-        ctorDescriptor: ( (new SyncDescriptor(SCMRepositoriesViewPane))),
-        canToggleVisibility: true,
-        hideByDefault: true,
-        canMoveView: true,
-        weight: 20,
-        order: -1000,
-        when: ( (ContextKeyExpr.and(
-             (ContextKeyExpr.has('scm.providerCount')),
-             (ContextKeyExpr.notEquals('scm.providerCount', 0))
-        ))),
-        containerIcon: sourceControlViewIcon
-    }], viewContainer);
 viewsRegistry.registerViews([{
         id: HISTORY_VIEW_PANE_ID,
-        name: ( localize2(2877, "Source Control Graph")),
+        name: ( localize2(2902, "Source Control Graph")),
         ctorDescriptor: ( (new SyncDescriptor(SCMHistoryViewPane))),
         canToggleVisibility: true,
         canMoveView: true,
         weight: 40,
         order: 2,
         when: ( (ContextKeyExpr.and(
+        (ContextKeyExpr.and(
              (ContextKeyExpr.has('scm.providerCount')),
              (ContextKeyExpr.notEquals('scm.providerCount', 0))
-        ))),
+        )),
+        ( (ContextKeyExpr.and(IsWebContext,  (RemoteNameContext.isEqualTo('')))))?.negate()))),
         containerIcon: sourceControlViewIcon
     }], viewContainer);
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(SCMActiveRepositoryController, LifecyclePhase.Restored);
+    .registerWorkbenchContribution(SCMActiveRepositoryController, 3 );
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(SCMActiveResourceContextKeyController, LifecyclePhase.Restored);
-registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetController, WorkbenchPhase.AfterRestored);
+    .registerWorkbenchContribution(SCMActiveResourceContextKeyController, 3 );
+registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetController, 3 );
 ( (Registry.as(Extensions$2.Configuration))).registerConfiguration({
     id: 'scm',
     order: 5,
-    title: ( localize(2878, "Source Control")),
+    title: ( localize(2903, "Source Control")),
     type: 'object',
-    scope: ConfigurationScope.RESOURCE,
+    scope: 4 ,
     properties: {
         'scm.diffDecorations': {
             type: 'string',
             enum: ['all', 'gutter', 'overview', 'minimap', 'none'],
             enumDescriptions: [
-                ( 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."))
+                ( localize(2904, "Show the diff decorations in all available locations.")),
+                ( localize(2905, "Show the diff decorations only in the editor gutter.")),
+                ( localize(2906, "Show the diff decorations only in the overview ruler.")),
+                ( localize(2907, "Show the diff decorations only in the minimap.")),
+                ( localize(2908, "Do not show the diff decorations."))
             ],
             default: 'all',
-            description: ( localize(2884, "Controls diff decorations in the editor."))
+            description: ( localize(2909, "Controls diff decorations in the editor."))
         },
         'scm.diffDecorationsGutterWidth': {
             type: 'number',
             enum: [1, 2, 3, 4, 5],
             default: 3,
             description: ( localize(
-                2885,
+                2910,
                 "Controls the width(px) of diff decorations in gutter (added & modified)."
             ))
         },
@@ -168,11 +177,11 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['always', 'hover'],
             enumDescriptions: [
-                ( localize(2886, "Show the diff decorator in the gutter at all times.")),
-                ( localize(2887, "Show the diff decorator in the gutter only on hover."))
+                ( localize(2911, "Show the diff decorator in the gutter at all times.")),
+                ( localize(2912, "Show the diff decorator in the gutter only on hover."))
             ],
             description: ( localize(
-                2888,
+                2913,
                 "Controls the visibility of the Source Control diff decorator in the gutter."
             )),
             default: 'always'
@@ -181,27 +190,27 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['diff', 'none'],
             enumDescriptions: [
-                ( localize(2889, "Show the inline diff Peek view on click.")),
-                ( localize(2890, "Do nothing."))
+                ( localize(2914, "Show the inline diff Peek view on click.")),
+                ( localize(2915, "Do nothing."))
             ],
-            description: ( localize(2891, "Controls the behavior of Source Control diff gutter decorations.")),
+            description: ( localize(2916, "Controls the behavior of Source Control diff gutter decorations.")),
             default: 'diff'
         },
         'scm.diffDecorationsGutterPattern': {
             type: 'object',
             description: ( localize(
-                2892,
+                2917,
                 "Controls whether a pattern is used for the diff decorations in gutter."
             )),
             additionalProperties: false,
             properties: {
                 'added': {
                     type: 'boolean',
-                    description: ( localize(2893, "Use pattern for the diff decorations in gutter for added lines.")),
+                    description: ( localize(2918, "Use pattern for the diff decorations in gutter for added lines.")),
                 },
                 'modified': {
                     type: 'boolean',
-                    description: ( localize(2894, "Use pattern for the diff decorations in gutter for modified lines.")),
+                    description: ( localize(2919, "Use pattern for the diff decorations in gutter for modified lines.")),
                 },
             },
             default: {
@@ -213,12 +222,12 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['true', 'false', 'inherit'],
             enumDescriptions: [
-                ( localize(2895, "Ignore leading and trailing whitespace.")),
-                ( localize(2896, "Do not ignore leading and trailing whitespace.")),
-                ( localize(2897, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
+                ( localize(2920, "Ignore leading and trailing whitespace.")),
+                ( localize(2921, "Do not ignore leading and trailing whitespace.")),
+                ( localize(2922, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
             ],
             description: ( localize(
-                2898,
+                2923,
                 "Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
             )),
             default: 'false'
@@ -226,7 +235,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.alwaysShowActions': {
             type: 'boolean',
             description: ( localize(
-                2899,
+                2924,
                 "Controls whether inline actions are always visible in the Source Control view."
             )),
             default: false
@@ -235,12 +244,12 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['all', 'focused', 'off'],
             enumDescriptions: [
-                ( 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."))
+                ( localize(2925, "Show the sum of all Source Control Provider count badges.")),
+                ( localize(2926, "Show the count badge of the focused Source Control Provider.")),
+                ( localize(2927, "Disable the Source Control count badge."))
             ],
             description: ( localize(
-                2903,
+                2928,
                 "Controls the count badge on the Source Control icon on the Activity Bar."
             )),
             default: 'all'
@@ -249,12 +258,12 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['hidden', 'auto', 'visible'],
             enumDescriptions: [
-                ( 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."))
+                ( localize(2929, "Hide Source Control Provider count badges.")),
+                ( localize(2930, "Only show count badge for Source Control Provider when non-zero.")),
+                ( localize(2931, "Show Source Control Provider count badges."))
             ],
             markdownDescription: ( localize(
-                2907,
+                2932,
                 "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#\`'
             )),
@@ -264,22 +273,22 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['tree', 'list'],
             enumDescriptions: [
-                ( localize(2908, "Show the repository changes as a tree.")),
-                ( localize(2909, "Show the repository changes as a list."))
+                ( localize(2933, "Show the repository changes as a tree.")),
+                ( localize(2934, "Show the repository changes as a list."))
             ],
-            description: ( localize(2910, "Controls the default Source Control repository view mode.")),
+            description: ( localize(2935, "Controls the default Source Control repository view mode.")),
             default: 'list'
         },
         'scm.defaultViewSortKey': {
             type: 'string',
             enum: ['name', 'path', 'status'],
             enumDescriptions: [
-                ( 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."))
+                ( localize(2936, "Sort the repository changes by file name.")),
+                ( localize(2937, "Sort the repository changes by path.")),
+                ( localize(2938, "Sort the repository changes by Source Control status."))
             ],
             description: ( localize(
-                2914,
+                2939,
                 "Controls the default Source Control repository changes sort order when viewed as a list."
             )),
             default: 'path'
@@ -287,7 +296,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.autoReveal': {
             type: 'boolean',
             description: ( localize(
-                2915,
+                2940,
                 "Controls whether the Source Control view should automatically reveal and select files when opening them."
             )),
             default: true
@@ -295,20 +304,20 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.inputFontFamily': {
             type: 'string',
             markdownDescription: ( localize(
-                2916,
+                2941,
                 "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(2917, "Controls the font size for the input message in pixels.")),
+            markdownDescription: ( localize(2942, "Controls the font size for the input message in pixels.")),
             default: 13
         },
         'scm.inputMaxLineCount': {
             type: 'number',
             markdownDescription: ( localize(
-                2918,
+                2943,
                 "Controls the maximum number of lines that the input will auto-grow to."
             )),
             minimum: 1,
@@ -318,7 +327,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.inputMinLineCount': {
             type: 'number',
             markdownDescription: ( localize(
-                2919,
+                2944,
                 "Controls the minimum number of lines that the input will auto-grow from."
             )),
             minimum: 1,
@@ -328,7 +337,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.alwaysShowRepositories': {
             type: 'boolean',
             markdownDescription: ( localize(
-                2920,
+                2945,
                 "Controls whether repositories should always be visible in the Source Control view."
             )),
             default: false
@@ -338,20 +347,20 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             enum: ['discovery time', 'name', 'path'],
             enumDescriptions: [
                 ( localize(
-                    2921,
+                    2946,
                     "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(
-                    2922,
+                    2947,
                     "Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
                 )),
                 ( localize(
-                    2923,
+                    2948,
                     "Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
                 ))
             ],
             description: ( localize(
-                2924,
+                2949,
                 "Controls the sort order of the repositories in the source control repositories view."
             )),
             default: 'discovery time'
@@ -359,7 +368,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.repositories.visible': {
             type: 'number',
             description: ( localize(
-                2925,
+                2950,
                 "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
@@ -367,7 +376,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.showActionButton': {
             type: 'boolean',
             markdownDescription: ( localize(
-                2926,
+                2951,
                 "Controls whether an action button can be shown in the Source Control view."
             )),
             default: true
@@ -375,7 +384,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.showInputActionButton': {
             type: 'boolean',
             markdownDescription: ( localize(
-                2927,
+                2952,
                 "Controls whether an action button can be shown in the Source Control input."
             )),
             default: true
@@ -383,7 +392,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.workingSets.enabled': {
             type: 'boolean',
             description: ( localize(
-                2928,
+                2953,
                 "Controls whether to store editor working sets when switching between source control history item groups."
             )),
             default: false
@@ -393,16 +402,16 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             enum: ['empty', 'current'],
             enumDescriptions: [
                 ( localize(
-                    2929,
+                    2954,
                     "Use an empty working set when switching to a source control history item group that does not have a working set."
                 )),
                 ( localize(
-                    2930,
+                    2955,
                     "Use the current working set when switching to a source control history item group that does not have a working set."
                 ))
             ],
             description: ( localize(
-                2931,
+                2956,
                 "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'
@@ -410,19 +419,56 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.compactFolders': {
             type: 'boolean',
             description: ( localize(
-                2932,
+                2957,
                 "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
+        },
+        'scm.graph.pageOnScroll': {
+            type: 'boolean',
+            description: ( localize(
+                2958,
+                "Controls whether the Source Control Graph view will load the next page of items when you scroll to the end of the list."
+            )),
+            default: true
+        },
+        'scm.graph.pageSize': {
+            type: 'number',
+            description: ( localize(
+                2959,
+                "The number of items to show in the Source Control Graph view by default and when loading more items."
+            )),
+            minimum: 1,
+            maximum: 1000,
+            default: 50
+        },
+        'scm.graph.badges': {
+            type: 'string',
+            enum: ['all', 'filter'],
+            enumDescriptions: [
+                ( localize(
+                    2960,
+                    "Show badges of all history item groups in the Source Control Graph view."
+                )),
+                ( localize(
+                    2961,
+                    "Show only the badges of history item groups used as a filter in the Source Control Graph view."
+                ))
+            ],
+            description: ( localize(
+                2962,
+                "Controls which badges are shown in the Source Control Graph view. The badges are shown on the right side of the graph indicating the names of history item groups."
+            )),
+            default: 'filter'
         }
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'scm.acceptInput',
-    metadata: { description: ( localize(2933, "Source Control: Accept Input")), args: [] },
-    weight: KeybindingWeight.WorkbenchContrib,
+    metadata: { description: ( localize(2963, "Source Control: Accept Input")), args: [] },
+    weight: 200 ,
     when: ( (ContextKeyExpr.has('scmRepository'))),
-    primary: KeyMod.CtrlCmd | KeyCode.Enter,
+    primary: 2048  | 3 ,
     handler: accessor => {
         const contextKeyService = accessor.get(IContextKeyService);
         const context = contextKeyService.getContext(getActiveElement());
@@ -443,12 +489,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'scm.clearInput',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.has('scmRepository')),
          (Context.Visible.toNegated())
     ))),
-    primary: KeyCode.Escape,
+    primary: 9 ,
     handler: async (accessor) => {
         const scmService = accessor.get(ISCMService);
         const contextKeyService = accessor.get(IContextKeyService);
@@ -459,8 +505,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 const viewNextCommitCommand = {
-    description: { description: ( localize(2934, "Source Control: View Next Commit")), args: [] },
-    weight: KeybindingWeight.WorkbenchContrib,
+    description: { description: ( localize(2964, "Source Control: View Next Commit")), args: [] },
+    weight: 200 ,
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
         const scmService = accessor.get(ISCMService);
@@ -471,8 +517,8 @@ const viewNextCommitCommand = {
     }
 };
 const viewPreviousCommitCommand = {
-    description: { description: ( localize(2935, "Source Control: View Previous Commit")), args: [] },
-    weight: KeybindingWeight.WorkbenchContrib,
+    description: { description: ( localize(2965, "Source Control: View Previous Commit")), args: [] },
+    weight: 200 ,
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
         const scmService = accessor.get(ISCMService);
@@ -490,7 +536,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
          (ContextKeyExpr.has('scmInputIsInLastPosition')),
          (Context.Visible.toNegated())
     ))),
-    primary: KeyCode.DownArrow
+    primary: 18
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     ...viewPreviousCommitCommand,
@@ -500,19 +546,19 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
          (ContextKeyExpr.has('scmInputIsInFirstPosition')),
          (Context.Visible.toNegated())
     ))),
-    primary: KeyCode.UpArrow
+    primary: 16
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     ...viewNextCommitCommand,
     id: 'scm.forceViewNextCommit',
     when: ( (ContextKeyExpr.has('scmRepository'))),
-    primary: KeyMod.Alt | KeyCode.DownArrow
+    primary: 512  | 18
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     ...viewPreviousCommitCommand,
     id: 'scm.forceViewPreviousCommit',
     when: ( (ContextKeyExpr.has('scmRepository'))),
-    primary: KeyMod.Alt | KeyCode.UpArrow
+    primary: 512  | 16
 });
 CommandsRegistry.registerCommand('scm.openInIntegratedTerminal', async (accessor, ...providers) => {
     if (!providers || providers.length === 0) {
@@ -548,7 +594,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
     group: '100_end',
     command: {
         id: 'scm.openInTerminal',
-        title: ( localize(2936, "Open in External Terminal"))
+        title: ( localize(2966, "Open in External Terminal"))
     },
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('scmProviderHasRootUri', true)),
@@ -562,7 +608,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
     group: '100_end',
     command: {
         id: 'scm.openInIntegratedTerminal',
-        title: ( localize(2937, "Open in Integrated Terminal"))
+        title: ( localize(2967, "Open in Integrated Terminal"))
     },
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('scmProviderHasRootUri', true)),
@@ -574,7 +620,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.scm.action.focusPreviousInput',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: ( (ContextKeys.RepositoryVisibilityCount.notEqualsTo(0))),
     handler: async (accessor) => {
         const viewsService = accessor.get(IViewsService);
@@ -586,7 +632,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.scm.action.focusNextInput',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: ( (ContextKeys.RepositoryVisibilityCount.notEqualsTo(0))),
     handler: async (accessor) => {
         const viewsService = accessor.get(IViewsService);
@@ -598,7 +644,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.scm.action.focusPreviousResourceGroup',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     handler: async (accessor) => {
         const viewsService = accessor.get(IViewsService);
         const scmView = await viewsService.openView(VIEW_PANE_ID);
@@ -609,7 +655,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.scm.action.focusNextResourceGroup',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     handler: async (accessor) => {
         const viewsService = accessor.get(IViewsService);
         const scmView = await viewsService.openView(VIEW_PANE_ID);
@@ -618,3 +664,6 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         }
     }
 });
+( (registerSingleton(ISCMService, SCMService, 1 )));
+( (registerSingleton(ISCMViewService, SCMViewService, 1 )));
+( (registerSingleton(IQuickDiffService, QuickDiffService, 1 )));