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

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

@@ -4,8 +4,8 @@ import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { basename, dirname } from 'vscode/vscode/vs/base/common/resources';
 import { Disposable, DisposableStore, toDisposable, combinedDisposable, MutableDisposable, dispose, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ViewAction, ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
-import { append, $, asCSSUrl, prepend, Dimension, trackFocus, isPointerEvent, isActiveElement, clearNode } from 'vscode/vscode/vs/base/browser/dom';
-import { VIEW_PANE_ID, ISCMRepositorySortKey, InputValidationType, SCMInputChangeReason } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
+import { append, $, asCSSUrl, Dimension, trackFocus, isPointerEvent, isActiveElement, clearNode } from 'vscode/vscode/vs/base/browser/dom';
+import { VIEW_PANE_ID, SCMInputChangeReason } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMViewService, ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
 import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
@@ -16,26 +16,22 @@ import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/context
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
-import { MenuItemAction, MenuId, MenuRegistry, registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+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, Separator, Action } from 'vscode/vscode/vs/base/common/actions';
+import { ActionRunner, Action, Separator } from 'vscode/vscode/vs/base/common/actions';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { isSCMResource, connectPrimaryMenuToInlineActionBar, connectPrimaryMenu, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceGroup, isSCMResourceNode, isSCMHistoryItemGroupTreeElement, isSCMHistoryItemTreeElement, isSCMHistoryItemViewModelTreeElement, isSCMHistoryItemChangeTreeElement, isSCMHistoryItemChangeNode, isSCMViewSeparator, getActionViewItemProvider, toDiffEditorArguments, collectContextMenuActions, isSCMViewService } from './util.js';
+import { isSCMResource, connectPrimaryMenuToInlineActionBar, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceGroup, isSCMResourceNode, getActionViewItemProvider, collectContextMenuActions, isSCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/browser/util';
 import { WorkbenchCompressibleAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { disposableTimeout, ThrottledDelayer, Sequencer, Throttler } from 'vscode/vscode/vs/base/common/async';
 import { ResourceTree } from 'vscode/vscode/vs/base/common/resourceTree';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
-import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { FileKind } from 'vscode/vscode/vs/platform/files/common/files';
-import { comparePaths, compareFileNames } from 'vscode/vscode/vs/base/common/comparers';
+import { compareFileNames, comparePaths } from 'vscode/vscode/vs/base/common/comparers';
 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 { 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 { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
@@ -46,7 +42,7 @@ import { MenuPreventer } from 'vscode/vscode/vs/workbench/contrib/codeEditor/bro
 import { SelectionClipboardContributionID } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/selectionClipboard';
 import { EditorDictation } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation';
 import { ContextMenuController } from 'vscode/vscode/vs/editor/contrib/contextmenu/browser/contextmenu';
-import { language, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
+import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { compare, format } from 'vscode/vscode/vs/base/common/strings';
 import { SuggestController } from 'vscode/vscode/vs/editor/contrib/suggest/browser/suggestController';
 import { SnippetController2 } from 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
@@ -56,11 +52,9 @@ import { LinkDetector } from 'vscode/vscode/vs/editor/contrib/links/browser/link
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
-import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DEFAULT_FONT_FAMILY } from 'vscode/vscode/vs/base/browser/fonts';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { AnchorAlignment } from 'vscode/vscode/vs/base/browser/ui/contextview/contextview';
 import { RepositoryRenderer, RepositoryActionRunner } from './scmRepositoryRenderer.js';
 import { ColorScheme } from 'vscode/vscode/vs/platform/theme/common/theme';
 import { API_OPEN_EDITOR_COMMAND_ID, API_OPEN_DIFF_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
@@ -80,50 +74,25 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { fillEditorsDragData } from 'vscode/vscode/vs/workbench/browser/dnd';
 import { CodeDataTransfers } from 'vscode/vscode/vs/platform/dnd/browser/dnd';
 import { FormatOnType } from 'vscode/vscode/vs/editor/contrib/format/browser/formatActions';
-import { EditorOptions, EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
+import { EditorOptions } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
-import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
-import { IconLabel } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabel';
-import { registerColor, transparent } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
-import { foreground } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
-import { listActiveSelectionForeground } from 'vscode/vscode/vs/platform/theme/common/colors/listColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
-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 } 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 { 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 { ContentHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/contentHoverController2';
-import { MarginHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/marginHoverController';
+import { ContentHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/contentHoverController';
+import { GlyphHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/glyphHoverController';
 import '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/derived';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
-import { getDefaultHoverDelegate, createInstantHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
-import { renderSCMHistoryItemGraph, historyItemGroupLocal, historyItemGroupRemote, historyItemGroupBase, historyItemGroupHoverLabelForeground } 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';
 import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
 
-var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1, HistoryItemGroupRenderer_1, HistoryItemRenderer_1, HistoryItem2Renderer_1, HistoryItemChangeRenderer_1, SeparatorRenderer_1, SCMInputWidget_1;
-const historyItemAdditionsForeground = registerColor('scm.historyItemAdditionsForeground', 'gitDecoration.addedResourceForeground', ( localize(6435, "History item additions foreground color.")));
-const historyItemDeletionsForeground = registerColor('scm.historyItemDeletionsForeground', 'gitDecoration.deletedResourceForeground', ( localize(6436, "History item deletions foreground color.")));
-registerColor('scm.historyItemStatisticsBorder', ( (transparent(foreground, 0.2))), ( localize(6437, "History item statistics border color.")));
-registerColor('scm.historyItemSelectedStatisticsBorder', ( (transparent(listActiveSelectionForeground, 0.2))), ( localize(6438, "History item selected statistics border color.")));
+var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1, SCMInputWidget_1;
 function processResourceFilterData(uri, filterData) {
     if (!filterData) {
         return [undefined, undefined];
@@ -446,7 +415,7 @@ let ResourceRenderer = class ResourceRenderer {
         const uri = ResourceTree.isResourceNode(resourceOrFolder) ? resourceOrFolder.uri : resourceOrFolder.sourceUri;
         const fileKind = ResourceTree.isResourceNode(resourceOrFolder) ? FileKind.FOLDER : FileKind.FILE;
         const tooltip = !ResourceTree.isResourceNode(resourceOrFolder) && resourceOrFolder.decorations.tooltip || '';
-        const hidePath = this.viewMode() === ViewMode.Tree;
+        const hidePath = this.viewMode() === "tree" ;
         let matches;
         let descriptionMatches;
         let strikethrough;
@@ -563,518 +532,6 @@ ResourceRenderer = ResourceRenderer_1 = ( (__decorate([
     ( (__param(5, ISCMViewService))),
     ( (__param(6, IThemeService)))
 ], ResourceRenderer)));
-class HistoryItemGroupActionRunner extends ActionRunner {
-    runAction(action, context) {
-        if (!(action instanceof MenuItemAction)) {
-            return super.runAction(action, context);
-        }
-        return action.run(context.repository.provider, context.id);
-    }
-}
-let HistoryItemGroupRenderer = class HistoryItemGroupRenderer {
-    static { HistoryItemGroupRenderer_1 = this; }
-    static { this.TEMPLATE_ID = 'history-item-group'; }
-    get templateId() { return HistoryItemGroupRenderer_1.TEMPLATE_ID; }
-    constructor(actionRunner, contextKeyService, contextMenuService, keybindingService, commandService, menuService, scmViewService, telemetryService) {
-        this.actionRunner = actionRunner;
-        this.contextKeyService = contextKeyService;
-        this.contextMenuService = contextMenuService;
-        this.keybindingService = keybindingService;
-        this.commandService = commandService;
-        this.menuService = menuService;
-        this.scmViewService = scmViewService;
-        this.telemetryService = telemetryService;
-    }
-    renderTemplate(container) {
-        container.parentElement.parentElement.querySelector('.monaco-tl-twistie').classList.add('force-twistie');
-        const element = append(container, $('.history-item-group'));
-        const label = ( (new IconLabel(element, { supportIcons: true })));
-        const iconContainer = prepend(label.element, $('.icon-container'));
-        const templateDisposables = ( (new DisposableStore()));
-        const toolBar = ( (new WorkbenchToolBar(
-            append(element, $('.actions')),
-            { actionRunner: this.actionRunner, menuOptions: { shouldForwardArgs: true } },
-            this.menuService,
-            this.contextKeyService,
-            this.contextMenuService,
-            this.keybindingService,
-            this.commandService,
-            this.telemetryService
-        )));
-        templateDisposables.add(toolBar);
-        const countContainer = append(element, $('.count'));
-        const count = ( (new CountBadge(countContainer, {}, defaultCountBadgeStyles)));
-        return { iconContainer, label, toolBar, count, elementDisposables: ( (new DisposableStore())), templateDisposables };
-    }
-    renderElement(node, index, templateData, height) {
-        const historyItemGroup = node.element;
-        templateData.iconContainer.className = 'icon-container';
-        if (historyItemGroup.icon && ThemeIcon.isThemeIcon(historyItemGroup.icon)) {
-            templateData.iconContainer.classList.add(...ThemeIcon.asClassNameArray(historyItemGroup.icon));
-        }
-        templateData.label.setLabel(historyItemGroup.label, historyItemGroup.description, { title: historyItemGroup.ariaLabel });
-        templateData.count.setCount(historyItemGroup.count ?? 0);
-        const repositoryMenus = this.scmViewService.menus.getRepositoryMenus(historyItemGroup.repository.provider);
-        const historyProviderMenu = repositoryMenus.historyProviderMenu;
-        if (historyProviderMenu) {
-            const menu = historyProviderMenu.getHistoryItemGroupMenu(historyItemGroup);
-            const resetMenuId = historyItemGroup.direction === 'incoming' ? MenuId.SCMIncomingChanges : MenuId.SCMOutgoingChanges;
-            templateData.elementDisposables.add(connectPrimaryMenu(menu, (primary, secondary) => {
-                templateData.toolBar.setActions(primary, secondary, [resetMenuId]);
-            }));
-            templateData.toolBar.context = historyItemGroup;
-        }
-        else {
-            templateData.toolBar.setActions([], []);
-            templateData.toolBar.context = undefined;
-        }
-    }
-    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.elementDisposables.dispose();
-        templateData.templateDisposables.dispose();
-    }
-};
-HistoryItemGroupRenderer = HistoryItemGroupRenderer_1 = ( (__decorate([
-    ( (__param(1, IContextKeyService))),
-    ( (__param(2, IContextMenuService))),
-    ( (__param(3, IKeybindingService))),
-    ( (__param(4, ICommandService))),
-    ( (__param(5, IMenuService))),
-    ( (__param(6, ISCMViewService))),
-    ( (__param(7, ITelemetryService)))
-], HistoryItemGroupRenderer)));
-class HistoryItemActionRunner extends ActionRunner {
-    async runAction(action, context) {
-        if (!(action instanceof MenuItemAction)) {
-            return super.runAction(action, context);
-        }
-        const args = [];
-        args.push(context.historyItemGroup.repository.provider);
-        args.push({
-            id: context.id,
-            parentIds: context.parentIds,
-            message: context.message,
-            author: context.author,
-            icon: context.icon,
-            timestamp: context.timestamp,
-            statistics: context.statistics,
-        });
-        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'; }
-    get templateId() { return HistoryItemRenderer_1.TEMPLATE_ID; }
-    constructor(actionRunner, actionViewItemProvider, hoverService, scmViewService) {
-        this.actionRunner = actionRunner;
-        this.actionViewItemProvider = actionViewItemProvider;
-        this.hoverService = hoverService;
-        this.scmViewService = scmViewService;
-    }
-    renderTemplate(container) {
-        container.parentElement.parentElement.querySelector('.monaco-tl-twistie').classList.add('force-twistie');
-        const element = append(container, $('.history-item'));
-        const iconLabel = ( (new IconLabel(
-            element,
-            { supportIcons: true, supportHighlights: true, supportDescriptionHighlights: true }
-        )));
-        const iconContainer = prepend(iconLabel.element, $('.icon-container'));
-        const disposables = ( (new DisposableStore()));
-        const actionsContainer = append(element, $('.actions'));
-        const actionBar = ( (new ActionBar(
-            actionsContainer,
-            { actionRunner: this.actionRunner, actionViewItemProvider: this.actionViewItemProvider }
-        )));
-        disposables.add(actionBar);
-        const statsContainer = append(element, $('.stats-container'));
-        const filesLabel = append(statsContainer, $('.files-label'));
-        const insertionsLabel = append(statsContainer, $('.insertions-label'));
-        const deletionsLabel = append(statsContainer, $('.deletions-label'));
-        const statsCustomHover = this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), statsContainer, '');
-        disposables.add(statsCustomHover);
-        return { iconContainer, label: iconLabel, actionBar, statsContainer, statsCustomHover, filesLabel, insertionsLabel, deletionsLabel, elementDisposables: ( (new DisposableStore())), disposables };
-    }
-    renderElement(node, index, templateData, height) {
-        const historyItem = node.element;
-        templateData.iconContainer.className = 'icon-container';
-        if (historyItem.icon && ThemeIcon.isThemeIcon(historyItem.icon)) {
-            templateData.iconContainer.classList.add(...ThemeIcon.asClassNameArray(historyItem.icon));
-        }
-        const title = this.getTooltip(historyItem);
-        const [matches, descriptionMatches] = this.processMatches(historyItem, node.filterData);
-        templateData.label.setLabel(historyItem.message, historyItem.author, { matches, descriptionMatches, title });
-        templateData.actionBar.clear();
-        templateData.actionBar.context = historyItem;
-        const menus = this.scmViewService.menus.getRepositoryMenus(historyItem.historyItemGroup.repository.provider);
-        if (menus.historyProviderMenu) {
-            const historyItemMenu = menus.historyProviderMenu.getHistoryItemMenu(historyItem);
-            templateData.elementDisposables.add(connectPrimaryMenuToInlineActionBar(historyItemMenu, templateData.actionBar));
-        }
-        this.renderStatistics(node, index, templateData, height);
-    }
-    renderCompressedElements(node, index, templateData, height) {
-        throw ( (new Error('Should never happen since node is incompressible')));
-    }
-    getTooltip(historyItem) {
-        const markdown = ( (new MarkdownString('', { isTrusted: true, supportThemeIcons: true })));
-        if (historyItem.author) {
-            markdown.appendMarkdown(`$(account) **${historyItem.author}**\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);
-        return { markdown, markdownNotSupportedFallback: historyItem.message };
-    }
-    processMatches(historyItem, filterData) {
-        if (!filterData) {
-            return [undefined, undefined];
-        }
-        return [
-            historyItem.message === filterData.label ? createMatches(filterData.score) : undefined,
-            historyItem.author === filterData.label ? createMatches(filterData.score) : undefined
-        ];
-    }
-    renderStatistics(node, index, templateData, height) {
-        const historyItem = node.element;
-        if (historyItem.statistics) {
-            const statsAriaLabel = [
-                historyItem.statistics.files === 1 ?
-                    ( localize(6439, "{0} file changed", historyItem.statistics.files)) :
-                    ( localize(6440, "{0} files changed", historyItem.statistics.files)),
-                historyItem.statistics.insertions === 1 ? ( localize(6441, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
-                    historyItem.statistics.insertions > 1 ? ( localize(6442, "{0} insertions{1}", historyItem.statistics.insertions, '(+)')) : '',
-                historyItem.statistics.deletions === 1 ? ( localize(6443, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
-                    historyItem.statistics.deletions > 1 ? ( localize(6444, "{0} deletions{1}", historyItem.statistics.deletions, '(-)')) : ''
-            ];
-            const statsTitle = statsAriaLabel.filter(l => l !== '').join(', ');
-            templateData.statsContainer.setAttribute('aria-label', statsTitle);
-            templateData.statsCustomHover.update(statsTitle);
-            templateData.filesLabel.textContent = ( (historyItem.statistics.files.toString()));
-            templateData.insertionsLabel.textContent = historyItem.statistics.insertions > 0 ? `+${historyItem.statistics.insertions}` : '';
-            templateData.insertionsLabel.classList.toggle('hidden', historyItem.statistics.insertions === 0);
-            templateData.deletionsLabel.textContent = historyItem.statistics.deletions > 0 ? `-${historyItem.statistics.deletions}` : '';
-            templateData.deletionsLabel.classList.toggle('hidden', historyItem.statistics.deletions === 0);
-        }
-        templateData.statsContainer.classList.toggle('hidden', historyItem.statistics === undefined);
-    }
-    disposeElement(element, index, templateData, height) {
-        templateData.elementDisposables.clear();
-    }
-    disposeTemplate(templateData) {
-        templateData.disposables.dispose();
-    }
-};
-HistoryItemRenderer = HistoryItemRenderer_1 = ( (__decorate([
-    ( (__param(2, IHoverService))),
-    ( (__param(3, ISCMViewService)))
-], HistoryItemRenderer)));
-let HistoryItem2Renderer = class HistoryItem2Renderer {
-    static { HistoryItem2Renderer_1 = this; }
-    static { this.TEMPLATE_ID = 'history-item-2'; }
-    get templateId() { return HistoryItem2Renderer_1.TEMPLATE_ID; }
-    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');
-        const element = append(container, $('.history-item'));
-        const graphContainer = append(element, $('.graph-container'));
-        const iconLabel = ( (new IconLabel(
-            element,
-            { supportIcons: true, supportHighlights: true, supportDescriptionHighlights: true }
-        )));
-        const labelContainer = append(element, $('.label-container'));
-        element.appendChild(labelContainer);
-        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 [matches, descriptionMatches] = this.processMatches(historyItemViewModel, node.filterData);
-        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));
-                    const hover = this.hoverService.setupManagedHover(instantHoverDelegate, icon, label.title);
-                    templateData.elementDisposables.add(hover);
-                }
-            }
-        }
-    }
-    renderCompressedElements(node, index, templateData, height) {
-        throw ( (new Error('Should never happen since node is incompressible')));
-    }
-    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}**`);
-            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');
-        }
-        markdown.appendMarkdown(`${historyItem.message}\n\n`);
-        if (historyItem.statistics) {
-            markdown.appendMarkdown(`---\n\n`);
-            markdown.appendMarkdown(`<span>${historyItem.statistics.files === 1 ?
-                ( localize(6439, "{0} file changed", historyItem.statistics.files)) :
-                ( localize(6440, "{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(6441, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
-                    ( localize(6442, "{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(6443, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
-                    ( localize(6444, "{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;'));
-        }
-        return { markdown, markdownNotSupportedFallback: historyItem.message };
-    }
-    processMatches(historyItemViewModel, filterData) {
-        if (!filterData) {
-            return [undefined, undefined];
-        }
-        return [
-            historyItemViewModel.historyItem.message === filterData.label ? createMatches(filterData.score) : undefined,
-            historyItemViewModel.historyItem.author === filterData.label ? createMatches(filterData.score) : undefined
-        ];
-    }
-    disposeElement(element, index, templateData, height) {
-        templateData.elementDisposables.clear();
-    }
-    disposeTemplate(templateData) {
-        templateData.disposables.dispose();
-    }
-};
-HistoryItem2Renderer = HistoryItem2Renderer_1 = ( (__decorate([
-    ( (__param(1, IHoverService))),
-    ( (__param(2, IThemeService)))
-], HistoryItem2Renderer)));
-let HistoryItemChangeRenderer = class HistoryItemChangeRenderer {
-    static { HistoryItemChangeRenderer_1 = this; }
-    static { this.TEMPLATE_ID = 'historyItemChange'; }
-    get templateId() { return HistoryItemChangeRenderer_1.TEMPLATE_ID; }
-    constructor(viewMode, labels, labelService) {
-        this.viewMode = viewMode;
-        this.labels = labels;
-        this.labelService = labelService;
-    }
-    renderTemplate(container) {
-        const element = append(container, $('.change'));
-        const name = append(element, $('.name'));
-        const fileLabel = this.labels.create(name, { supportDescriptionHighlights: true, supportHighlights: true });
-        const decorationIcon = append(element, $('.decoration-icon'));
-        return { element, name, fileLabel, decorationIcon, disposables: ( (new DisposableStore())) };
-    }
-    renderElement(node, index, templateData, height) {
-        const historyItemChangeOrFolder = node.element;
-        const uri = ResourceTree.isResourceNode(historyItemChangeOrFolder) ? historyItemChangeOrFolder.element?.uri ?? historyItemChangeOrFolder.uri : historyItemChangeOrFolder.uri;
-        const fileKind = ResourceTree.isResourceNode(historyItemChangeOrFolder) ? FileKind.FOLDER : FileKind.FILE;
-        const hidePath = this.viewMode() === ViewMode.Tree;
-        let matches;
-        let descriptionMatches;
-        if (ResourceTree.isResourceNode(historyItemChangeOrFolder)) {
-            if (!historyItemChangeOrFolder.element) {
-                matches = createMatches(node.filterData);
-            }
-        }
-        else {
-            [matches, descriptionMatches] = processResourceFilterData(uri, node.filterData);
-        }
-        templateData.fileLabel.setFile(uri, { fileDecorations: { colors: false, badges: true }, fileKind, hidePath, matches, descriptionMatches });
-    }
-    renderCompressedElements(node, index, templateData, height) {
-        const compressed = node.element;
-        const folder = compressed.elements[compressed.elements.length - 1];
-        const label = ( (compressed.elements.map(e => e.name)));
-        const matches = createMatches(node.filterData);
-        templateData.fileLabel.setResource({ resource: folder.uri, name: label }, {
-            fileDecorations: { colors: false, badges: true },
-            fileKind: FileKind.FOLDER,
-            matches,
-            separator: this.labelService.getSeparator(folder.uri.scheme)
-        });
-    }
-    disposeTemplate(templateData) {
-        templateData.disposables.dispose();
-    }
-};
-HistoryItemChangeRenderer = HistoryItemChangeRenderer_1 = ( (__decorate([
-    ( (__param(2, ILabelService)))
-], HistoryItemChangeRenderer)));
-let SeparatorRenderer = class SeparatorRenderer {
-    static { SeparatorRenderer_1 = this; }
-    static { this.TEMPLATE_ID = 'separator'; }
-    get templateId() { return SeparatorRenderer_1.TEMPLATE_ID; }
-    constructor(getFilterActions, contextKeyService, contextMenuService, keybindingService, commandService, menuService, telemetryService) {
-        this.getFilterActions = getFilterActions;
-        this.contextKeyService = contextKeyService;
-        this.contextMenuService = contextMenuService;
-        this.keybindingService = keybindingService;
-        this.commandService = commandService;
-        this.menuService = menuService;
-        this.telemetryService = telemetryService;
-    }
-    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 templateDisposables = ( (new DisposableStore()));
-        const element = append(container, $('.separator-container'));
-        const label = ( (new IconLabel(element, { supportIcons: true, })));
-        append(element, $('.separator'));
-        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.splice(0, 0, ...this.getFilterActions(element.element.repository), ( (new Separator())));
-            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.elementDisposables.dispose();
-        templateData.templateDisposables.dispose();
-    }
-};
-SeparatorRenderer = SeparatorRenderer_1 = ( (__decorate([
-    ( (__param(1, IContextKeyService))),
-    ( (__param(2, IContextMenuService))),
-    ( (__param(3, IKeybindingService))),
-    ( (__param(4, ICommandService))),
-    ( (__param(5, IMenuService))),
-    ( (__param(6, ITelemetryService)))
-], SeparatorRenderer)));
 class ListDelegate {
     constructor(inputRenderer) {
         this.inputRenderer = inputRenderer;
@@ -1106,21 +563,6 @@ class ListDelegate {
         else if (isSCMResource(element) || isSCMResourceNode(element)) {
             return ResourceRenderer.TEMPLATE_ID;
         }
-        else if (isSCMHistoryItemGroupTreeElement(element)) {
-            return HistoryItemGroupRenderer.TEMPLATE_ID;
-        }
-        else if (isSCMHistoryItemTreeElement(element)) {
-            return HistoryItemRenderer.TEMPLATE_ID;
-        }
-        else if (isSCMHistoryItemViewModelTreeElement(element)) {
-            return HistoryItem2Renderer.TEMPLATE_ID;
-        }
-        else if (isSCMHistoryItemChangeTreeElement(element) || isSCMHistoryItemChangeNode(element)) {
-            return HistoryItemChangeRenderer.TEMPLATE_ID;
-        }
-        else if (isSCMViewSeparator(element)) {
-            return SeparatorRenderer.TEMPLATE_ID;
-        }
         else {
             throw ( (new Error('Unknown element')));
         }
@@ -1171,42 +613,13 @@ class SCMTreeSorter {
         if (isSCMResourceGroup(one)) {
             return isSCMResourceGroup(other) ? 0 : -1;
         }
-        if (isSCMViewSeparator(one)) {
-            return isSCMResourceGroup(other) ? 1 : -1;
-        }
-        if (isSCMHistoryItemGroupTreeElement(one)) {
-            return isSCMHistoryItemGroupTreeElement(other) ? 0 : 1;
-        }
-        if (isSCMHistoryItemTreeElement(one)) {
-            if (!isSCMHistoryItemTreeElement(other)) {
-                throw ( (new Error('Invalid comparison')));
-            }
-            return 0;
-        }
-        if (isSCMHistoryItemViewModelTreeElement(one)) {
-            return isSCMHistoryItemViewModelTreeElement(other) ? 0 : 1;
-        }
-        if (isSCMHistoryItemChangeTreeElement(one) || isSCMHistoryItemChangeNode(one)) {
-            if (this.viewMode() === ViewMode.List) {
-                if (!isSCMHistoryItemChangeTreeElement(other)) {
-                    throw ( (new Error('Invalid comparison')));
-                }
-                return comparePaths(one.uri.fsPath, other.uri.fsPath);
-            }
-            if (!isSCMHistoryItemChangeTreeElement(other) && !isSCMHistoryItemChangeNode(other)) {
-                throw ( (new Error('Invalid comparison')));
-            }
-            const oneName = isSCMHistoryItemChangeNode(one) ? one.name : basename(one.uri);
-            const otherName = isSCMHistoryItemChangeNode(other) ? other.name : basename(other.uri);
-            return compareFileNames(oneName, otherName);
-        }
-        if (this.viewMode() === ViewMode.List) {
-            if (this.viewSortKey() === ViewSortKey.Name) {
+        if (this.viewMode() === "list" ) {
+            if (this.viewSortKey() === "name" ) {
                 const oneName = basename(one.sourceUri);
                 const otherName = basename(other.sourceUri);
                 return compareFileNames(oneName, otherName);
             }
-            if (this.viewSortKey() === ViewSortKey.Status) {
+            if (this.viewSortKey() === "status" ) {
                 const oneTooltip = one.decorations.tooltip ?? '';
                 const otherTooltip = other.decorations.tooltip ?? '';
                 if (oneTooltip !== otherTooltip) {
@@ -1242,25 +655,14 @@ let SCMTreeKeyboardNavigationLabelProvider = class SCMTreeKeyboardNavigationLabe
         else if (isSCMResourceGroup(element)) {
             return element.label;
         }
-        else if (isSCMHistoryItemGroupTreeElement(element)) {
-            return element.label;
-        }
-        else if (isSCMHistoryItemTreeElement(element)) {
-            return [element.message, element.author];
-        }
-        else if (isSCMHistoryItemViewModelTreeElement(element)) {
-            return [element.historyItemViewModel.historyItem.message, element.historyItemViewModel.historyItem.author];
-        }
-        else if (isSCMViewSeparator(element)) {
-            return element.label;
-        }
         else {
-            if (this.viewMode() === ViewMode.List) {
-                const uri = isSCMResource(element) ? element.sourceUri : element.uri;
-                return [basename(uri), this.labelService.getUriLabel(uri, { relative: true })];
+            if (this.viewMode() === "list" ) {
+                const fileName = basename(element.sourceUri);
+                const filePath = this.labelService.getUriLabel(element.sourceUri, { relative: true });
+                return [fileName, filePath];
             }
             else {
-                return basename(isSCMResource(element) ? element.sourceUri : element.uri);
+                return basename(element.sourceUri);
             }
         }
     }
@@ -1298,36 +700,6 @@ function getSCMResourceId(element) {
         const group = element.context;
         return `folder:${group.provider.id}/${group.id}/$FOLDER/${( (element.uri.toString()))}`;
     }
-    else if (isSCMHistoryItemGroupTreeElement(element)) {
-        const provider = element.repository.provider;
-        return `historyItemGroup:${provider.id}/${element.id}`;
-    }
-    else if (isSCMHistoryItemTreeElement(element)) {
-        const historyItemGroup = element.historyItemGroup;
-        const provider = historyItemGroup.repository.provider;
-        return `historyItem:${provider.id}/${historyItemGroup.id}/${element.id}/${element.parentIds.join(',')}`;
-    }
-    else if (isSCMHistoryItemViewModelTreeElement(element)) {
-        const provider = element.repository.provider;
-        const historyItem = element.historyItemViewModel.historyItem;
-        return `historyItem2:${provider.id}/${historyItem.id}/${historyItem.parentIds.join(',')}`;
-    }
-    else if (isSCMHistoryItemChangeTreeElement(element)) {
-        const historyItem = element.historyItem;
-        const historyItemGroup = historyItem.historyItemGroup;
-        const provider = historyItemGroup.repository.provider;
-        return `historyItemChange:${provider.id}/${historyItemGroup.id}/${historyItem.id}/${( (element.uri.toString()))}`;
-    }
-    else if (isSCMHistoryItemChangeNode(element)) {
-        const historyItem = element.context;
-        const historyItemGroup = historyItem.historyItemGroup;
-        const provider = historyItemGroup.repository.provider;
-        return `folder:${provider.id}/${historyItemGroup.id}/${historyItem.id}/$FOLDER/${( (element.uri.toString()))}`;
-    }
-    else if (isSCMViewSeparator(element)) {
-        const provider = element.repository.provider;
-        return `separator:${provider.id}`;
-    }
     else {
         throw ( (new Error('Invalid tree element')));
     }
@@ -1342,7 +714,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         this.labelService = labelService;
     }
     getWidgetAriaLabel() {
-        return ( localize(6445, "Source Control Management"));
+        return ( localize(6602, "Source Control Management"));
     }
     getAriaLabel(element) {
         if (ResourceTree.isResourceNode(element)) {
@@ -1352,7 +724,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
             return `${element.provider.name} ${element.provider.label}`;
         }
         else if (isSCMInput(element)) {
-            return ( localize(6446, "Source Control Input"));
+            return ( localize(6603, "Source Control Input"));
         }
         else if (isSCMActionButton(element)) {
             return element.button?.command.title ?? '';
@@ -1360,27 +732,6 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         else if (isSCMResourceGroup(element)) {
             return element.label;
         }
-        else if (isSCMHistoryItemGroupTreeElement(element)) {
-            return element.ariaLabel ?? `${element.label.trim()}${element.description ? `, ${element.description}` : ''}`;
-        }
-        else if (isSCMHistoryItemTreeElement(element)) {
-            return `${stripIcons(element.message).trim()}${element.author ? `, ${element.author}` : ''}`;
-        }
-        else if (isSCMHistoryItemViewModelTreeElement(element)) {
-            const historyItem = element.historyItemViewModel.historyItem;
-            return `${stripIcons(historyItem.message).trim()}${historyItem.author ? `, ${historyItem.author}` : ''}`;
-        }
-        else if (isSCMHistoryItemChangeTreeElement(element)) {
-            const result = [basename(element.uri)];
-            const path = this.labelService.getUriLabel(dirname(element.uri), { relative: true, noPrefix: true });
-            if (path) {
-                result.push(path);
-            }
-            return result.join(', ');
-        }
-        else if (isSCMViewSeparator(element)) {
-            return element.ariaLabel ?? element.label;
-        }
         else {
             const result = [];
             result.push(basename(element.sourceUri));
@@ -1398,30 +749,20 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
 SCMAccessibilityProvider = ( (__decorate([
     ( (__param(0, ILabelService)))
 ], SCMAccessibilityProvider)));
-var ViewMode;
-( ((function(ViewMode) {
-    ViewMode["List"] = "list";
-    ViewMode["Tree"] = "tree";
-})(ViewMode || (ViewMode = {}))));
-var ViewSortKey;
-( ((function(ViewSortKey) {
-    ViewSortKey["Path"] = "path";
-    ViewSortKey["Name"] = "name";
-    ViewSortKey["Status"] = "status";
-})(ViewSortKey || (ViewSortKey = {}))));
 const Menus = {
     ViewSort: ( (new MenuId('SCMViewSort'))),
     Repositories: ( (new MenuId('SCMRepositories'))),
     ChangesSettings: ( (new MenuId('SCMChangesSettings'))),
 };
 const ContextKeys = {
-    SCMViewMode: ( (new RawContextKey('scmViewMode', ViewMode.List))),
-    SCMViewSortKey: ( (new RawContextKey('scmViewSortKey', ViewSortKey.Path))),
+    SCMViewMode: ( (new RawContextKey('scmViewMode', "list" ))),
+    SCMViewSortKey: ( (new RawContextKey('scmViewSortKey', "path" ))),
     SCMViewAreAllRepositoriesCollapsed: ( (new RawContextKey('scmViewAreAllRepositoriesCollapsed', false))),
     SCMViewIsAnyRepositoryCollapsible: ( (new RawContextKey('scmViewIsAnyRepositoryCollapsible', false))),
     SCMProvider: ( (new RawContextKey('scmProvider', undefined))),
     SCMProviderRootUri: ( (new RawContextKey('scmProviderRootUri', undefined))),
     SCMProviderHasRootUri: ( (new RawContextKey('scmProviderHasRootUri', undefined))),
+    SCMHistoryItemCount: ( (new RawContextKey('scmHistoryItemCount', 0))),
     RepositoryCount: ( (new RawContextKey('scmRepositoryCount', 0))),
     RepositoryVisibilityCount: ( (new RawContextKey('scmRepositoryVisibleCount', 0))),
     RepositoryVisibility(repository) {
@@ -1431,7 +772,7 @@ const ContextKeys = {
     }
 };
 MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
-    title: ( localize(6447, "View & Sort")),
+    title: ( localize(6604, "View & Sort")),
     submenu: Menus.ViewSort,
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
@@ -1441,62 +782,11 @@ MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
     order: 1
 });
 MenuRegistry.appendMenuItem(Menus.ViewSort, {
-    title: ( localize(6448, "Repositories")),
+    title: ( localize(6605, "Repositories")),
     submenu: Menus.Repositories,
     when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
     group: '0_repositories'
 });
-registerAction2(class extends Action2 {
-    constructor() {
-        super({
-            id: 'workbench.scm.action.scm.viewChanges',
-            title: ( localize(6449, "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(
-                6450,
-                "All Changes ({0} ↔ {1})",
-                historyItemLast.id.substring(0, 8),
-                historyItem.id.substring(0, 8)
-            ));
-        const rootUri = provider.rootUri;
-        const path = rootUri ? rootUri.path : provider.label;
-        const multiDiffSourceUri = ( (URI.from(
-            { scheme: 'scm-history-item', path: `${path}/${historyItemParentId}..${historyItem.id}` },
-            true
-        )));
-        commandService.executeCommand('_workbench.openMultiDiffEditor', { title, multiDiffSourceUri, resources: historyItemChanges });
-    }
-});
 class RepositoryVisibilityAction extends Action2 {
     constructor(repository) {
         super({
@@ -1585,16 +875,16 @@ class SetListViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setListViewMode', menu = {}) {
         super({
             id,
-            title: ( localize(6451, "View as List")),
+            title: ( localize(6606, "View as List")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listTree,
-            toggled: ( (ContextKeys.SCMViewMode.isEqualTo(ViewMode.List))),
+            toggled: ( (ContextKeys.SCMViewMode.isEqualTo("list" ))),
             menu: { id: Menus.ViewSort, group: '1_viewmode', ...menu }
         });
     }
     async runInView(_, view) {
-        view.viewMode = ViewMode.List;
+        view.viewMode = "list" ;
     }
 }
 class SetListViewModeNavigationAction extends SetListViewModeAction {
@@ -1604,7 +894,7 @@ class SetListViewModeNavigationAction extends SetListViewModeAction {
             when: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
                  (ContextKeys.RepositoryCount.notEqualsTo(0)),
-                 (ContextKeys.SCMViewMode.isEqualTo(ViewMode.Tree))
+                 (ContextKeys.SCMViewMode.isEqualTo("tree" ))
             ))),
             group: 'navigation',
             order: -1000
@@ -1615,16 +905,16 @@ class SetTreeViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setTreeViewMode', menu = {}) {
         super({
             id,
-            title: ( localize(6452, "View as Tree")),
+            title: ( localize(6607, "View as Tree")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listFlat,
-            toggled: ( (ContextKeys.SCMViewMode.isEqualTo(ViewMode.Tree))),
+            toggled: ( (ContextKeys.SCMViewMode.isEqualTo("tree" ))),
             menu: { id: Menus.ViewSort, group: '1_viewmode', ...menu }
         });
     }
     async runInView(_, view) {
-        view.viewMode = ViewMode.Tree;
+        view.viewMode = "tree" ;
     }
 }
 class SetTreeViewModeNavigationAction extends SetTreeViewModeAction {
@@ -1634,7 +924,7 @@ class SetTreeViewModeNavigationAction extends SetTreeViewModeAction {
             when: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
                  (ContextKeys.RepositoryCount.notEqualsTo(0)),
-                 (ContextKeys.SCMViewMode.isEqualTo(ViewMode.List))
+                 (ContextKeys.SCMViewMode.isEqualTo("list" ))
             ))),
             group: 'navigation',
             order: -1000
@@ -1672,17 +962,17 @@ class RepositorySortAction extends ViewAction {
 }
 class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(6453, "Sort by Discovery Time")));
+        super("discoveryTime" , ( localize(6608, "Sort by Discovery Time")));
     }
 }
 class RepositorySortByNameAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Name, ( localize(6454, "Sort by Name")));
+        super("name" , ( localize(6609, "Sort by Name")));
     }
 }
 class RepositorySortByPathAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Path, ( localize(6455, "Sort by Path")));
+        super("path" , ( localize(6610, "Sort by Path")));
     }
 }
 registerAction2(RepositorySortByDiscoveryTimeAction);
@@ -1696,7 +986,7 @@ class SetSortKeyAction extends ViewAction {
             viewId: VIEW_PANE_ID,
             f1: false,
             toggled: ( (ContextKeys.SCMViewSortKey.isEqualTo(sortKey))),
-            precondition: ( (ContextKeys.SCMViewMode.isEqualTo(ViewMode.List))),
+            precondition: ( (ContextKeys.SCMViewMode.isEqualTo("list" ))),
             menu: { id: Menus.ViewSort, group: '2_sort' }
         });
         this.sortKey = sortKey;
@@ -1707,17 +997,17 @@ class SetSortKeyAction extends ViewAction {
 }
 class SetSortByNameAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Name, ( localize(6456, "Sort Changes by Name")));
+        super("name" , ( localize(6611, "Sort Changes by Name")));
     }
 }
 class SetSortByPathAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Path, ( localize(6457, "Sort Changes by Path")));
+        super("path" , ( localize(6612, "Sort Changes by Path")));
     }
 }
 class SetSortByStatusAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Status, ( localize(6458, "Sort Changes by Status")));
+        super("status" , ( localize(6613, "Sort Changes by Status")));
     }
 }
 registerAction2(SetSortByNameAction);
@@ -1727,7 +1017,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.collapseAllRepositories`,
-            title: ( localize(6459, "Collapse All Repositories")),
+            title: ( localize(6614, "Collapse All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.collapseAll,
@@ -1750,7 +1040,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.expandAllRepositories`,
-            title: ( localize(6460, "Expand All Repositories")),
+            title: ( localize(6615, "Expand All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.expandAll,
@@ -1771,14 +1061,6 @@ class ExpandAllRepositoriesAction extends ViewAction {
 }
 registerAction2(CollapseAllRepositoriesAction);
 registerAction2(ExpandAllRepositoriesAction);
-var SCMInputWidgetCommandId;
-( ((function(SCMInputWidgetCommandId) {
-    SCMInputWidgetCommandId["CancelAction"] = "scm.input.cancelAction";
-})(SCMInputWidgetCommandId || (SCMInputWidgetCommandId = {}))));
-var SCMInputWidgetStorageKey;
-( ((function(SCMInputWidgetStorageKey) {
-    SCMInputWidgetStorageKey["LastActionId"] = "scm.input.lastActionId";
-})(SCMInputWidgetStorageKey || (SCMInputWidgetStorageKey = {}))));
 let SCMInputWidgetActionRunner = class SCMInputWidgetActionRunner extends ActionRunner {
     get runningActions() { return this._runningActions; }
     constructor(input, storageService) {
@@ -1791,7 +1073,7 @@ let SCMInputWidgetActionRunner = class SCMInputWidgetActionRunner extends Action
         try {
             if (this.runningActions.size !== 0) {
                 this._cts?.cancel();
-                if (action.id === SCMInputWidgetCommandId.CancelAction) {
+                if (action.id === "scm.input.cancelAction" ) {
                     return;
                 }
             }
@@ -1809,7 +1091,7 @@ let SCMInputWidgetActionRunner = class SCMInputWidgetActionRunner extends Action
         finally {
             this._runningActions.delete(action);
             if (this._runningActions.size === 0) {
-                this.storageService.store(SCMInputWidgetStorageKey.LastActionId, action.id, StorageScope.PROFILE, StorageTarget.USER);
+                this.storageService.store("scm.input.lastActionId" , action.id, 0 , 0 );
             }
         }
     }
@@ -1829,10 +1111,10 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         this._onDidChange = ( (new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._disposables = this._register(( (new MutableDisposable())));
-        this._dropdownAction = ( (new Action('scmInputMoreActions', ( localize(6461, "More Actions...")), 'codicon-chevron-down')));
+        this._dropdownAction = ( (new Action('scmInputMoreActions', ( localize(6616, "More Actions...")), 'codicon-chevron-down')));
         this._cancelAction = ( (new MenuItemAction({
-            id: SCMInputWidgetCommandId.CancelAction,
-            title: ( localize(6462, "Cancel")),
+            id: "scm.input.cancelAction" ,
+            title: ( localize(6617, "Cancel")),
             icon: Codicon.debugStop,
         }, undefined, undefined, undefined, undefined, contextKeyService, commandService)));
     }
@@ -1861,7 +1143,7 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
                 primaryAction = actions[0];
             }
             else if (actions.length > 1) {
-                const lastActionId = this.storageService.get(SCMInputWidgetStorageKey.LastActionId, StorageScope.PROFILE, '');
+                const lastActionId = this.storageService.get("scm.input.lastActionId" , 0 , '');
                 primaryAction = actions.find(a => a.id === lastActionId) ?? actions[0];
             }
             this._dropdownActions = actions.length === 1 ? [] : actions;
@@ -1870,7 +1152,7 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         };
         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._disposables.value.add(this.storageService.onDidChangeValue(0 , "scm.input.lastActionId" , this._disposables.value)(() => updateToolbar()));
         this.actionRunner = ( (new SCMInputWidgetActionRunner(input, this.storageService)));
         this._disposables.value.add(this.actionRunner.onWillRun(e => {
             if (this.actionRunner.runningActions.size === 0) {
@@ -1979,9 +1261,9 @@ class SCMInputWidgetEditorOptions {
 let SCMInputWidget = class SCMInputWidget {
     static { SCMInputWidget_1 = this; }
     static { this.ValidationTimeouts = {
-        [InputValidationType.Information]: 5000,
-        [InputValidationType.Warning]: 8000,
-        [InputValidationType.Error]: 10000
+        [2 ]: 5000,
+        [1 ]: 8000,
+        [0 ]: 10000
     }; }
     get input() {
         return this.model?.input;
@@ -2002,7 +1284,7 @@ let SCMInputWidget = class SCMInputWidget {
         const textModel = input.repository.provider.inputBoxTextModel;
         this.inputEditor.setModel(textModel);
         if (this.configurationService.getValue('editor.wordBasedSuggestions', { resource: textModel.uri }) !== 'off') {
-            this.configurationService.updateValue('editor.wordBasedSuggestions', 'off', { resource: textModel.uri }, ConfigurationTarget.MEMORY);
+            this.configurationService.updateValue('editor.wordBasedSuggestions', 'off', { resource: textModel.uri }, 8 );
         }
         const validationDelayer = ( (new ThrottledDelayer(200)));
         const validate = async () => {
@@ -2015,7 +1297,7 @@ let SCMInputWidget = class SCMInputWidget {
         this.repositoryDisposables.add(validationDelayer);
         this.repositoryDisposables.add(this.inputEditor.onDidChangeCursorPosition(triggerValidation));
         const opts = this.modelService.getCreationOptions(textModel.getLanguageId(), textModel.uri, textModel.isForSimpleWidget);
-        const onEnter = Event.filter(this.inputEditor.onKeyDown, e => e.keyCode === KeyCode.Enter, this.repositoryDisposables);
+        const onEnter = Event.filter(this.inputEditor.onKeyDown, e => e.keyCode === 3 , this.repositoryDisposables);
         this.repositoryDisposables.add(onEnter(() => textModel.detectIndentation(opts.insertSpaces, opts.tabSize)));
         textModel.setValue(input.value);
         this.repositoryDisposables.add(input.onDidChange(({ value, reason }) => {
@@ -2090,7 +1372,7 @@ let SCMInputWidget = class SCMInputWidget {
             this._validationTimer = setTimeout(() => this.setValidation(undefined), SCMInputWidget_1.ValidationTimeouts[validation.type]);
         }
     }
-    constructor(container, overflowWidgetsDomNode, contextKeyService, modelService, keybindingService, configurationService, instantiationService, scmViewService, contextViewService, openerService, contextMenuService) {
+    constructor(container, overflowWidgetsDomNode, contextKeyService, modelService, keybindingService, configurationService, instantiationService, scmViewService, contextViewService, openerService) {
         this.modelService = modelService;
         this.keybindingService = keybindingService;
         this.configurationService = configurationService;
@@ -2098,7 +1380,6 @@ let SCMInputWidget = class SCMInputWidget {
         this.scmViewService = scmViewService;
         this.contextViewService = contextViewService;
         this.openerService = openerService;
-        this.contextMenuService = contextMenuService;
         this.disposables = ( (new DisposableStore()));
         this.repositoryDisposables = ( (new DisposableStore()));
         this.validationHasFocus = false;
@@ -2123,7 +1404,7 @@ let SCMInputWidget = class SCMInputWidget {
                 EditorDictation.ID,
                 FormatOnType.ID,
                 ContentHoverController.ID,
-                MarginHoverController.ID,
+                GlyphHoverController.ID,
                 InlineCompletionsController.ID,
                 LinkDetector.ID,
                 MenuPreventer.ID,
@@ -2177,7 +1458,7 @@ let SCMInputWidget = class SCMInputWidget {
         this.toolbar = instantiationService2.createInstance(SCMInputWidgetToolbar, this.toolbarContainer, {
             actionViewItemProvider: (action, options) => {
                 if (action instanceof MenuItemAction && this.toolbar.dropdownActions.length > 1) {
-                    return instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, this.toolbar.dropdownAction, this.toolbar.dropdownActions, '', this.contextMenuService, { actionRunner: this.toolbar.actionRunner, hoverDelegate: options.hoverDelegate });
+                    return instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, this.toolbar.dropdownAction, this.toolbar.dropdownActions, '', { actionRunner: this.toolbar.actionRunner, hoverDelegate: options.hoverDelegate });
                 }
                 return createActionViewItem(instantiationService, action, options);
             },
@@ -2189,8 +1470,8 @@ let SCMInputWidget = class SCMInputWidget {
         this.disposables.add(this.toolbar);
     }
     getContentHeight() {
-        const lineHeight = this.inputEditor.getOption(EditorOption.lineHeight);
-        const { top, bottom } = this.inputEditor.getOption(EditorOption.padding);
+        const lineHeight = this.inputEditor.getOption(69 );
+        const { top, bottom } = this.inputEditor.getOption(86 );
         const inputMinLinesConfig = this.configurationService.getValue('scm.inputMinLineCount');
         const inputMinLines = typeof inputMinLinesConfig === 'number' ? clamp(inputMinLinesConfig, 1, 50) : 1;
         const editorMinHeight = inputMinLines * lineHeight + top + bottom;
@@ -2234,9 +1515,9 @@ let SCMInputWidget = class SCMInputWidget {
     }
     renderValidation() {
         this.clearValidation();
-        this.element.classList.toggle('validation-info', this.validation?.type === InputValidationType.Information);
-        this.element.classList.toggle('validation-warning', this.validation?.type === InputValidationType.Warning);
-        this.element.classList.toggle('validation-error', this.validation?.type === InputValidationType.Error);
+        this.element.classList.toggle('validation-info', this.validation?.type === 2 );
+        this.element.classList.toggle('validation-warning', this.validation?.type === 1 );
+        this.element.classList.toggle('validation-error', this.validation?.type === 0 );
         if (!this.validation || !this.inputEditor.hasTextFocus()) {
             return;
         }
@@ -2247,9 +1528,9 @@ let SCMInputWidget = class SCMInputWidget {
                 this.element.style.borderBottomLeftRadius = '0';
                 this.element.style.borderBottomRightRadius = '0';
                 const validationContainer = append(container, $('.scm-editor-validation-container'));
-                validationContainer.classList.toggle('validation-info', this.validation.type === InputValidationType.Information);
-                validationContainer.classList.toggle('validation-warning', this.validation.type === InputValidationType.Warning);
-                validationContainer.classList.toggle('validation-error', this.validation.type === InputValidationType.Error);
+                validationContainer.classList.toggle('validation-info', this.validation.type === 2 );
+                validationContainer.classList.toggle('validation-warning', this.validation.type === 1 );
+                validationContainer.classList.toggle('validation-error', this.validation.type === 0 );
                 validationContainer.style.width = `${this.element.clientWidth + 2}px`;
                 const element = append(validationContainer, $('.scm-editor-validation'));
                 const message = this.validation.message;
@@ -2283,7 +1564,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', ( localize(6463, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
+                const action = ( (new Action('scmInputWidget.validationMessage.close', ( localize(6618, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
                     this.contextViewService.hideContextView();
                     this.element.style.borderBottomLeftRadius = '2px';
                     this.element.style.borderBottomRightRadius = '2px';
@@ -2298,7 +1579,7 @@ let SCMInputWidget = class SCMInputWidget {
                 this.element.style.borderBottomRightRadius = '2px';
                 disposables.dispose();
             },
-            anchorAlignment: AnchorAlignment.LEFT
+            anchorAlignment: 0
         });
     }
     getToolbarWidth() {
@@ -2330,8 +1611,7 @@ SCMInputWidget = SCMInputWidget_1 = ( (__decorate([
     ( (__param(6, IInstantiationService))),
     ( (__param(7, ISCMViewService))),
     ( (__param(8, IContextViewService))),
-    ( (__param(9, IOpenerService))),
-    ( (__param(10, IContextMenuService)))
+    ( (__param(9, IOpenerService)))
 ], SCMInputWidget)));
 let SCMViewPane = class SCMViewPane extends ViewPane {
     get viewMode() { return this._viewMode; }
@@ -2346,7 +1626,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         this._onDidChangeViewMode.fire(mode);
         this.viewModeContextKey.set(mode);
         this.updateIndentStyles(this.themeService.getFileIconTheme());
-        this.storageService.store(`scm.viewMode`, mode, StorageScope.WORKSPACE, StorageTarget.USER);
+        this.storageService.store(`scm.viewMode`, mode, 1 , 0 );
     }
     get viewSortKey() { return this._viewSortKey; }
     set viewSortKey(sortKey) {
@@ -2357,11 +1637,11 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         this.updateChildren();
         this.viewSortKeyContextKey.set(sortKey);
         this._onDidChangeViewSortKey.fire(sortKey);
-        if (this._viewMode === ViewMode.List) {
-            this.storageService.store(`scm.viewSortKey`, sortKey, StorageScope.WORKSPACE, StorageTarget.USER);
+        if (this._viewMode === "list" ) {
+            this.storageService.store(`scm.viewSortKey`, sortKey, 1 , 0 );
         }
     }
-    constructor(options, commandService, editorService, menuService, scmService, scmViewService, storageService, uriIdentityService, layoutService, keybindingService, themeService, contextMenuService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, telemetryService, hoverService) {
+    constructor(options, commandService, editorService, menuService, scmService, scmViewService, storageService, uriIdentityService, 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;
@@ -2370,7 +1650,6 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         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()));
@@ -2394,7 +1673,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         this.scmProviderHasRootUriContextKey = ContextKeys.SCMProviderHasRootUri.bindTo(contextKeyService);
         this._onDidLayout = ( (new Emitter()));
         this.layoutCache = { height: undefined, width: undefined, onDidChange: this._onDidLayout.event };
-        this.storageService.onDidChangeValue(StorageScope.WORKSPACE, undefined, this.disposables)(e => {
+        this.storageService.onDidChangeValue(1 , undefined, this.disposables)(e => {
             switch (e.key) {
                 case 'scm.viewMode':
                     this.viewMode = this.getViewMode();
@@ -2489,14 +1768,6 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         const resourceActionRunner = ( (new RepositoryPaneActionRunner(() => this.getSelectedResources())));
         resourceActionRunner.onWillRun(() => this.tree.domFocus(), this, this.disposables);
         this.disposables.add(resourceActionRunner);
-        const historyItemGroupActionRunner = ( (new HistoryItemGroupActionRunner()));
-        historyItemGroupActionRunner.onWillRun(() => this.tree.domFocus(), this, this.disposables);
-        this.disposables.add(historyItemGroupActionRunner);
-        const historyItemActionRunner = ( (new HistoryItemActionRunner()));
-        historyItemActionRunner.onWillRun(() => this.tree.domFocus(), this, this.disposables);
-        this.disposables.add(historyItemActionRunner);
-        const historyItemHoverDelegate = this.instantiationService.createInstance(HistoryItemHoverDelegate, this.viewDescriptorService.getViewLocationById(this.id), this.layoutService.getSideBarPosition());
-        this.disposables.add(historyItemHoverDelegate);
         const treeDataSource = this.instantiationService.createInstance(SCMTreeDataSource, () => this.viewMode);
         this.disposables.add(treeDataSource);
         const compressionEnabled = observableConfigValue('scm.compactFolders', true, this.configurationService);
@@ -2518,7 +1789,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             overrideStyles: this.getLocationBasedColors().listOverrideStyles,
             compressionEnabled: compressionEnabled.get(),
             collapseByDefault: (e) => {
-                if (isSCMRepository(e) || isSCMResourceGroup(e) || isSCMResourceNode(e) || isSCMHistoryItemChangeNode(e)) {
+                if (isSCMRepository(e) || isSCMResourceGroup(e) || isSCMResourceNode(e)) {
                     return false;
                 }
                 return (viewState?.expanded ?? []).indexOf(getSCMResourceId(e)) === -1;
@@ -2615,43 +1886,6 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             }
             return;
         }
-        else if (isSCMHistoryItemGroupTreeElement(e.element)) {
-            this.scmViewService.focus(e.element.repository);
-            return;
-        }
-        else if (isSCMHistoryItemTreeElement(e.element)) {
-            this.scmViewService.focus(e.element.historyItemGroup.repository);
-            return;
-        }
-        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.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 path = rootUri ? rootUri.path : e.element.repository.provider.label;
-                const multiDiffSourceUri = ( (URI.from(
-                    { scheme: 'scm-history-item', path: `${path}/${historyItemParentId}..${historyItem.id}` },
-                    true
-                )));
-                await this.commandService.executeCommand('_workbench.openMultiDiffEditor', { title, multiDiffSourceUri, resources: historyItemChanges });
-            }
-            this.scmViewService.focus(e.element.repository);
-            return;
-        }
-        else if (isSCMHistoryItemChangeTreeElement(e.element)) {
-            if (e.element.originalUri && e.element.modifiedUri) {
-                await this.commandService.executeCommand(API_OPEN_DIFF_EDITOR_COMMAND_ID, ...toDiffEditorArguments(e.element.uri, e.element.originalUri, e.element.modifiedUri), e);
-            }
-            this.scmViewService.focus(e.element.historyItem.historyItemGroup.repository);
-            return;
-        }
-        else if (isSCMHistoryItemChangeNode(e.element)) {
-            this.scmViewService.focus(e.element.context.historyItemGroup.repository);
-            return;
-        }
     }
     onDidActiveEditorChange() {
         if (!this.configurationService.getValue('scm.autoReveal')) {
@@ -2677,7 +1911,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
                 }
                 for (let j = repository.provider.groups.length - 1; j >= 0; j--) {
                     const groupItem = repository.provider.groups[j];
-                    const resource = this.viewMode === ViewMode.Tree
+                    const resource = this.viewMode === "tree"
                         ? groupItem.resourceTree.getNode(uri)?.element
                         : groupItem.resources.find(r => this.uriIdentityService.extUri.isEqual(r.sourceUri, uri));
                     if (resource) {
@@ -2768,30 +2002,6 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
                 actions = collectContextMenuActions(menu);
             }
         }
-        else if (isSCMHistoryItemGroupTreeElement(element)) {
-            const menus = this.scmViewService.menus.getRepositoryMenus(element.repository.provider);
-            const menu = menus.historyProviderMenu?.getHistoryItemGroupContextMenu(element);
-            if (menu) {
-                actionRunner = ( (new HistoryItemGroupActionRunner()));
-                createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, actions);
-            }
-        }
-        else if (isSCMHistoryItemTreeElement(element)) {
-            const menus = this.scmViewService.menus.getRepositoryMenus(element.historyItemGroup.repository.provider);
-            const menu = menus.historyProviderMenu?.getHistoryItemMenu(element);
-            if (menu) {
-                actionRunner = ( (new HistoryItemActionRunner()));
-                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,
@@ -2809,43 +2019,39 @@ 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);
+        let mode = this.configurationService.getValue('scm.defaultViewMode') === 'list' ? "list"  : "tree" ;
+        const storageMode = this.storageService.get(`scm.viewMode`, 1 );
         if (typeof storageMode === 'string') {
             mode = storageMode;
         }
         return mode;
     }
     getViewSortKey() {
-        if (this._viewMode === ViewMode.Tree) {
-            return ViewSortKey.Path;
+        if (this._viewMode === "tree" ) {
+            return "path" ;
         }
         let viewSortKey;
         const viewSortKeyString = this.configurationService.getValue('scm.defaultViewSortKey');
         switch (viewSortKeyString) {
             case 'name':
-                viewSortKey = ViewSortKey.Name;
+                viewSortKey = "name" ;
                 break;
             case 'status':
-                viewSortKey = ViewSortKey.Status;
+                viewSortKey = "status" ;
                 break;
             default:
-                viewSortKey = ViewSortKey.Path;
+                viewSortKey = "path" ;
                 break;
         }
-        const storageSortKey = this.storageService.get(`scm.viewSortKey`, StorageScope.WORKSPACE);
+        const storageSortKey = this.storageService.get(`scm.viewSortKey`, 1 );
         if (typeof storageSortKey === 'string') {
             viewSortKey = storageSortKey;
         }
         return viewSortKey;
     }
     loadTreeViewState() {
-        const storageViewState = this.storageService.get('scm.viewState2', StorageScope.WORKSPACE);
+        const storageViewState = this.storageService.get('scm.viewState2', 1 );
         if (!storageViewState) {
             return undefined;
         }
@@ -2859,7 +2065,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
     }
     storeTreeViewState() {
         if (this.tree) {
-            this.storageService.store('scm.viewState2', JSON.stringify(this.tree.getViewState()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            this.storageService.store('scm.viewState2', JSON.stringify(this.tree.getViewState()), 1 , 1 );
         }
     }
     updateChildren(element) {
@@ -2879,10 +2085,10 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         }));
     }
     updateIndentStyles(theme) {
-        this.treeContainer.classList.toggle('list-view-mode', this.viewMode === ViewMode.List);
-        this.treeContainer.classList.toggle('tree-view-mode', this.viewMode === ViewMode.Tree);
-        this.treeContainer.classList.toggle('align-icons-and-twisties', (this.viewMode === ViewMode.List && theme.hasFileIcons) || (theme.hasFileIcons && !theme.hasFolderIcons));
-        this.treeContainer.classList.toggle('hide-arrows', this.viewMode === ViewMode.Tree && theme.hidesExplorerArrows === true);
+        this.treeContainer.classList.toggle('list-view-mode', this.viewMode === "list" );
+        this.treeContainer.classList.toggle('tree-view-mode', this.viewMode === "tree" );
+        this.treeContainer.classList.toggle('align-icons-and-twisties', (this.viewMode === "list"  && theme.hasFileIcons) || (theme.hasFileIcons && !theme.hasFolderIcons));
+        this.treeContainer.classList.toggle('hide-arrows', this.viewMode === "tree"  && theme.hidesExplorerArrows === true);
     }
     updateScmProviderContextKeys() {
         const alwaysShowRepositories = this.configurationService.getValue('scm.alwaysShowRepositories');
@@ -3032,17 +2238,16 @@ SCMViewPane = ( (__decorate([
     ( (__param(5, ISCMViewService))),
     ( (__param(6, IStorageService))),
     ( (__param(7, IUriIdentityService))),
-    ( (__param(8, IWorkbenchLayoutService))),
-    ( (__param(9, IKeybindingService))),
-    ( (__param(10, IThemeService))),
-    ( (__param(11, IContextMenuService))),
-    ( (__param(12, IInstantiationService))),
-    ( (__param(13, IViewDescriptorService))),
-    ( (__param(14, IConfigurationService))),
-    ( (__param(15, IContextKeyService))),
-    ( (__param(16, IOpenerService))),
-    ( (__param(17, ITelemetryService))),
-    ( (__param(18, IHoverService)))
+    ( (__param(8, IKeybindingService))),
+    ( (__param(9, IThemeService))),
+    ( (__param(10, IContextMenuService))),
+    ( (__param(11, IInstantiationService))),
+    ( (__param(12, IViewDescriptorService))),
+    ( (__param(13, IConfigurationService))),
+    ( (__param(14, IContextKeyService))),
+    ( (__param(15, IOpenerService))),
+    ( (__param(16, ITelemetryService))),
+    ( (__param(17, IHoverService)))
 ], SCMViewPane)));
 let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
     constructor(viewMode, configurationService, scmViewService) {
@@ -3080,10 +2285,10 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
             return children;
         }
         else if (isSCMResourceGroup(inputOrElement)) {
-            if (this.viewMode() === ViewMode.List) {
+            if (this.viewMode() === "list" ) {
                 return inputOrElement.resources;
             }
-            else if (this.viewMode() === ViewMode.Tree) {
+            else if (this.viewMode() === "tree" ) {
                 const children = [];
                 for (const node of inputOrElement.resourceTree.root.children) {
                     children.push(node.element && node.childrenCount === 0 ? node.element : node);
@@ -3091,7 +2296,7 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
                 return children;
             }
         }
-        else if (isSCMResourceNode(inputOrElement) || isSCMHistoryItemChangeNode(inputOrElement)) {
+        else if (isSCMResourceNode(inputOrElement)) {
             const children = [];
             for (const node of inputOrElement.children) {
                 children.push(node.element && node.childrenCount === 0 ? node.element : node);
@@ -3113,7 +2318,7 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
             }
         }
         else if (isSCMResource(element)) {
-            if (this.viewMode() === ViewMode.List) {
+            if (this.viewMode() === "list" ) {
                 return element.resourceGroup;
             }
             const node = element.resourceGroup.resourceTree.getNode(element.sourceUri);
@@ -3162,21 +2367,6 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
         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.')));
         }