@codingame/monaco-vscode-scm-service-override 7.1.0 → 7.1.1

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

@@ -18,7 +18,7 @@ import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/comma
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { MenuItemAction, MenuId, MenuRegistry, Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
-import { ActionRunner, Action, Separator } from 'vscode/vscode/vs/base/common/actions';
+import { ActionRunner, Action, toAction, Separator } from 'vscode/vscode/vs/base/common/actions';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { registerThemingParticipant } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
@@ -35,11 +35,10 @@ import { comparePaths, compareFileNames } from 'vscode/vscode/vs/base/common/com
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
 import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
-import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
 import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { getSimpleEditorOptions } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
@@ -98,28 +97,32 @@ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
 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 { WorkbenchToolBar, MenuWorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
+import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { DropdownWithPrimaryActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
 import { clamp, rot } from 'vscode/vscode/vs/base/common/numbers';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
+import { WorkbenchHoverDelegate } from 'vscode/vscode/vs/platform/hover/browser/hover';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { OpenScmGroupAction } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
 import { HoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverController';
-import 'vscode/vscode/vs/base/common/arrays';
+import { equals } from 'vscode/vscode/vs/base/common/arrays';
 import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
-import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
-import { renderSCMHistoryItemGraph, toISCMHistoryItemViewModelArray } from './scmHistory.js';
+import { getDefaultHoverDelegate, createInstantHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
+import { renderSCMHistoryItemGraph, historyItemGroupLocal, historyItemGroupRemote, historyItemGroupBase, historyItemGroupHoverLabelForeground, toISCMHistoryItemViewModelArray } from './scmHistory.js';
+import { PlaceholderTextContribution } from 'vscode/vscode/vs/editor/contrib/placeholderText/browser/placeholderTextContribution';
+import { HoverPosition } from 'vscode/vscode/vs/base/browser/ui/hover/hoverWidget';
+import { Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
+import { fromNow } from 'vscode/vscode/vs/base/common/date';
 
 var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1, HistoryItemGroupRenderer_1, HistoryItemRenderer_1, HistoryItem2Renderer_1, HistoryItemChangeRenderer_1, SeparatorRenderer_1, SCMInputWidget_1;
-const _moduleId = "vs/workbench/contrib/scm/browser/scmViewPane";
-registerColor('scm.historyItemAdditionsForeground', 'gitDecoration.addedResourceForeground', ( localizeWithPath(_moduleId, 0, "History item additions foreground color.")));
-registerColor('scm.historyItemDeletionsForeground', 'gitDecoration.deletedResourceForeground', ( localizeWithPath(_moduleId, 1, "History item deletions foreground color.")));
-registerColor('scm.historyItemStatisticsBorder', ( (transparent(foreground, 0.2))), ( localizeWithPath(_moduleId, 2, "History item statistics border color.")));
-registerColor('scm.historyItemSelectedStatisticsBorder', ( (transparent(listActiveSelectionForeground, 0.2))), ( localizeWithPath(_moduleId, 3, "History item selected statistics border color.")));
+const historyItemAdditionsForeground = registerColor('scm.historyItemAdditionsForeground', 'gitDecoration.addedResourceForeground', ( localize(6360, "History item additions foreground color.")));
+const historyItemDeletionsForeground = registerColor('scm.historyItemDeletionsForeground', 'gitDecoration.deletedResourceForeground', ( localize(6361, "History item deletions foreground color.")));
+registerColor('scm.historyItemStatisticsBorder', ( (transparent(foreground, 0.2))), ( localize(6362, "History item statistics border color.")));
+registerColor('scm.historyItemSelectedStatisticsBorder', ( (transparent(listActiveSelectionForeground, 0.2))), ( localize(6363, "History item selected statistics border color.")));
 function processResourceFilterData(uri, filterData) {
     if (!filterData) {
         return [undefined, undefined];
@@ -664,6 +667,68 @@ class HistoryItemActionRunner extends ActionRunner {
         await action.run(...args);
     }
 }
+class HistoryItemActionRunner2 extends ActionRunner {
+    constructor(getSelectedHistoryItems) {
+        super();
+        this.getSelectedHistoryItems = getSelectedHistoryItems;
+    }
+    async runAction(action, context) {
+        if (!(action instanceof MenuItemAction)) {
+            return super.runAction(action, context);
+        }
+        const args = [];
+        args.push(context.repository.provider);
+        const selection = this.getSelectedHistoryItems();
+        const contextIsSelected = ( (selection.some(s => s === context)));
+        if (contextIsSelected && selection.length > 1) {
+            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,
+            })))));
+        }
+        else {
+            args.push({
+                id: context.historyItemViewModel.historyItem.id,
+                parentIds: context.historyItemViewModel.historyItem.parentIds,
+                message: context.historyItemViewModel.historyItem.message,
+                author: context.historyItemViewModel.historyItem.author,
+                icon: context.historyItemViewModel.historyItem.icon,
+                timestamp: context.historyItemViewModel.historyItem.timestamp,
+                statistics: context.historyItemViewModel.historyItem.statistics,
+            });
+        }
+        await action.run(...args);
+    }
+}
+let HistoryItemHoverDelegate = class HistoryItemHoverDelegate extends WorkbenchHoverDelegate {
+    constructor(viewContainerLocation, sideBarPosition, configurationService, hoverService) {
+        super('element', true, () => this.getHoverOptions(), configurationService, hoverService);
+        this.viewContainerLocation = viewContainerLocation;
+        this.sideBarPosition = sideBarPosition;
+    }
+    getHoverOptions() {
+        let hoverPosition;
+        if (this.viewContainerLocation === ViewContainerLocation.Sidebar) {
+            hoverPosition = this.sideBarPosition === Position.LEFT ? HoverPosition.RIGHT : HoverPosition.LEFT;
+        }
+        else if (this.viewContainerLocation === ViewContainerLocation.AuxiliaryBar) {
+            hoverPosition = this.sideBarPosition === Position.LEFT ? HoverPosition.LEFT : HoverPosition.RIGHT;
+        }
+        else {
+            hoverPosition = HoverPosition.RIGHT;
+        }
+        return { additionalClasses: ['history-item-hover'], position: { hoverPosition, forcePosition: true } };
+    }
+};
+HistoryItemHoverDelegate = ( (__decorate([
+    ( (__param(2, IConfigurationService))),
+    ( (__param(3, IHoverService)))
+], HistoryItemHoverDelegate)));
 let HistoryItemRenderer = class HistoryItemRenderer {
     static { HistoryItemRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'history-item'; }
@@ -744,18 +809,12 @@ let HistoryItemRenderer = class HistoryItemRenderer {
         if (historyItem.statistics) {
             const statsAriaLabel = [
                 historyItem.statistics.files === 1 ?
-                    ( localizeWithPath(_moduleId, 4, "{0} file changed", historyItem.statistics.files)) :
-                    ( localizeWithPath(_moduleId, 5, "{0} files changed", historyItem.statistics.files)),
-                historyItem.statistics.insertions === 1 ? ( localizeWithPath(_moduleId, 6, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
-                    historyItem.statistics.insertions > 1 ? ( localizeWithPath(
-                        _moduleId,
-                        7,
-                        "{0} insertions{1}",
-                        historyItem.statistics.insertions,
-                        '(+)'
-                    )) : '',
-                historyItem.statistics.deletions === 1 ? ( localizeWithPath(_moduleId, 8, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
-                    historyItem.statistics.deletions > 1 ? ( localizeWithPath(_moduleId, 9, "{0} deletions{1}", historyItem.statistics.deletions, '(-)')) : ''
+                    ( localize(6364, "{0} file changed", historyItem.statistics.files)) :
+                    ( localize(6365, "{0} files changed", historyItem.statistics.files)),
+                historyItem.statistics.insertions === 1 ? ( localize(6366, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
+                    historyItem.statistics.insertions > 1 ? ( localize(6367, "{0} insertions{1}", historyItem.statistics.insertions, '(+)')) : '',
+                historyItem.statistics.deletions === 1 ? ( localize(6368, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
+                    historyItem.statistics.deletions > 1 ? ( localize(6369, "{0} deletions{1}", historyItem.statistics.deletions, '(-)')) : ''
             ];
             const statsTitle = statsAriaLabel.filter(l => l !== '').join(', ');
             templateData.statsContainer.setAttribute('aria-label', statsTitle);
@@ -783,8 +842,10 @@ let HistoryItem2Renderer = class HistoryItem2Renderer {
     static { HistoryItem2Renderer_1 = this; }
     static { this.TEMPLATE_ID = 'history-item-2'; }
     get templateId() { return HistoryItem2Renderer_1.TEMPLATE_ID; }
-    constructor(hoverService) {
+    constructor(hoverDelegate, hoverService, themeService) {
+        this.hoverDelegate = hoverDelegate;
         this.hoverService = hoverService;
+        this.themeService = themeService;
     }
     renderTemplate(container) {
         container.parentElement.parentElement.querySelector('.monaco-tl-twistie').classList.add('force-no-twistie');
@@ -796,23 +857,27 @@ let HistoryItem2Renderer = class HistoryItem2Renderer {
         )));
         const labelContainer = append(element, $('.label-container'));
         element.appendChild(labelContainer);
-        return { graphContainer, label: iconLabel, labelContainer, elementDisposables: ( (new DisposableStore())), disposables: ( (new DisposableStore())) };
+        return { element, graphContainer, label: iconLabel, labelContainer, elementDisposables: ( (new DisposableStore())), disposables: ( (new DisposableStore())) };
     }
     renderElement(node, index, templateData, height) {
         const historyItemViewModel = node.element.historyItemViewModel;
         const historyItem = historyItemViewModel.historyItem;
+        const historyItemHover = this.hoverService.setupManagedHover(this.hoverDelegate, templateData.element, this.getTooltip(node.element));
+        templateData.elementDisposables.add(historyItemHover);
         templateData.graphContainer.textContent = '';
         templateData.graphContainer.appendChild(renderSCMHistoryItemGraph(historyItemViewModel));
-        const title = this.getTooltip(historyItemViewModel);
         const [matches, descriptionMatches] = this.processMatches(historyItemViewModel, node.filterData);
-        templateData.label.setLabel(historyItem.message, undefined, { title, matches, descriptionMatches });
+        templateData.label.setLabel(historyItem.message, historyItem.author, { matches, descriptionMatches });
         templateData.labelContainer.textContent = '';
         if (historyItem.labels) {
+            const instantHoverDelegate = createInstantHoverDelegate();
+            templateData.elementDisposables.add(instantHoverDelegate);
             for (const label of historyItem.labels) {
                 if (label.icon && ThemeIcon.isThemeIcon(label.icon)) {
                     const icon = append(templateData.labelContainer, $('div.label'));
                     icon.classList.add(...ThemeIcon.asClassNameArray(label.icon));
-                    templateData.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), icon, label.title));
+                    const hover = this.hoverService.setupManagedHover(instantHoverDelegate, icon, label.title);
+                    templateData.elementDisposables.add(hover);
                 }
             }
         }
@@ -820,17 +885,53 @@ let HistoryItem2Renderer = class HistoryItem2Renderer {
     renderCompressedElements(node, index, templateData, height) {
         throw ( (new Error('Should never happen since node is incompressible')));
     }
-    getTooltip(historyItemViewModel) {
-        const historyItem = historyItemViewModel.historyItem;
+    getTooltip(element) {
+        const colorTheme = this.themeService.getColorTheme();
+        const historyItem = element.historyItemViewModel.historyItem;
+        const currentHistoryItemGroup = element.repository.provider.historyProvider.get()?.currentHistoryItemGroup?.get();
         const markdown = ( (new MarkdownString('', { isTrusted: true, supportThemeIcons: true })));
         if (historyItem.author) {
-            markdown.appendMarkdown(`$(account) **${historyItem.author}**\n\n`);
+            markdown.appendMarkdown(`$(account) **${historyItem.author}**`);
+            if (historyItem.timestamp) {
+                const dateFormatter = new Intl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' });
+                markdown.appendMarkdown(`, $(history) ${fromNow(historyItem.timestamp, true, true)} (${dateFormatter.format(historyItem.timestamp)})`);
+            }
+            markdown.appendMarkdown('\n\n');
         }
-        if (historyItem.timestamp) {
-            const dateFormatter = new Intl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' });
-            markdown.appendMarkdown(`$(history) ${dateFormatter.format(historyItem.timestamp)}\n\n`);
+        markdown.appendMarkdown(`${historyItem.message}\n\n`);
+        if (historyItem.statistics) {
+            markdown.appendMarkdown(`---\n\n`);
+            markdown.appendMarkdown(`<span>${historyItem.statistics.files === 1 ?
+                ( localize(6369, "{0} file changed", historyItem.statistics.files)) :
+                ( localize(6369, "{0} files changed", historyItem.statistics.files))}</span>`);
+            if (historyItem.statistics.insertions) {
+                const historyItemAdditionsForegroundColor = colorTheme.getColor(historyItemAdditionsForeground);
+                markdown.appendMarkdown(`,&nbsp;<span style="color:${historyItemAdditionsForegroundColor};">${historyItem.statistics.insertions === 1 ?
+                    ( localize(6369, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
+                    ( localize(6369, "{0} insertions{1}", historyItem.statistics.insertions, '(+)'))}</span>`);
+            }
+            if (historyItem.statistics.deletions) {
+                const historyItemDeletionsForegroundColor = colorTheme.getColor(historyItemDeletionsForeground);
+                markdown.appendMarkdown(`,&nbsp;<span style="color:${historyItemDeletionsForegroundColor};">${historyItem.statistics.deletions === 1 ?
+                    ( localize(6369, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
+                    ( localize(6369, "{0} deletions{1}", historyItem.statistics.deletions, '(-)'))}</span>`);
+            }
+        }
+        if (historyItem.labels) {
+            const historyItemGroupLocalColor = colorTheme.getColor(historyItemGroupLocal);
+            const historyItemGroupRemoteColor = colorTheme.getColor(historyItemGroupRemote);
+            const historyItemGroupBaseColor = colorTheme.getColor(historyItemGroupBase);
+            const historyItemGroupHoverLabelForegroundColor = colorTheme.getColor(historyItemGroupHoverLabelForeground);
+            markdown.appendMarkdown(`\n\n---\n\n`);
+            markdown.appendMarkdown(( (historyItem.labels.map(label => {
+                const historyItemGroupHoverLabelBackgroundColor = label.title === currentHistoryItemGroup?.name ? historyItemGroupLocalColor :
+                    label.title === currentHistoryItemGroup?.remote?.name ? historyItemGroupRemoteColor :
+                        label.title === currentHistoryItemGroup?.base?.name ? historyItemGroupBaseColor :
+                            undefined;
+                const historyItemGroupHoverLabelIconId = ThemeIcon.isThemeIcon(label.icon) ? label.icon.id : '';
+                return `<span style="color:${historyItemGroupHoverLabelForegroundColor};background-color:${historyItemGroupHoverLabelBackgroundColor};border-radius:2px;">&nbsp;$(${historyItemGroupHoverLabelIconId})&nbsp;${label.title}&nbsp;</span>`;
+            }))).join('&nbsp;&nbsp;'));
         }
-        markdown.appendMarkdown(historyItem.message);
         return { markdown, markdownNotSupportedFallback: historyItem.message };
     }
     processMatches(historyItemViewModel, filterData) {
@@ -850,7 +951,8 @@ let HistoryItem2Renderer = class HistoryItem2Renderer {
     }
 };
 HistoryItem2Renderer = HistoryItem2Renderer_1 = ( (__decorate([
-    ( (__param(0, IHoverService)))
+    ( (__param(1, IHoverService))),
+    ( (__param(2, IThemeService)))
 ], HistoryItem2Renderer)));
 let HistoryItemChangeRenderer = class HistoryItemChangeRenderer {
     static { HistoryItemChangeRenderer_1 = this; }
@@ -908,11 +1010,11 @@ let SeparatorRenderer = class SeparatorRenderer {
     static { SeparatorRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'separator'; }
     get templateId() { return SeparatorRenderer_1.TEMPLATE_ID; }
-    constructor(contextKeyService, contextMenuService, keybindingService, configurationService, commandService, menuService, telemetryService) {
+    constructor(getFilterActions, contextKeyService, contextMenuService, keybindingService, commandService, menuService, telemetryService) {
+        this.getFilterActions = getFilterActions;
         this.contextKeyService = contextKeyService;
         this.contextMenuService = contextMenuService;
         this.keybindingService = keybindingService;
-        this.configurationService = configurationService;
         this.commandService = commandService;
         this.menuService = menuService;
         this.telemetryService = telemetryService;
@@ -920,42 +1022,54 @@ let SeparatorRenderer = class SeparatorRenderer {
     renderTemplate(container) {
         container.parentElement.parentElement.querySelector('.monaco-tl-twistie').classList.add('force-no-twistie');
         container.parentElement.parentElement.classList.add('cursor-default', 'force-no-hover');
-        const disposables = ( (new DisposableStore()));
+        const templateDisposables = ( (new DisposableStore()));
         const element = append(container, $('.separator-container'));
         const label = ( (new IconLabel(element, { supportIcons: true, })));
         append(element, $('.separator'));
-        disposables.add(label);
-        if (this.configurationService.getValue('scm.experimental.showHistoryGraph') !== true) {
-            const toolBar = ( (new MenuWorkbenchToolBar(
-                append(element, $('.actions')),
-                MenuId.SCMChangesSeparator,
-                { moreIcon: Codicon.gear },
-                this.menuService,
-                this.contextKeyService,
-                this.contextMenuService,
-                this.keybindingService,
-                this.commandService,
-                this.telemetryService
-            )));
-            disposables.add(toolBar);
-        }
-        return { label, disposables };
+        templateDisposables.add(label);
+        const toolBar = ( (new WorkbenchToolBar(
+            append(element, $('.actions')),
+            undefined,
+            this.menuService,
+            this.contextKeyService,
+            this.contextMenuService,
+            this.keybindingService,
+            this.commandService,
+            this.telemetryService
+        )));
+        templateDisposables.add(toolBar);
+        return { label, toolBar, elementDisposables: ( (new DisposableStore())), templateDisposables };
     }
     renderElement(element, index, templateData, height) {
+        const provider = element.element.repository.provider;
+        const historyProvider = provider.historyProvider.get();
+        const currentHistoryItemGroup = historyProvider?.currentHistoryItemGroup.get();
         templateData.label.setLabel(element.element.label, undefined, { title: element.element.ariaLabel });
+        const contextKeyService = this.contextKeyService.createOverlay([
+            ['scmHistoryItemGroupHasRemote', !!currentHistoryItemGroup?.remote],
+        ]);
+        const menu = this.menuService.createMenu(MenuId.SCMChangesSeparator, contextKeyService);
+        templateData.elementDisposables.add(connectPrimaryMenu(menu, (primary, secondary) => {
+            secondary.push(...this.getFilterActions(element.element.repository));
+            templateData.toolBar.setActions(primary, secondary, [MenuId.SCMChangesSeparator]);
+        }));
+        templateData.toolBar.context = provider;
     }
     renderCompressedElements(node, index, templateData, height) {
         throw ( (new Error('Should never happen since node is incompressible')));
     }
+    disposeElement(node, index, templateData, height) {
+        templateData.elementDisposables.clear();
+    }
     disposeTemplate(templateData) {
-        templateData.disposables.dispose();
+        templateData.elementDisposables.dispose();
+        templateData.templateDisposables.dispose();
     }
 };
 SeparatorRenderer = SeparatorRenderer_1 = ( (__decorate([
-    ( (__param(0, IContextKeyService))),
-    ( (__param(1, IContextMenuService))),
-    ( (__param(2, IKeybindingService))),
-    ( (__param(3, IConfigurationService))),
+    ( (__param(1, IContextKeyService))),
+    ( (__param(2, IContextMenuService))),
+    ( (__param(3, IKeybindingService))),
     ( (__param(4, ICommandService))),
     ( (__param(5, IMenuService))),
     ( (__param(6, ITelemetryService)))
@@ -1227,7 +1341,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         this.labelService = labelService;
     }
     getWidgetAriaLabel() {
-        return ( localizeWithPath(_moduleId, 10, "Source Control Management"));
+        return ( localize(6370, "Source Control Management"));
     }
     getAriaLabel(element) {
         if (ResourceTree.isResourceNode(element)) {
@@ -1237,7 +1351,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
             return `${element.provider.name} ${element.provider.label}`;
         }
         else if (isSCMInput(element)) {
-            return ( localizeWithPath(_moduleId, 11, "Source Control Input"));
+            return ( localize(6371, "Source Control Input"));
         }
         else if (isSCMActionButton(element)) {
             return element.button?.command.title ?? '';
@@ -1316,7 +1430,7 @@ const ContextKeys = {
     }
 };
 MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
-    title: ( localizeWithPath(_moduleId, 12, "View & Sort")),
+    title: ( localize(6372, "View & Sort")),
     submenu: Menus.ViewSort,
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
@@ -1326,18 +1440,18 @@ MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
     order: 1
 });
 MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
-    title: ( localizeWithPath(_moduleId, 13, "Incoming & Outgoing")),
+    title: ( localize(6373, "Incoming & Outgoing")),
     submenu: Menus.ChangesSettings,
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
          (ContextKeys.RepositoryCount.notEqualsTo(0)),
-         (( (ContextKeyExpr.equals('config.scm.experimental.showHistoryGraph', true))).negate())
+         (( (ContextKeyExpr.equals('config.scm.showHistoryGraph', true))).negate())
     ))),
     group: '0_view&sort',
     order: 2
 });
 MenuRegistry.appendMenuItem(Menus.ViewSort, {
-    title: ( localizeWithPath(_moduleId, 14, "Repositories")),
+    title: ( localize(6374, "Repositories")),
     submenu: Menus.Repositories,
     when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
     group: '0_repositories'
@@ -1358,22 +1472,24 @@ class SCMChangesSettingAction extends Action2 {
     }
 }
 MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
-    title: ( localizeWithPath(_moduleId, 15, "Show Incoming Changes")),
+    title: ( localize(6375, "Show Incoming Changes")),
     submenu: MenuId.SCMIncomingChangesSetting,
     group: '1_incoming&outgoing',
-    order: 1
+    order: 1,
+    when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
 });
 MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
-    title: ( localizeWithPath(_moduleId, 15, "Show Incoming Changes")),
+    title: ( localize(6375, "Show Incoming Changes")),
     submenu: MenuId.SCMIncomingChangesSetting,
     group: '1_incoming&outgoing',
-    order: 1
+    order: 1,
+    when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
 });
 registerAction2(class extends SCMChangesSettingAction {
     constructor() {
         super('scm.showIncomingChanges', 'always', {
             id: 'workbench.scm.action.showIncomingChanges.always',
-            title: ( localizeWithPath(_moduleId, 16, "Always")),
+            title: ( localize(6376, "Always")),
             menu: { id: MenuId.SCMIncomingChangesSetting },
         });
     }
@@ -1382,7 +1498,7 @@ registerAction2(class extends SCMChangesSettingAction {
     constructor() {
         super('scm.showIncomingChanges', 'auto', {
             id: 'workbench.scm.action.showIncomingChanges.auto',
-            title: ( localizeWithPath(_moduleId, 17, "Auto")),
+            title: ( localize(6377, "Auto")),
             menu: {
                 id: MenuId.SCMIncomingChangesSetting,
             }
@@ -1393,7 +1509,7 @@ registerAction2(class extends SCMChangesSettingAction {
     constructor() {
         super('scm.showIncomingChanges', 'never', {
             id: 'workbench.scm.action.showIncomingChanges.never',
-            title: ( localizeWithPath(_moduleId, 18, "Never")),
+            title: ( localize(6378, "Never")),
             menu: {
                 id: MenuId.SCMIncomingChangesSetting,
             }
@@ -1401,22 +1517,24 @@ registerAction2(class extends SCMChangesSettingAction {
     }
 });
 MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
-    title: ( localizeWithPath(_moduleId, 19, "Show Outgoing Changes")),
+    title: ( localize(6379, "Show Outgoing Changes")),
     submenu: MenuId.SCMOutgoingChangesSetting,
     group: '1_incoming&outgoing',
-    order: 2
+    order: 2,
+    when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
 });
 MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
-    title: ( localizeWithPath(_moduleId, 19, "Show Outgoing Changes")),
+    title: ( localize(6379, "Show Outgoing Changes")),
     submenu: MenuId.SCMOutgoingChangesSetting,
     group: '1_incoming&outgoing',
-    order: 2
+    order: 2,
+    when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
 });
 registerAction2(class extends SCMChangesSettingAction {
     constructor() {
         super('scm.showOutgoingChanges', 'always', {
             id: 'workbench.scm.action.showOutgoingChanges.always',
-            title: ( localizeWithPath(_moduleId, 16, "Always")),
+            title: ( localize(6379, "Always")),
             menu: {
                 id: MenuId.SCMOutgoingChangesSetting,
             }
@@ -1427,7 +1545,7 @@ registerAction2(class extends SCMChangesSettingAction {
     constructor() {
         super('scm.showOutgoingChanges', 'auto', {
             id: 'workbench.scm.action.showOutgoingChanges.auto',
-            title: ( localizeWithPath(_moduleId, 17, "Auto")),
+            title: ( localize(6379, "Auto")),
             menu: {
                 id: MenuId.SCMOutgoingChangesSetting,
             }
@@ -1438,7 +1556,7 @@ registerAction2(class extends SCMChangesSettingAction {
     constructor() {
         super('scm.showOutgoingChanges', 'never', {
             id: 'workbench.scm.action.showOutgoingChanges.never',
-            title: ( localizeWithPath(_moduleId, 18, "Never")),
+            title: ( localize(6379, "Never")),
             menu: {
                 id: MenuId.SCMOutgoingChangesSetting,
             }
@@ -1449,12 +1567,20 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.scm.action.scm.showChangesSummary',
-            title: ( localizeWithPath(_moduleId, 20, "Show Changes Summary")),
+            title: ( localize(6380, "Show Changes Summary")),
             f1: false,
             toggled: ( (ContextKeyExpr.equals('config.scm.showChangesSummary', true))),
             menu: [
-                { id: MenuId.SCMChangesSeparator, order: 3 },
-                { id: Menus.ChangesSettings, order: 3 },
+                {
+                    id: MenuId.SCMChangesSeparator,
+                    order: 3,
+                    when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
+                },
+                {
+                    id: Menus.ChangesSettings,
+                    order: 3,
+                    when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
+                },
             ]
         });
     }
@@ -1464,6 +1590,58 @@ registerAction2(class extends Action2 {
         configurationService.updateValue('scm.showChangesSummary', !configValue);
     }
 });
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'workbench.scm.action.scm.viewChanges',
+            title: ( localize(6381, "View Changes")),
+            f1: false,
+            menu: [
+                {
+                    id: MenuId.SCMChangesContext,
+                    group: '0_view',
+                    when: ( (ContextKeyExpr.equals('config.multiDiffEditor.experimental.enabled', true)))
+                }
+            ]
+        });
+    }
+    async run(accessor, provider, ...historyItems) {
+        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(
+                6382,
+                "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 {
     constructor(repository) {
         super({
@@ -1552,7 +1730,7 @@ class SetListViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setListViewMode', menu = {}) {
         super({
             id,
-            title: ( localizeWithPath(_moduleId, 21, "View as List")),
+            title: ( localize(6383, "View as List")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listTree,
@@ -1582,7 +1760,7 @@ class SetTreeViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setTreeViewMode', menu = {}) {
         super({
             id,
-            title: ( localizeWithPath(_moduleId, 22, "View as Tree")),
+            title: ( localize(6384, "View as Tree")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listFlat,
@@ -1639,17 +1817,17 @@ class RepositorySortAction extends ViewAction {
 }
 class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.DiscoveryTime, ( localizeWithPath(_moduleId, 23, "Sort by Discovery Time")));
+        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(6385, "Sort by Discovery Time")));
     }
 }
 class RepositorySortByNameAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Name, ( localizeWithPath(_moduleId, 24, "Sort by Name")));
+        super(ISCMRepositorySortKey.Name, ( localize(6386, "Sort by Name")));
     }
 }
 class RepositorySortByPathAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Path, ( localizeWithPath(_moduleId, 25, "Sort by Path")));
+        super(ISCMRepositorySortKey.Path, ( localize(6387, "Sort by Path")));
     }
 }
 registerAction2(RepositorySortByDiscoveryTimeAction);
@@ -1674,17 +1852,17 @@ class SetSortKeyAction extends ViewAction {
 }
 class SetSortByNameAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Name, ( localizeWithPath(_moduleId, 26, "Sort Changes by Name")));
+        super(ViewSortKey.Name, ( localize(6388, "Sort Changes by Name")));
     }
 }
 class SetSortByPathAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Path, ( localizeWithPath(_moduleId, 27, "Sort Changes by Path")));
+        super(ViewSortKey.Path, ( localize(6389, "Sort Changes by Path")));
     }
 }
 class SetSortByStatusAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Status, ( localizeWithPath(_moduleId, 28, "Sort Changes by Status")));
+        super(ViewSortKey.Status, ( localize(6390, "Sort Changes by Status")));
     }
 }
 registerAction2(SetSortByNameAction);
@@ -1694,7 +1872,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.collapseAllRepositories`,
-            title: ( localizeWithPath(_moduleId, 29, "Collapse All Repositories")),
+            title: ( localize(6391, "Collapse All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.collapseAll,
@@ -1717,7 +1895,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.expandAllRepositories`,
-            title: ( localizeWithPath(_moduleId, 30, "Expand All Repositories")),
+            title: ( localize(6392, "Expand All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.expandAll,
@@ -1795,22 +1973,22 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         this._dropdownActions = [];
         this._onDidChange = ( (new Emitter()));
         this.onDidChange = this._onDidChange.event;
-        this.repositoryDisposables = ( (new DisposableStore()));
-        this._dropdownAction = ( (new Action('scmInputMoreActions', ( localizeWithPath(_moduleId, 31, "More Actions...")), 'codicon-chevron-down')));
+        this._disposables = this._register(( (new MutableDisposable())));
+        this._dropdownAction = ( (new Action('scmInputMoreActions', ( localize(6393, "More Actions...")), 'codicon-chevron-down')));
         this._cancelAction = ( (new MenuItemAction({
             id: SCMInputWidgetCommandId.CancelAction,
-            title: ( localizeWithPath(_moduleId, 32, "Cancel")),
+            title: ( localize(6394, "Cancel")),
             icon: Codicon.debugStop,
         }, undefined, undefined, undefined, undefined, contextKeyService, commandService)));
     }
     setInput(input) {
-        this.repositoryDisposables.clear();
+        this._disposables.value = ( (new DisposableStore()));
         const contextKeyService = this.contextKeyService.createOverlay([
             ['scmProvider', input.repository.provider.contextValue],
             ['scmProviderRootUri', input.repository.provider.rootUri?.toString()],
             ['scmProviderHasRootUri', !!input.repository.provider.rootUri]
         ]);
-        const menu = this.repositoryDisposables.add(this.menuService.createMenu(MenuId.SCMInputBox, contextKeyService, { emitEventsForSubmenuChanges: true }));
+        const menu = this._disposables.value.add(this.menuService.createMenu(MenuId.SCMInputBox, contextKeyService, { emitEventsForSubmenuChanges: true }));
         const isEnabled = () => {
             return (
                  (input.repository.provider.groups.some(g => g.resources.length > 0))
@@ -1835,17 +2013,17 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
             super.setActions(primaryAction ? [primaryAction] : [], []);
             this._onDidChange.fire();
         };
-        this.repositoryDisposables.add(menu.onDidChange(() => updateToolbar()));
-        this.repositoryDisposables.add(input.repository.provider.onDidChangeResources(() => updateToolbar()));
-        this.repositoryDisposables.add(this.storageService.onDidChangeValue(StorageScope.PROFILE, SCMInputWidgetStorageKey.LastActionId, this.repositoryDisposables)(() => updateToolbar()));
+        this._disposables.value.add(menu.onDidChange(() => updateToolbar()));
+        this._disposables.value.add(input.repository.provider.onDidChangeResources(() => updateToolbar()));
+        this._disposables.value.add(this.storageService.onDidChangeValue(StorageScope.PROFILE, SCMInputWidgetStorageKey.LastActionId, this._disposables.value)(() => updateToolbar()));
         this.actionRunner = ( (new SCMInputWidgetActionRunner(input, this.storageService)));
-        this.repositoryDisposables.add(this.actionRunner.onWillRun(e => {
+        this._disposables.value.add(this.actionRunner.onWillRun(e => {
             if (this.actionRunner.runningActions.size === 0) {
                 super.setActions([this._cancelAction], []);
                 this._onDidChange.fire();
             }
         }));
-        this.repositoryDisposables.add(this.actionRunner.onDidRun(e => {
+        this._disposables.value.add(this.actionRunner.onDidRun(e => {
             if (this.actionRunner.runningActions.size === 0) {
                 updateToolbar();
             }
@@ -2001,19 +2179,15 @@ let SCMInputWidget = class SCMInputWidget {
         this.repositoryDisposables.add(input.onDidChangeFocus(() => this.focus()));
         this.repositoryDisposables.add(input.onDidChangeValidationMessage((e) => this.setValidation(e, { focus: true, timeout: true })));
         this.repositoryDisposables.add(input.onDidChangeValidateInput((e) => triggerValidation()));
-        const updatePlaceholderVisibility = () => this.placeholderTextContainer.classList.toggle('hidden', textModel.getValueLength() > 0);
         this.repositoryDisposables.add(textModel.onDidChangeContent(() => {
             input.setValue(textModel.getValue(), true);
-            updatePlaceholderVisibility();
             triggerValidation();
         }));
-        updatePlaceholderVisibility();
         const updatePlaceholderText = () => {
             const binding = this.keybindingService.lookupKeybinding('scm.acceptInput');
             const label = binding ? binding.getLabel() : (isMacintosh ? 'Cmd+Enter' : 'Ctrl+Enter');
             const placeholderText = format(input.placeholder, label);
-            this.inputEditor.updateOptions({ ariaLabel: placeholderText });
-            this.placeholderTextContainer.textContent = placeholderText;
+            this.inputEditor.updateOptions({ placeholder: placeholderText });
         };
         this.repositoryDisposables.add(input.onDidChangePlaceholder(updatePlaceholderText));
         this.repositoryDisposables.add(this.keybindingService.onDidUpdateKeybindings(updatePlaceholderText));
@@ -2077,38 +2251,37 @@ let SCMInputWidget = class SCMInputWidget {
         this.shouldFocusAfterLayout = false;
         this.element = append(container, $('.scm-editor'));
         this.editorContainer = append(this.element, $('.scm-editor-container'));
-        this.placeholderTextContainer = append(this.editorContainer, $('.scm-editor-placeholder'));
         this.toolbarContainer = append(this.element, $('.scm-editor-toolbar'));
         this.contextKeyService = contextKeyService.createScoped(this.element);
         this.repositoryIdContextKey = this.contextKeyService.createKey('scmRepository', undefined);
         this.inputEditorOptions = ( (new SCMInputWidgetEditorOptions(overflowWidgetsDomNode, this.configurationService)));
         this.disposables.add(this.inputEditorOptions.onDidChange(this.onDidChangeEditorOptions, this));
         this.disposables.add(this.inputEditorOptions);
-        const editorConstructionOptions = this.inputEditorOptions.getEditorConstructionOptions();
-        this.setPlaceholderFontStyles(editorConstructionOptions.fontFamily, editorConstructionOptions.fontSize, editorConstructionOptions.lineHeight);
         const codeEditorWidgetOptions = {
-            isSimpleWidget: true,
             contributions: EditorExtensionsRegistry.getSomeEditorContributions([
+                CodeActionController.ID,
                 ColorDetector.ID,
                 ContextMenuController.ID,
-                DragAndDropController.ID,
                 CopyPasteController.ID,
+                DragAndDropController.ID,
                 DropIntoEditorController.ID,
+                EditorDictation.ID,
+                FormatOnType.ID,
+                HoverController.ID,
+                InlineCompletionsController.ID,
                 LinkDetector.ID,
                 MenuPreventer.ID,
                 MessageController.ID,
-                HoverController.ID,
+                PlaceholderTextContribution.ID,
                 SelectionClipboardContributionID,
                 SnippetController2.ID,
-                SuggestController.ID,
-                InlineCompletionsController.ID,
-                CodeActionController.ID,
-                FormatOnType.ID,
-                EditorDictation.ID,
-            ])
+                SuggestController.ID
+            ]),
+            isSimpleWidget: true
         };
         const services = ( (new ServiceCollection([IContextKeyService, this.contextKeyService])));
         const instantiationService2 = instantiationService.createChild(services, this.disposables);
+        const editorConstructionOptions = this.inputEditorOptions.getEditorConstructionOptions();
         this.inputEditor = instantiationService2.createInstance(CodeEditorWidget, this.editorContainer, editorConstructionOptions, codeEditorWidgetOptions);
         this.disposables.add(this.inputEditor);
         this.disposables.add(this.inputEditor.onDidFocusEditorText(() => {
@@ -2180,7 +2353,6 @@ let SCMInputWidget = class SCMInputWidget {
         }
         this.lastLayoutWasTrash = false;
         this.inputEditor.layout(dimension);
-        this.placeholderTextContainer.style.width = `${dimension.width}px`;
         this.renderValidation();
         const showInputActionButton = this.configurationService.getValue('scm.showInputActionButton') === true;
         this.toolbarContainer.classList.toggle('hidden', !showInputActionButton || this.toolbar?.isEmpty() === true);
@@ -2202,9 +2374,7 @@ let SCMInputWidget = class SCMInputWidget {
         return this.inputEditor.hasTextFocus();
     }
     onDidChangeEditorOptions() {
-        const editorOptions = this.inputEditorOptions.getEditorOptions();
-        this.inputEditor.updateOptions(editorOptions);
-        this.setPlaceholderFontStyles(editorOptions.fontFamily, editorOptions.fontSize, editorOptions.lineHeight);
+        this.inputEditor.updateOptions(this.inputEditorOptions.getEditorOptions());
     }
     renderValidation() {
         this.clearValidation();
@@ -2257,7 +2427,7 @@ let SCMInputWidget = class SCMInputWidget {
                 }
                 const actionsContainer = append(validationContainer, $('.scm-editor-validation-actions'));
                 const actionbar = ( (new ActionBar(actionsContainer)));
-                const action = ( (new Action('scmInputWidget.validationMessage.close', ( localizeWithPath(_moduleId, 33, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
+                const action = ( (new Action('scmInputWidget.validationMessage.close', ( localize(6395, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
                     this.contextViewService.hideContextView();
                     this.element.style.borderBottomLeftRadius = '2px';
                     this.element.style.borderBottomRightRadius = '2px';
@@ -2284,11 +2454,6 @@ let SCMInputWidget = class SCMInputWidget {
             26  :
             39 ;
     }
-    setPlaceholderFontStyles(fontFamily, fontSize, lineHeight) {
-        this.placeholderTextContainer.style.fontFamily = fontFamily;
-        this.placeholderTextContainer.style.fontSize = `${fontSize}px`;
-        this.placeholderTextContainer.style.lineHeight = `${lineHeight}px`;
-    }
     clearValidation() {
         this.validationContextView?.close();
         this.validationContextView = undefined;
@@ -2340,16 +2505,16 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             this.storageService.store(`scm.viewSortKey`, sortKey, StorageScope.WORKSPACE, StorageTarget.USER);
         }
     }
-    constructor(options, commandService, editorService, logService, menuService, scmService, scmViewService, storageService, uriIdentityService, keybindingService, themeService, contextMenuService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, telemetryService, hoverService) {
+    constructor(options, commandService, editorService, menuService, scmService, scmViewService, storageService, uriIdentityService, layoutService, keybindingService, themeService, contextMenuService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, telemetryService, hoverService) {
         super({ ...options, titleMenuId: MenuId.SCMTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.commandService = commandService;
         this.editorService = editorService;
-        this.logService = logService;
         this.menuService = menuService;
         this.scmService = scmService;
         this.scmViewService = scmViewService;
         this.storageService = storageService;
         this.uriIdentityService = uriIdentityService;
+        this.layoutService = layoutService;
         this._onDidChangeViewMode = ( (new Emitter()));
         this.onDidChangeViewMode = this._onDidChangeViewMode.event;
         this._onDidChangeViewSortKey = ( (new Emitter()));
@@ -2433,10 +2598,13 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
                     Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.inputMinLineCount') ||
                         e.affectsConfiguration('scm.inputMaxLineCount') ||
                         e.affectsConfiguration('scm.showActionButton') ||
-                        e.affectsConfiguration('scm.showChangesSummary') ||
                         e.affectsConfiguration('scm.showIncomingChanges') ||
                         e.affectsConfiguration('scm.showOutgoingChanges') ||
-                        e.affectsConfiguration('scm.experimental.showHistoryGraph'), this.visibilityDisposables)(() => this.updateChildren(), this, this.visibilityDisposables);
+                        e.affectsConfiguration('scm.showHistoryGraph'), this.visibilityDisposables)(() => this.updateChildren(), this, this.visibilityDisposables);
+                    Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.showChangesSummary'), this.visibilityDisposables)(() => {
+                        this.historyProviderDataSource.clearCache();
+                        this.updateChildren();
+                    }, this, this.visibilityDisposables);
                     this.editorService.onDidActiveEditorChange(this.onDidActiveEditorChange, this, this.visibilityDisposables);
                     this.scmViewService.onDidChangeVisibleRepositories(this.onDidChangeVisibleRepositories, this, this.visibilityDisposables);
                     this.onDidChangeVisibleRepositories({ added: this.scmViewService.visibleRepositories, removed: Iterable.empty() });
@@ -2478,7 +2646,11 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         const historyItemActionRunner = ( (new HistoryItemActionRunner()));
         historyItemActionRunner.onWillRun(() => this.tree.domFocus(), this, this.disposables);
         this.disposables.add(historyItemActionRunner);
-        const treeDataSource = this.instantiationService.createInstance(SCMTreeDataSource, () => this.viewMode);
+        const historyItemHoverDelegate = this.instantiationService.createInstance(HistoryItemHoverDelegate, this.viewDescriptorService.getViewLocationById(this.id), this.layoutService.getSideBarPosition());
+        this.disposables.add(historyItemHoverDelegate);
+        this.historyProviderDataSource = this.instantiationService.createInstance(SCMTreeHistoryProviderDataSource, () => this.viewMode);
+        this.disposables.add(this.historyProviderDataSource);
+        const treeDataSource = this.instantiationService.createInstance(SCMTreeDataSource, () => this.viewMode, this.historyProviderDataSource);
         this.disposables.add(treeDataSource);
         this.tree = this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree, 'SCM Tree Repo', container, ( (new ListDelegate(this.inputRenderer))), ( (new SCMTreeCompressionDelegate())), [
             this.inputRenderer,
@@ -2488,9 +2660,9 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             this.instantiationService.createInstance(ResourceRenderer, () => this.viewMode, this.listLabels, getActionViewItemProvider(this.instantiationService), resourceActionRunner),
             this.instantiationService.createInstance(HistoryItemGroupRenderer, historyItemGroupActionRunner),
             this.instantiationService.createInstance(HistoryItemRenderer, historyItemActionRunner, getActionViewItemProvider(this.instantiationService)),
-            this.instantiationService.createInstance(HistoryItem2Renderer),
+            this.instantiationService.createInstance(HistoryItem2Renderer, historyItemHoverDelegate),
             this.instantiationService.createInstance(HistoryItemChangeRenderer, () => this.viewMode, this.listLabels),
-            this.instantiationService.createInstance(SeparatorRenderer)
+            this.instantiationService.createInstance(SeparatorRenderer, (repository) => this.getHistoryItemGroupFilterActions(repository)),
         ], treeDataSource, {
             horizontalScrolling: false,
             setRowLineHeight: false,
@@ -2500,9 +2672,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             identityProvider: ( (new SCMResourceIdentityProvider())),
             sorter: ( (new SCMTreeSorter(() => this.viewMode, () => this.viewSortKey))),
             keyboardNavigationLabelProvider: this.instantiationService.createInstance(SCMTreeKeyboardNavigationLabelProvider, () => this.viewMode),
-            overrideStyles: {
-                listBackground: this.viewDescriptorService.getViewLocationById(this.id) === ViewContainerLocation.Panel ? PANEL_BACKGROUND : SIDE_BAR_BACKGROUND
-            },
+            overrideStyles: this.getLocationBasedColors().listOverrideStyles,
             collapseByDefault: (e) => {
                 if (isSCMRepository(e) || isSCMResourceGroup(e) || isSCMResourceNode(e) || isSCMHistoryItemChangeNode(e)) {
                     return false;
@@ -2607,14 +2777,17 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         else if (isSCMHistoryItemViewModelTreeElement(e.element)) {
             const historyItem = e.element.historyItemViewModel.historyItem;
             const historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
-            const historyProvider = e.element.repository.provider.historyProvider;
+            const historyProvider = e.element.repository.provider.historyProvider.get();
             const historyItemChanges = await historyProvider?.provideHistoryItemChanges(historyItem.id, historyItemParentId);
             if (historyItemChanges) {
                 const title = `${historyItem.id.substring(0, 8)} - ${historyItem.message}`;
                 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 });
             }
             this.scmViewService.focus(e.element.repository);
@@ -2676,16 +2849,11 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             repositoryDisposables.add(repository.provider.onDidChange(() => this.updateChildren(repository)));
             repositoryDisposables.add(repository.input.onDidChangeVisibility(() => this.updateChildren(repository)));
             repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(() => this.updateChildren(repository)));
-            repositoryDisposables.add(Event.runAndSubscribe(repository.provider.onDidChangeHistoryProvider, () => {
-                if (!repository.provider.historyProvider) {
-                    this.logService.debug('SCMViewPane:onDidChangeVisibleRepositories - no history provider present');
-                    return;
-                }
-                repositoryDisposables.add(repository.provider.historyProvider.onDidChangeCurrentHistoryItemGroup(() => {
-                    this.updateChildren(repository);
-                    this.logService.debug('SCMViewPane:onDidChangeCurrentHistoryItemGroup - update children');
-                }));
-                this.logService.debug('SCMViewPane:onDidChangeVisibleRepositories - onDidChangeCurrentHistoryItemGroup listener added');
+            repositoryDisposables.add(autorun(reader => {
+                repository.provider.historyProvider.read(reader)?.currentHistoryItemGroup.read(reader);
+                this.historyProviderDataSource.deleteCacheEntry(repository);
+                this.historyProviderDataSource.deleteHistoryItemGroupFilter(repository);
+                this.updateChildren(repository);
             }));
             const resourceGroupDisposables = repositoryDisposables.add(( (new DisposableMap())));
             const onDidChangeResourceGroups = () => {
@@ -2708,6 +2876,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             this.items.set(repository, repositoryDisposables);
         }
         for (const repository of removed) {
+            this.historyProviderDataSource.deleteCacheEntry(repository);
             this.items.deleteAndDispose(repository);
         }
         this.updateChildren();
@@ -2715,15 +2884,13 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
     }
     onListContextMenu(e) {
         if (!e.element) {
-            const menu = this.menuService.createMenu(Menus.ViewSort, this.contextKeyService);
+            const menu = this.menuService.getMenuActions(Menus.ViewSort, this.contextKeyService);
             const actions = [];
-            createAndFillInContextMenuActions(menu, undefined, actions);
+            createAndFillInContextMenuActions(menu, actions);
             return this.contextMenuService.showContextMenu({
                 getAnchor: () => e.anchor,
                 getActions: () => actions,
-                onHide: () => {
-                    menu.dispose();
-                }
+                onHide: () => { }
             });
         }
         const element = e.element;
@@ -2776,6 +2943,14 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
                 actions = collectContextMenuActions(menu);
             }
         }
+        else if (isSCMHistoryItemViewModelTreeElement(element)) {
+            const menus = this.scmViewService.menus.getRepositoryMenus(element.repository.provider);
+            const menu = menus.historyProviderMenu?.getHistoryItemMenu2(element);
+            if (menu) {
+                actionRunner = ( (new HistoryItemActionRunner2(() => this.getSelectedHistoryItems())));
+                actions = collectContextMenuActions(menu);
+            }
+        }
         actionRunner.onWillRun(() => this.tree.domFocus());
         this.contextMenuService.showContextMenu({
             getAnchor: () => e.anchor,
@@ -2793,6 +2968,10 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         return this.tree.getSelection()
             .filter(r => !!r && !isSCMResourceGroup(r));
     }
+    getSelectedHistoryItems() {
+        return this.tree.getSelection()
+            .filter(r => !!r && isSCMHistoryItemViewModelTreeElement(r));
+    }
     getViewMode() {
         let mode = this.configurationService.getValue('scm.defaultViewMode') === 'list' ? ViewMode.List : ViewMode.Tree;
         const storageMode = this.storageService.get(`scm.viewMode`, StorageScope.WORKSPACE);
@@ -2968,6 +3147,32 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             this.tree.domFocus();
         }
     }
+    getHistoryItemGroupFilterActions(repository) {
+        const currentHistoryItemGroup = repository.provider.historyProvider.get()?.currentHistoryItemGroup?.get();
+        if (!currentHistoryItemGroup) {
+            return [];
+        }
+        const toHistoryItemGroupFilterAction = (historyItemGroupId, historyItemGroupName) => {
+            return toAction({
+                id: `workbench.scm.action.toggleHistoryItemGroupVisibility.${repository.id}.${historyItemGroupId}`,
+                label: historyItemGroupName,
+                checked: !( (this.historyProviderDataSource.getHistoryItemGroupFilter(repository).has(historyItemGroupId))),
+                run: () => {
+                    this.historyProviderDataSource.toggleHistoryItemGroupFilter(repository, historyItemGroupId);
+                    this.historyProviderDataSource.deleteCacheEntry(repository);
+                    this.updateChildren(repository);
+                }
+            });
+        };
+        const actions = [];
+        if (currentHistoryItemGroup.remote) {
+            actions.push(toHistoryItemGroupFilterAction(currentHistoryItemGroup.remote.id, currentHistoryItemGroup.remote.name));
+        }
+        if (currentHistoryItemGroup.base) {
+            actions.push(toHistoryItemGroupFilterAction(currentHistoryItemGroup.base.id, currentHistoryItemGroup.base.name));
+        }
+        return actions;
+    }
     shouldShowWelcome() {
         return this.scmService.repositoryCount === 0;
     }
@@ -3007,12 +3212,12 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
 SCMViewPane = ( (__decorate([
     ( (__param(1, ICommandService))),
     ( (__param(2, IEditorService))),
-    ( (__param(3, ILogService))),
-    ( (__param(4, IMenuService))),
-    ( (__param(5, ISCMService))),
-    ( (__param(6, ISCMViewService))),
-    ( (__param(7, IStorageService))),
-    ( (__param(8, IUriIdentityService))),
+    ( (__param(3, IMenuService))),
+    ( (__param(4, ISCMService))),
+    ( (__param(5, ISCMViewService))),
+    ( (__param(6, IStorageService))),
+    ( (__param(7, IUriIdentityService))),
+    ( (__param(8, IWorkbenchLayoutService))),
     ( (__param(9, IKeybindingService))),
     ( (__param(10, IThemeService))),
     ( (__param(11, IContextMenuService))),
@@ -3024,150 +3229,31 @@ SCMViewPane = ( (__decorate([
     ( (__param(17, ITelemetryService))),
     ( (__param(18, IHoverService)))
 ], SCMViewPane)));
-let SCMTreeDataSource = class SCMTreeDataSource {
-    constructor(viewMode, configurationService, logService, scmViewService, uriIdentityService) {
+let SCMTreeHistoryProviderDataSource = class SCMTreeHistoryProviderDataSource extends Disposable {
+    constructor(viewMode, configurationService, uriIdentityService) {
+        super();
         this.viewMode = viewMode;
         this.configurationService = configurationService;
-        this.logService = logService;
-        this.scmViewService = scmViewService;
         this.uriIdentityService = uriIdentityService;
-        this.historyProviderCache = ( (new Map()));
-        this.repositoryDisposables = ( (new DisposableMap()));
-        this.disposables = ( (new DisposableStore()));
-        const onDidChangeConfiguration = Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.showChangesSummary'), this.disposables);
-        this.disposables.add(onDidChangeConfiguration(() => this.historyProviderCache.clear()));
-        this.scmViewService.onDidChangeVisibleRepositories(this.onDidChangeVisibleRepositories, this, this.disposables);
-        this.onDidChangeVisibleRepositories({ added: this.scmViewService.visibleRepositories, removed: Iterable.empty() });
+        this._cache = ( (new Map()));
+        this._historyItemGroupFilter = ( (new Map()));
     }
-    hasChildren(inputOrElement) {
-        if (isSCMViewService(inputOrElement)) {
-            return this.scmViewService.visibleRepositories.length !== 0;
-        }
-        else if (isSCMRepository(inputOrElement)) {
-            return true;
-        }
-        else if (isSCMInput(inputOrElement)) {
-            return false;
-        }
-        else if (isSCMActionButton(inputOrElement)) {
-            return false;
-        }
-        else if (isSCMResourceGroup(inputOrElement)) {
-            return true;
-        }
-        else if (isSCMResource(inputOrElement)) {
-            return false;
-        }
-        else if (ResourceTree.isResourceNode(inputOrElement)) {
-            return inputOrElement.childrenCount > 0;
-        }
-        else if (isSCMHistoryItemGroupTreeElement(inputOrElement)) {
-            return true;
-        }
-        else if (isSCMHistoryItemTreeElement(inputOrElement)) {
-            return true;
-        }
-        else if (isSCMHistoryItemViewModelTreeElement(inputOrElement)) {
-            return false;
-        }
-        else if (isSCMHistoryItemChangeTreeElement(inputOrElement)) {
-            return false;
-        }
-        else if (isSCMViewSeparator(inputOrElement)) {
-            return false;
-        }
-        else {
-            throw ( (new Error('hasChildren not implemented.')));
-        }
+    clearCache() {
+        this._cache.clear();
     }
-    async getChildren(inputOrElement) {
-        const { alwaysShowRepositories, showActionButton } = this.getConfiguration();
-        const repositoryCount = this.scmViewService.visibleRepositories.length;
-        if (isSCMViewService(inputOrElement) && (repositoryCount > 1 || alwaysShowRepositories)) {
-            return this.scmViewService.visibleRepositories;
-        }
-        else if ((isSCMViewService(inputOrElement) && repositoryCount === 1 && !alwaysShowRepositories) || isSCMRepository(inputOrElement)) {
-            const children = [];
-            inputOrElement = isSCMRepository(inputOrElement) ? inputOrElement : this.scmViewService.visibleRepositories[0];
-            const actionButton = inputOrElement.provider.actionButton;
-            const resourceGroups = inputOrElement.provider.groups;
-            if (inputOrElement.input.visible) {
-                children.push(inputOrElement.input);
-            }
-            if (showActionButton && actionButton) {
-                children.push({
-                    type: 'actionButton',
-                    repository: inputOrElement,
-                    button: actionButton
-                });
-            }
-            const hasSomeChanges = ( (resourceGroups.some(group => group.resources.length > 0)));
-            if (hasSomeChanges || (repositoryCount === 1 && (!showActionButton || !actionButton))) {
-                children.push(...resourceGroups);
-            }
-            const historyItemGroups = await this.getHistoryItemGroups(inputOrElement);
-            if (historyItemGroups.length > 0) {
-                let label = ( localizeWithPath(_moduleId, 34, "Incoming/Outgoing"));
-                let ariaLabel = ( localizeWithPath(_moduleId, 35, "Incoming and outgoing changes"));
-                const incomingHistoryItems = historyItemGroups.find(g => g.direction === 'incoming');
-                const outgoingHistoryItems = historyItemGroups.find(g => g.direction === 'outgoing');
-                if (incomingHistoryItems && !outgoingHistoryItems) {
-                    label = ( localizeWithPath(_moduleId, 36, "Incoming"));
-                    ariaLabel = ( localizeWithPath(_moduleId, 37, "Incoming changes"));
-                }
-                else if (!incomingHistoryItems && outgoingHistoryItems) {
-                    label = ( localizeWithPath(_moduleId, 38, "Outgoing"));
-                    ariaLabel = ( localizeWithPath(_moduleId, 39, "Outgoing changes"));
-                }
-                children.push({ label, ariaLabel, repository: inputOrElement, type: 'separator' });
-            }
-            children.push(...historyItemGroups);
-            const historyItems = await this.getHistoryItems2(inputOrElement);
-            if (historyItems.length > 0) {
-                const label = ( localizeWithPath(_moduleId, 34, "Incoming/Outgoing"));
-                const ariaLabel = ( localizeWithPath(_moduleId, 35, "Incoming and outgoing changes"));
-                children.push({ label, ariaLabel, repository: inputOrElement, type: 'separator' });
-            }
-            children.push(...historyItems);
-            return children;
-        }
-        else if (isSCMResourceGroup(inputOrElement)) {
-            if (this.viewMode() === ViewMode.List) {
-                return inputOrElement.resources;
-            }
-            else if (this.viewMode() === ViewMode.Tree) {
-                const children = [];
-                for (const node of inputOrElement.resourceTree.root.children) {
-                    children.push(node.element && node.childrenCount === 0 ? node.element : node);
-                }
-                return children;
-            }
-        }
-        else if (isSCMResourceNode(inputOrElement) || isSCMHistoryItemChangeNode(inputOrElement)) {
-            const children = [];
-            for (const node of inputOrElement.children) {
-                children.push(node.element && node.childrenCount === 0 ? node.element : node);
-            }
-            return children;
-        }
-        else if (isSCMHistoryItemGroupTreeElement(inputOrElement)) {
-            return this.getHistoryItems(inputOrElement);
-        }
-        else if (isSCMHistoryItemTreeElement(inputOrElement)) {
-            return this.getHistoryItemChanges(inputOrElement);
-        }
-        return [];
+    deleteCacheEntry(repository) {
+        this._cache.delete(repository);
     }
     async getHistoryItemGroups(element) {
-        const { showIncomingChanges, showOutgoingChanges, showHistoryGraph } = this.getConfiguration();
+        const { showIncomingChanges, showOutgoingChanges, showHistoryGraph } = this._getConfiguration();
         const scmProvider = element.provider;
-        const historyProvider = scmProvider.historyProvider;
-        const currentHistoryItemGroup = historyProvider?.currentHistoryItemGroup;
+        const historyProvider = scmProvider.historyProvider.get();
+        const currentHistoryItemGroup = historyProvider?.currentHistoryItemGroup.get();
         if (!historyProvider || !currentHistoryItemGroup || (showIncomingChanges === 'never' && showOutgoingChanges === 'never') || showHistoryGraph) {
             return [];
         }
         const children = [];
-        const historyProviderCacheEntry = this.getHistoryProviderCacheEntry(element);
+        const historyProviderCacheEntry = this._getCacheEntry(element);
         let incomingHistoryItemGroup = historyProviderCacheEntry?.incomingHistoryItemGroup;
         let outgoingHistoryItemGroup = historyProviderCacheEntry?.outgoingHistoryItemGroup;
         if (!incomingHistoryItemGroup && !outgoingHistoryItemGroup) {
@@ -3178,12 +3264,7 @@ let SCMTreeDataSource = class SCMTreeDataSource {
             incomingHistoryItemGroup = currentHistoryItemGroup.remote ? {
                 id: currentHistoryItemGroup.remote.id,
                 label: currentHistoryItemGroup.remote.name,
-                ariaLabel: ( localizeWithPath(
-                    _moduleId,
-                    40,
-                    "Incoming changes from {0}",
-                    currentHistoryItemGroup.remote.name
-                )),
+                ariaLabel: ( localize(6396, "Incoming changes from {0}", currentHistoryItemGroup.remote.name)),
                 icon: Codicon.arrowCircleDown,
                 direction: 'incoming',
                 ancestor: ancestor.id,
@@ -3194,7 +3275,7 @@ let SCMTreeDataSource = class SCMTreeDataSource {
             outgoingHistoryItemGroup = {
                 id: currentHistoryItemGroup.id,
                 label: currentHistoryItemGroup.name,
-                ariaLabel: ( localizeWithPath(_moduleId, 41, "Outgoing changes to {0}", currentHistoryItemGroup.name)),
+                ariaLabel: ( localize(6397, "Outgoing changes to {0}", currentHistoryItemGroup.name)),
                 icon: Codicon.arrowCircleUp,
                 direction: 'outgoing',
                 ancestor: ancestor.id,
@@ -3202,8 +3283,7 @@ let SCMTreeDataSource = class SCMTreeDataSource {
                 repository: element,
                 type: 'historyItemGroup'
             };
-            this.historyProviderCache.set(element, {
-                ...historyProviderCacheEntry,
+            this._updateCacheEntry(element, {
                 incomingHistoryItemGroup,
                 outgoingHistoryItemGroup
             });
@@ -3220,23 +3300,35 @@ let SCMTreeDataSource = class SCMTreeDataSource {
         }
         return children;
     }
+    getHistoryItemGroupFilter(element) {
+        return this._historyItemGroupFilter.get(element) ?? ( (new Set()));
+    }
+    deleteHistoryItemGroupFilter(repository) {
+        this._historyItemGroupFilter.delete(repository);
+    }
+    toggleHistoryItemGroupFilter(element, historyItemGroupId) {
+        const filters = this.getHistoryItemGroupFilter(element);
+        if (!filters.delete(historyItemGroupId)) {
+            filters.add(historyItemGroupId);
+        }
+        this._historyItemGroupFilter.set(element, filters);
+    }
     async getHistoryItems(element) {
         const repository = element.repository;
-        const historyProvider = repository.provider.historyProvider;
+        const historyProvider = repository.provider.historyProvider.get();
         if (!historyProvider) {
             return [];
         }
-        const historyProviderCacheEntry = this.getHistoryProviderCacheEntry(repository);
+        const historyProviderCacheEntry = this._getCacheEntry(repository);
         const historyItemsMap = historyProviderCacheEntry.historyItems;
         let historyItemsElement = historyProviderCacheEntry.historyItems.get(element.id);
         if (!historyItemsElement) {
             const historyItems = (await historyProvider.provideHistoryItems(element.id, { limit: { id: element.ancestor } })) ?? [];
-            const { showChangesSummary } = this.getConfiguration();
+            const { showChangesSummary } = this._getConfiguration();
             const allChanges = showChangesSummary && historyItems.length >= 2 ?
                 await historyProvider.provideHistoryItemSummary(historyItems[0].id, element.ancestor) : undefined;
             historyItemsElement = [allChanges, historyItems];
-            this.historyProviderCache.set(repository, {
-                ...historyProviderCacheEntry,
+            this._updateCacheEntry(repository, {
                 historyItems: historyItemsMap.set(element.id, historyItemsElement)
             });
         }
@@ -3245,7 +3337,7 @@ let SCMTreeDataSource = class SCMTreeDataSource {
             children.push({
                 ...historyItemsElement[0],
                 icon: historyItemsElement[0].icon ?? Codicon.files,
-                message: ( localizeWithPath(_moduleId, 42, "All Changes")),
+                message: ( localize(6398, "All Changes")),
                 historyItemGroup: element,
                 type: 'allChanges'
             });
@@ -3259,13 +3351,13 @@ let SCMTreeDataSource = class SCMTreeDataSource {
         return children;
     }
     async getHistoryItems2(element) {
-        const { showHistoryGraph } = this.getConfiguration();
-        const historyProvider = element.provider.historyProvider;
-        const currentHistoryItemGroup = historyProvider?.currentHistoryItemGroup;
-        if (!currentHistoryItemGroup || !showHistoryGraph) {
+        const { showHistoryGraph } = this._getConfiguration();
+        const historyProvider = element.provider.historyProvider.get();
+        const currentHistoryItemGroup = historyProvider?.currentHistoryItemGroup.get();
+        if (!historyProvider || !currentHistoryItemGroup || !showHistoryGraph) {
             return [];
         }
-        const historyProviderCacheEntry = this.getHistoryProviderCacheEntry(element);
+        const historyProviderCacheEntry = this._getCacheEntry(element);
         let historyItemsElement = historyProviderCacheEntry.historyItems2.get(element.id);
         const historyItemsMap = historyProviderCacheEntry.historyItems2;
         if (!historyItemsElement) {
@@ -3274,24 +3366,39 @@ let SCMTreeDataSource = class SCMTreeDataSource {
                 ...(currentHistoryItemGroup.remote ? [currentHistoryItemGroup.remote.id] : []),
                 ...(currentHistoryItemGroup.base ? [currentHistoryItemGroup.base.id] : []),
             ];
-            historyItemsElement = (await historyProvider.provideHistoryItems2({ historyItemGroupIds })) ?? [];
-            this.historyProviderCache.set(element, {
-                ...historyProviderCacheEntry,
+            const ancestor = await historyProvider.resolveHistoryItemGroupCommonAncestor2(historyItemGroupIds);
+            if (!ancestor) {
+                return [];
+            }
+            const filters = this.getHistoryItemGroupFilter(element);
+            historyItemsElement = (await historyProvider.provideHistoryItems2({
+                historyItemGroupIds: historyItemGroupIds.filter(id => !( (filters.has(id)))),
+                limit: { id: ancestor }
+            })) ?? [];
+            this._updateCacheEntry(element, {
                 historyItems2: historyItemsMap.set(element.id, historyItemsElement)
             });
         }
-        if (historyItemsElement.length === 1 &&
-            historyItemsElement[0].labels?.find(l => l.title === currentHistoryItemGroup.name)) {
-            return [];
+        if (historyItemsElement.length === 1) {
+            const currentHistoryItemGroupLabels = [
+                currentHistoryItemGroup.name,
+                ...(currentHistoryItemGroup.remote ? [currentHistoryItemGroup.remote.name] : []),
+                ...(currentHistoryItemGroup.base ? [currentHistoryItemGroup.base.name] : []),
+            ];
+            const labels = ( ((historyItemsElement[0].labels ?? [])
+                .map(l => l.title)));
+            if (equals(currentHistoryItemGroupLabels.sort(), labels.sort())) {
+                return [];
+            }
         }
         const colorMap = ( (new Map([
-            [currentHistoryItemGroup.name, 0]
+            [currentHistoryItemGroup.name, historyItemGroupLocal]
         ])));
         if (currentHistoryItemGroup.remote) {
-            colorMap.set(currentHistoryItemGroup.remote.name, 1);
+            colorMap.set(currentHistoryItemGroup.remote.name, historyItemGroupRemote);
         }
         if (currentHistoryItemGroup.base) {
-            colorMap.set(currentHistoryItemGroup.base.name, 2);
+            colorMap.set(currentHistoryItemGroup.base.name, historyItemGroupBase);
         }
         return (
              (toISCMHistoryItemViewModelArray(historyItemsElement, colorMap)
@@ -3304,19 +3411,18 @@ let SCMTreeDataSource = class SCMTreeDataSource {
     }
     async getHistoryItemChanges(element) {
         const repository = element.historyItemGroup.repository;
-        const historyProvider = repository.provider.historyProvider;
+        const historyProvider = repository.provider.historyProvider.get();
         if (!historyProvider) {
             return [];
         }
-        const historyProviderCacheEntry = this.getHistoryProviderCacheEntry(repository);
+        const historyProviderCacheEntry = this._getCacheEntry(repository);
         const historyItemChangesMap = historyProviderCacheEntry.historyItemChanges;
         const historyItemParentId = element.parentIds.length > 0 ? element.parentIds[0] : undefined;
         let historyItemChanges = historyItemChangesMap.get(`${element.id}/${historyItemParentId}`);
         if (!historyItemChanges) {
             const historyItemParentId = element.parentIds.length > 0 ? element.parentIds[0] : undefined;
             historyItemChanges = (await historyProvider.provideHistoryItemChanges(element.id, historyItemParentId)) ?? [];
-            this.historyProviderCache.set(repository, {
-                ...historyProviderCacheEntry,
+            this._updateCacheEntry(repository, {
                 historyItemChanges: historyItemChangesMap.set(`${element.id}/${historyItemParentId}`, historyItemChanges)
             });
         }
@@ -3347,6 +3453,126 @@ let SCMTreeDataSource = class SCMTreeDataSource {
         }
         return children;
     }
+    _getCacheEntry(repository) {
+        let entry = this._cache.get(repository);
+        if (!entry) {
+            entry = {
+                incomingHistoryItemGroup: undefined,
+                outgoingHistoryItemGroup: undefined,
+                historyItems: ( (new Map())),
+                historyItems2: ( (new Map())),
+                historyItemChanges: ( (new Map()))
+            };
+            this._cache.set(repository, entry);
+        }
+        return entry;
+    }
+    _updateCacheEntry(repository, entry) {
+        this._cache.set(repository, {
+            ...this._getCacheEntry(repository),
+            ...entry
+        });
+    }
+    _getConfiguration() {
+        return {
+            showChangesSummary: this.configurationService.getValue('scm.showChangesSummary'),
+            showIncomingChanges: this.configurationService.getValue('scm.showIncomingChanges'),
+            showOutgoingChanges: this.configurationService.getValue('scm.showOutgoingChanges'),
+            showHistoryGraph: this.configurationService.getValue('scm.showHistoryGraph')
+        };
+    }
+};
+SCMTreeHistoryProviderDataSource = ( (__decorate([
+    ( (__param(1, IConfigurationService))),
+    ( (__param(2, IUriIdentityService)))
+], SCMTreeHistoryProviderDataSource)));
+let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
+    constructor(viewMode, historyProviderDataSource, configurationService, scmViewService) {
+        super();
+        this.viewMode = viewMode;
+        this.historyProviderDataSource = historyProviderDataSource;
+        this.configurationService = configurationService;
+        this.scmViewService = scmViewService;
+    }
+    async getChildren(inputOrElement) {
+        const repositoryCount = this.scmViewService.visibleRepositories.length;
+        const showActionButton = this.configurationService.getValue('scm.showActionButton') === true;
+        const alwaysShowRepositories = this.configurationService.getValue('scm.alwaysShowRepositories') === true;
+        if (isSCMViewService(inputOrElement) && (repositoryCount > 1 || alwaysShowRepositories)) {
+            return this.scmViewService.visibleRepositories;
+        }
+        else if ((isSCMViewService(inputOrElement) && repositoryCount === 1 && !alwaysShowRepositories) || isSCMRepository(inputOrElement)) {
+            const children = [];
+            inputOrElement = isSCMRepository(inputOrElement) ? inputOrElement : this.scmViewService.visibleRepositories[0];
+            const actionButton = inputOrElement.provider.actionButton;
+            const resourceGroups = inputOrElement.provider.groups;
+            if (inputOrElement.input.visible) {
+                children.push(inputOrElement.input);
+            }
+            if (showActionButton && actionButton) {
+                children.push({
+                    type: 'actionButton',
+                    repository: inputOrElement,
+                    button: actionButton
+                });
+            }
+            const hasSomeChanges = ( (resourceGroups.some(group => group.resources.length > 0)));
+            if (hasSomeChanges || (repositoryCount === 1 && (!showActionButton || !actionButton))) {
+                children.push(...resourceGroups);
+            }
+            const historyItemGroups = await this.historyProviderDataSource.getHistoryItemGroups(inputOrElement);
+            if (historyItemGroups.length > 0) {
+                let label = ( localize(6399, "Incoming/Outgoing"));
+                let ariaLabel = ( localize(6400, "Incoming and outgoing changes"));
+                const incomingHistoryItems = historyItemGroups.find(g => g.direction === 'incoming');
+                const outgoingHistoryItems = historyItemGroups.find(g => g.direction === 'outgoing');
+                if (incomingHistoryItems && !outgoingHistoryItems) {
+                    label = ( localize(6401, "Incoming"));
+                    ariaLabel = ( localize(6402, "Incoming changes"));
+                }
+                else if (!incomingHistoryItems && outgoingHistoryItems) {
+                    label = ( localize(6403, "Outgoing"));
+                    ariaLabel = ( localize(6404, "Outgoing changes"));
+                }
+                children.push({ label, ariaLabel, repository: inputOrElement, type: 'separator' });
+            }
+            children.push(...historyItemGroups);
+            const historyItems = await this.historyProviderDataSource.getHistoryItems2(inputOrElement);
+            if (historyItems.length > 0) {
+                const label = ( localize(6404, "Incoming/Outgoing"));
+                const ariaLabel = ( localize(6404, "Incoming and outgoing changes"));
+                children.push({ label, ariaLabel, repository: inputOrElement, type: 'separator' });
+            }
+            children.push(...historyItems);
+            return children;
+        }
+        else if (isSCMResourceGroup(inputOrElement)) {
+            if (this.viewMode() === ViewMode.List) {
+                return inputOrElement.resources;
+            }
+            else if (this.viewMode() === ViewMode.Tree) {
+                const children = [];
+                for (const node of inputOrElement.resourceTree.root.children) {
+                    children.push(node.element && node.childrenCount === 0 ? node.element : node);
+                }
+                return children;
+            }
+        }
+        else if (isSCMResourceNode(inputOrElement) || isSCMHistoryItemChangeNode(inputOrElement)) {
+            const children = [];
+            for (const node of inputOrElement.children) {
+                children.push(node.element && node.childrenCount === 0 ? node.element : node);
+            }
+            return children;
+        }
+        else if (isSCMHistoryItemGroupTreeElement(inputOrElement)) {
+            return this.historyProviderDataSource.getHistoryItems(inputOrElement);
+        }
+        else if (isSCMHistoryItemTreeElement(inputOrElement)) {
+            return this.historyProviderDataSource.getHistoryItemChanges(inputOrElement);
+        }
+        return [];
+    }
     getParent(element) {
         if (isSCMResourceNode(element)) {
             if (element.parent === element.context.resourceTree.root) {
@@ -3387,56 +3613,51 @@ let SCMTreeDataSource = class SCMTreeDataSource {
             throw ( (new Error('Unexpected call to getParent')));
         }
     }
-    getConfiguration() {
-        return {
-            alwaysShowRepositories: this.configurationService.getValue('scm.alwaysShowRepositories'),
-            showActionButton: this.configurationService.getValue('scm.showActionButton'),
-            showChangesSummary: this.configurationService.getValue('scm.showChangesSummary'),
-            showIncomingChanges: this.configurationService.getValue('scm.showIncomingChanges'),
-            showOutgoingChanges: this.configurationService.getValue('scm.showOutgoingChanges'),
-            showHistoryGraph: this.configurationService.getValue('scm.experimental.showHistoryGraph')
-        };
-    }
-    onDidChangeVisibleRepositories({ added, removed }) {
-        for (const repository of added) {
-            const repositoryDisposables = ( (new DisposableStore()));
-            repositoryDisposables.add(Event.runAndSubscribe(repository.provider.onDidChangeHistoryProvider, () => {
-                if (!repository.provider.historyProvider) {
-                    this.logService.debug('SCMTreeDataSource:onDidChangeVisibleRepositories - no history provider present');
-                    return;
-                }
-                repositoryDisposables.add(repository.provider.historyProvider.onDidChangeCurrentHistoryItemGroup(() => {
-                    this.historyProviderCache.delete(repository);
-                    this.logService.debug('SCMTreeDataSource:onDidChangeCurrentHistoryItemGroup - cache cleared');
-                }));
-                this.logService.debug('SCMTreeDataSource:onDidChangeVisibleRepositories - onDidChangeCurrentHistoryItemGroup listener added');
-            }));
-            this.repositoryDisposables.set(repository, repositoryDisposables);
+    hasChildren(inputOrElement) {
+        if (isSCMViewService(inputOrElement)) {
+            return this.scmViewService.visibleRepositories.length !== 0;
         }
-        for (const repository of removed) {
-            this.repositoryDisposables.deleteAndDispose(repository);
-            this.historyProviderCache.delete(repository);
+        else if (isSCMRepository(inputOrElement)) {
+            return true;
+        }
+        else if (isSCMInput(inputOrElement)) {
+            return false;
+        }
+        else if (isSCMActionButton(inputOrElement)) {
+            return false;
+        }
+        else if (isSCMResourceGroup(inputOrElement)) {
+            return true;
+        }
+        else if (isSCMResource(inputOrElement)) {
+            return false;
+        }
+        else if (ResourceTree.isResourceNode(inputOrElement)) {
+            return inputOrElement.childrenCount > 0;
+        }
+        else if (isSCMHistoryItemGroupTreeElement(inputOrElement)) {
+            return true;
+        }
+        else if (isSCMHistoryItemTreeElement(inputOrElement)) {
+            return true;
+        }
+        else if (isSCMHistoryItemViewModelTreeElement(inputOrElement)) {
+            return false;
+        }
+        else if (isSCMHistoryItemChangeTreeElement(inputOrElement)) {
+            return false;
+        }
+        else if (isSCMViewSeparator(inputOrElement)) {
+            return false;
+        }
+        else {
+            throw ( (new Error('hasChildren not implemented.')));
         }
-    }
-    getHistoryProviderCacheEntry(repository) {
-        return this.historyProviderCache.get(repository) ?? {
-            incomingHistoryItemGroup: undefined,
-            outgoingHistoryItemGroup: undefined,
-            historyItems: ( (new Map())),
-            historyItems2: ( (new Map())),
-            historyItemChanges: ( (new Map()))
-        };
-    }
-    dispose() {
-        this.repositoryDisposables.dispose();
-        this.disposables.dispose();
     }
 };
 SCMTreeDataSource = ( (__decorate([
-    ( (__param(1, IConfigurationService))),
-    ( (__param(2, ILogService))),
-    ( (__param(3, ISCMViewService))),
-    ( (__param(4, IUriIdentityService)))
+    ( (__param(2, IConfigurationService))),
+    ( (__param(3, ISCMViewService)))
 ], SCMTreeDataSource)));
 class SCMActionButton {
     constructor(container, contextMenuService, commandService, notificationService) {
@@ -3517,16 +3738,13 @@ registerThemingParticipant((theme, collector) => {
     if (selectionBackgroundColor) {
         const inputBackgroundColor = theme.getColor(inputBackground);
         if (inputBackgroundColor) {
+            collector.addRule(`.scm-view .scm-editor-container .monaco-editor-background { background-color: ${inputBackgroundColor}; } `);
             collector.addRule(`.scm-view .scm-editor-container .monaco-editor .selected-text { background-color: ${( (inputBackgroundColor.transparent(0.4)))}; }`);
         }
         const inputForegroundColor = theme.getColor(inputForeground);
         if (inputForegroundColor) {
             collector.addRule(`.scm-view .scm-editor-container .monaco-editor .view-line span.inline-selected-text { color: ${inputForegroundColor}; }`);
         }
-        const backgroundColor = theme.getColor(inputBackground);
-        if (backgroundColor) {
-            collector.addRule(`.scm-view .scm-editor-container .monaco-editor-background { background-color: ${backgroundColor}; } `);
-        }
         collector.addRule(`.scm-view .scm-editor-container .monaco-editor .focused .selected-text { background-color: ${selectionBackgroundColor}; }`);
     }
     else {