@codingame/monaco-vscode-scm-service-override 6.0.3 → 7.0.1

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

@@ -20,8 +20,9 @@ import { MenuItemAction, MenuId, MenuRegistry, Action2, registerAction2 } from '
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { ActionRunner, Action, 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';
-import { isSCMResource, connectPrimaryMenuToInlineActionBar, connectPrimaryMenu, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceGroup, isSCMResourceNode, isSCMHistoryItemGroupTreeElement, isSCMHistoryItemTreeElement, isSCMHistoryItemChangeTreeElement, isSCMHistoryItemChangeNode, isSCMViewSeparator, getActionViewItemProvider, toDiffEditorArguments, collectContextMenuActions, isSCMViewService } from './util.js';
+import { isSCMResource, connectPrimaryMenuToInlineActionBar, connectPrimaryMenu, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceGroup, isSCMResourceNode, isSCMHistoryItemGroupTreeElement, isSCMHistoryItemTreeElement, isSCMHistoryItemViewModelTreeElement, isSCMHistoryItemChangeTreeElement, isSCMHistoryItemChangeNode, isSCMViewSeparator, getActionViewItemProvider, toDiffEditorArguments, collectContextMenuActions, isSCMViewService } from './util.js';
 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';
@@ -87,10 +88,10 @@ 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 { foreground, selectionBackground } 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 { editorSelectionBackground } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import { inputBackground, inputForeground } from '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';
@@ -102,38 +103,23 @@ import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellati
 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 { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 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 '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';
 
-var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1, HistoryItemGroupRenderer_1, HistoryItemRenderer_1, HistoryItemChangeRenderer_1, SeparatorRenderer_1, SCMInputWidget_1;
+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', {
-    dark: 'gitDecoration.addedResourceForeground',
-    light: 'gitDecoration.addedResourceForeground',
-    hcDark: 'gitDecoration.addedResourceForeground',
-    hcLight: 'gitDecoration.addedResourceForeground'
-}, ( localizeWithPath(_moduleId, 0, "History item additions foreground color.")));
-registerColor('scm.historyItemDeletionsForeground', {
-    dark: 'gitDecoration.deletedResourceForeground',
-    light: 'gitDecoration.deletedResourceForeground',
-    hcDark: 'gitDecoration.deletedResourceForeground',
-    hcLight: 'gitDecoration.deletedResourceForeground'
-}, ( localizeWithPath(_moduleId, 1, "History item deletions foreground color.")));
-registerColor('scm.historyItemStatisticsBorder', {
-    dark: ( (transparent(foreground, 0.2))),
-    light: ( (transparent(foreground, 0.2))),
-    hcDark: ( (transparent(foreground, 0.2))),
-    hcLight: ( (transparent(foreground, 0.2)))
-}, ( localizeWithPath(_moduleId, 2, "History item statistics border color.")));
-registerColor('scm.historyItemSelectedStatisticsBorder', {
-    dark: ( (transparent(listActiveSelectionForeground, 0.2))),
-    light: ( (transparent(listActiveSelectionForeground, 0.2))),
-    hcDark: ( (transparent(listActiveSelectionForeground, 0.2))),
-    hcLight: ( (transparent(listActiveSelectionForeground, 0.2)))
-}, ( localizeWithPath(_moduleId, 3, "History item selected statistics border color.")));
+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.")));
 function processResourceFilterData(uri, filterData) {
     if (!filterData) {
         return [undefined, undefined];
@@ -707,7 +693,7 @@ let HistoryItemRenderer = class HistoryItemRenderer {
         const filesLabel = append(statsContainer, $('.files-label'));
         const insertionsLabel = append(statsContainer, $('.insertions-label'));
         const deletionsLabel = append(statsContainer, $('.deletions-label'));
-        const statsCustomHover = this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('element'), statsContainer, '');
+        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 };
     }
@@ -793,6 +779,79 @@ 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(hoverService) {
+        this.hoverService = hoverService;
+    }
+    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 { graphContainer, label: iconLabel, labelContainer, elementDisposables: ( (new DisposableStore())), disposables: ( (new DisposableStore())) };
+    }
+    renderElement(node, index, templateData, height) {
+        const historyItemViewModel = node.element.historyItemViewModel;
+        const historyItem = historyItemViewModel.historyItem;
+        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.labelContainer.textContent = '';
+        if (historyItem.labels) {
+            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));
+                }
+            }
+        }
+    }
+    renderCompressedElements(node, index, templateData, height) {
+        throw ( (new Error('Should never happen since node is incompressible')));
+    }
+    getTooltip(historyItemViewModel) {
+        const historyItem = historyItemViewModel.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(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(0, IHoverService)))
+], HistoryItem2Renderer)));
 let HistoryItemChangeRenderer = class HistoryItemChangeRenderer {
     static { HistoryItemChangeRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'historyItemChange'; }
@@ -849,10 +908,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, commandService, menuService, telemetryService) {
+    constructor(contextKeyService, contextMenuService, keybindingService, configurationService, commandService, menuService, telemetryService) {
         this.contextKeyService = contextKeyService;
         this.contextMenuService = contextMenuService;
         this.keybindingService = keybindingService;
+        this.configurationService = configurationService;
         this.commandService = commandService;
         this.menuService = menuService;
         this.telemetryService = telemetryService;
@@ -865,18 +925,20 @@ let SeparatorRenderer = class SeparatorRenderer {
         const label = ( (new IconLabel(element, { supportIcons: true, })));
         append(element, $('.separator'));
         disposables.add(label);
-        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);
+        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 };
     }
     renderElement(element, index, templateData, height) {
@@ -893,9 +955,10 @@ SeparatorRenderer = SeparatorRenderer_1 = ( (__decorate([
     ( (__param(0, IContextKeyService))),
     ( (__param(1, IContextMenuService))),
     ( (__param(2, IKeybindingService))),
-    ( (__param(3, ICommandService))),
-    ( (__param(4, IMenuService))),
-    ( (__param(5, ITelemetryService)))
+    ( (__param(3, IConfigurationService))),
+    ( (__param(4, ICommandService))),
+    ( (__param(5, IMenuService))),
+    ( (__param(6, ITelemetryService)))
 ], SeparatorRenderer)));
 class ListDelegate {
     constructor(inputRenderer) {
@@ -934,6 +997,9 @@ class ListDelegate {
         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;
         }
@@ -1002,6 +1068,9 @@ class SCMTreeSorter {
             }
             return 0;
         }
+        if (isSCMHistoryItemViewModelTreeElement(one)) {
+            return isSCMHistoryItemViewModelTreeElement(other) ? 0 : 1;
+        }
         if (isSCMHistoryItemChangeTreeElement(one) || isSCMHistoryItemChangeNode(one)) {
             if (this.viewMode() === ViewMode.List) {
                 if (!isSCMHistoryItemChangeTreeElement(other)) {
@@ -1064,6 +1133,9 @@ let SCMTreeKeyboardNavigationLabelProvider = class SCMTreeKeyboardNavigationLabe
         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;
         }
@@ -1120,6 +1192,11 @@ function getSCMResourceId(element) {
         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;
@@ -1174,6 +1251,10 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         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 });
@@ -1249,7 +1330,8 @@ MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
     submenu: Menus.ChangesSettings,
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
-         (ContextKeys.RepositoryCount.notEqualsTo(0))
+         (ContextKeys.RepositoryCount.notEqualsTo(0)),
+         (( (ContextKeyExpr.equals('config.scm.experimental.showHistoryGraph', true))).negate())
     ))),
     group: '0_view&sort',
     order: 2
@@ -1937,20 +2019,18 @@ let SCMInputWidget = class SCMInputWidget {
         this.repositoryDisposables.add(this.keybindingService.onDidUpdateKeybindings(updatePlaceholderText));
         updatePlaceholderText();
         let commitTemplate = '';
-        const updateTemplate = () => {
-            if (typeof input.repository.provider.commitTemplate === 'undefined' || !input.visible) {
+        this.repositoryDisposables.add(autorun(reader => {
+            if (!input.visible) {
                 return;
             }
             const oldCommitTemplate = commitTemplate;
-            commitTemplate = input.repository.provider.commitTemplate;
+            commitTemplate = input.repository.provider.commitTemplate.read(reader);
             const value = textModel.getValue();
             if (value && value !== oldCommitTemplate) {
                 return;
             }
             textModel.setValue(commitTemplate);
-        };
-        this.repositoryDisposables.add(input.repository.provider.onDidChangeCommitTemplate(updateTemplate, this));
-        updateTemplate();
+        }));
         const updateEnablement = (enabled) => {
             this.inputEditor.updateOptions({ readOnly: !enabled });
         };
@@ -2355,7 +2435,8 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
                         e.affectsConfiguration('scm.showActionButton') ||
                         e.affectsConfiguration('scm.showChangesSummary') ||
                         e.affectsConfiguration('scm.showIncomingChanges') ||
-                        e.affectsConfiguration('scm.showOutgoingChanges'), this.visibilityDisposables)(() => this.updateChildren(), this, this.visibilityDisposables);
+                        e.affectsConfiguration('scm.showOutgoingChanges') ||
+                        e.affectsConfiguration('scm.experimental.showHistoryGraph'), this.visibilityDisposables)(() => 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() });
@@ -2407,6 +2488,7 @@ 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(HistoryItemChangeRenderer, () => this.viewMode, this.listLabels),
             this.instantiationService.createInstance(SeparatorRenderer)
         ], treeDataSource, {
@@ -2522,6 +2604,22 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             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;
+            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}` };
+                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);
@@ -2786,8 +2884,8 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             this.areAllRepositoriesCollapsedContextKey.set(false);
             return;
         }
-        this.isAnyRepositoryCollapsibleContextKey.set(( (this.scmViewService.visibleRepositories.some(r => this.tree.hasElement(r) && this.tree.isCollapsible(r)))));
-        this.areAllRepositoriesCollapsedContextKey.set(this.scmViewService.visibleRepositories.every(r => this.tree.hasElement(r) && (!this.tree.isCollapsible(r) || this.tree.isCollapsed(r))));
+        this.isAnyRepositoryCollapsibleContextKey.set(( (this.scmViewService.visibleRepositories.some(r => this.tree.hasNode(r) && this.tree.isCollapsible(r)))));
+        this.areAllRepositoriesCollapsedContextKey.set(this.scmViewService.visibleRepositories.every(r => this.tree.hasNode(r) && (!this.tree.isCollapsible(r) || this.tree.isCollapsed(r))));
     }
     collapseAllRepositories() {
         for (const repository of this.scmViewService.visibleRepositories) {
@@ -2969,6 +3067,9 @@ let SCMTreeDataSource = class SCMTreeDataSource {
         else if (isSCMHistoryItemTreeElement(inputOrElement)) {
             return true;
         }
+        else if (isSCMHistoryItemViewModelTreeElement(inputOrElement)) {
+            return false;
+        }
         else if (isSCMHistoryItemChangeTreeElement(inputOrElement)) {
             return false;
         }
@@ -3021,6 +3122,13 @@ let SCMTreeDataSource = class SCMTreeDataSource {
                 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)) {
@@ -3051,11 +3159,11 @@ let SCMTreeDataSource = class SCMTreeDataSource {
         return [];
     }
     async getHistoryItemGroups(element) {
-        const { showIncomingChanges, showOutgoingChanges } = this.getConfiguration();
+        const { showIncomingChanges, showOutgoingChanges, showHistoryGraph } = this.getConfiguration();
         const scmProvider = element.provider;
         const historyProvider = scmProvider.historyProvider;
         const currentHistoryItemGroup = historyProvider?.currentHistoryItemGroup;
-        if (!historyProvider || !currentHistoryItemGroup || (showIncomingChanges === 'never' && showOutgoingChanges === 'never')) {
+        if (!historyProvider || !currentHistoryItemGroup || (showIncomingChanges === 'never' && showOutgoingChanges === 'never') || showHistoryGraph) {
             return [];
         }
         const children = [];
@@ -3063,18 +3171,18 @@ let SCMTreeDataSource = class SCMTreeDataSource {
         let incomingHistoryItemGroup = historyProviderCacheEntry?.incomingHistoryItemGroup;
         let outgoingHistoryItemGroup = historyProviderCacheEntry?.outgoingHistoryItemGroup;
         if (!incomingHistoryItemGroup && !outgoingHistoryItemGroup) {
-            const ancestor = await historyProvider.resolveHistoryItemGroupCommonAncestor(currentHistoryItemGroup.id, currentHistoryItemGroup.base?.id);
+            const ancestor = await historyProvider.resolveHistoryItemGroupCommonAncestor(currentHistoryItemGroup.id, currentHistoryItemGroup.remote?.id);
             if (!ancestor) {
                 return [];
             }
-            incomingHistoryItemGroup = currentHistoryItemGroup.base ? {
-                id: currentHistoryItemGroup.base.id,
-                label: currentHistoryItemGroup.base.name,
+            incomingHistoryItemGroup = currentHistoryItemGroup.remote ? {
+                id: currentHistoryItemGroup.remote.id,
+                label: currentHistoryItemGroup.remote.name,
                 ariaLabel: ( localizeWithPath(
                     _moduleId,
                     40,
                     "Incoming changes from {0}",
-                    currentHistoryItemGroup.base.name
+                    currentHistoryItemGroup.remote.name
                 )),
                 icon: Codicon.arrowCircleDown,
                 direction: 'incoming',
@@ -3150,6 +3258,50 @@ 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) {
+            return [];
+        }
+        const historyProviderCacheEntry = this.getHistoryProviderCacheEntry(element);
+        let historyItemsElement = historyProviderCacheEntry.historyItems2.get(element.id);
+        const historyItemsMap = historyProviderCacheEntry.historyItems2;
+        if (!historyItemsElement) {
+            const historyItemGroupIds = [
+                currentHistoryItemGroup.id,
+                ...(currentHistoryItemGroup.remote ? [currentHistoryItemGroup.remote.id] : []),
+                ...(currentHistoryItemGroup.base ? [currentHistoryItemGroup.base.id] : []),
+            ];
+            historyItemsElement = (await historyProvider.provideHistoryItems2({ historyItemGroupIds })) ?? [];
+            this.historyProviderCache.set(element, {
+                ...historyProviderCacheEntry,
+                historyItems2: historyItemsMap.set(element.id, historyItemsElement)
+            });
+        }
+        if (historyItemsElement.length === 1 &&
+            historyItemsElement[0].labels?.find(l => l.title === currentHistoryItemGroup.name)) {
+            return [];
+        }
+        const colorMap = ( (new Map([
+            [currentHistoryItemGroup.name, 0]
+        ])));
+        if (currentHistoryItemGroup.remote) {
+            colorMap.set(currentHistoryItemGroup.remote.name, 1);
+        }
+        if (currentHistoryItemGroup.base) {
+            colorMap.set(currentHistoryItemGroup.base.name, 2);
+        }
+        return (
+             (toISCMHistoryItemViewModelArray(historyItemsElement, colorMap)
+                .map(historyItemViewModel => ({
+                repository: element,
+                historyItemViewModel,
+                type: 'historyItem2'
+            })))
+        );
+    }
     async getHistoryItemChanges(element) {
         const repository = element.historyItemGroup.repository;
         const historyProvider = repository.provider.historyProvider;
@@ -3241,7 +3393,8 @@ let SCMTreeDataSource = class SCMTreeDataSource {
             showActionButton: this.configurationService.getValue('scm.showActionButton'),
             showChangesSummary: this.configurationService.getValue('scm.showChangesSummary'),
             showIncomingChanges: this.configurationService.getValue('scm.showIncomingChanges'),
-            showOutgoingChanges: this.configurationService.getValue('scm.showOutgoingChanges')
+            showOutgoingChanges: this.configurationService.getValue('scm.showOutgoingChanges'),
+            showHistoryGraph: this.configurationService.getValue('scm.experimental.showHistoryGraph')
         };
     }
     onDidChangeVisibleRepositories({ added, removed }) {
@@ -3270,6 +3423,7 @@ let SCMTreeDataSource = class SCMTreeDataSource {
             incomingHistoryItemGroup: undefined,
             outgoingHistoryItemGroup: undefined,
             historyItems: ( (new Map())),
+            historyItems2: ( (new Map())),
             historyItemChanges: ( (new Map()))
         };
     }
@@ -3358,5 +3512,26 @@ class SCMActionButton {
         }
     }
 }
+registerThemingParticipant((theme, collector) => {
+    const selectionBackgroundColor = theme.getColor(selectionBackground);
+    if (selectionBackgroundColor) {
+        const inputBackgroundColor = theme.getColor(inputBackground);
+        if (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 {
+        collector.addRule(`.scm-view .scm-editor-container .monaco-editor .focused .selected-text { background-color: ${theme.getColor(editorSelectionBackground)}; }`);
+    }
+});
 
 export { ActionButtonRenderer, ContextKeys, SCMAccessibilityProvider, SCMActionButton, SCMTreeKeyboardNavigationLabelProvider, SCMTreeSorter, SCMViewPane };

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

@@ -36,6 +36,9 @@ function isSCMHistoryItemTreeElement(element) {
     return element.type === 'allChanges' ||
         element.type === 'historyItem';
 }
+function isSCMHistoryItemViewModelTreeElement(element) {
+    return element.type === 'historyItem2';
+}
 function isSCMHistoryItemChangeTreeElement(element) {
     return element.type === 'historyItemChange';
 }
@@ -120,5 +123,8 @@ function getActionViewItemProvider(instaService) {
 function getProviderKey(provider) {
     return `${provider.contextValue}:${provider.label}${provider.rootUri ? `:${( provider.rootUri.toString())}` : ''}`;
 }
+function getRepositoryResourceCount(provider) {
+    return provider.groups.reduce((r, g) => r + g.resources.length, 0);
+}
 
-export { StatusBarAction, collectContextMenuActions, connectPrimaryMenu, connectPrimaryMenuToInlineActionBar, getActionViewItemProvider, getProviderKey, isSCMActionButton, isSCMHistoryItemChangeNode, isSCMHistoryItemChangeTreeElement, isSCMHistoryItemGroupTreeElement, isSCMHistoryItemTreeElement, isSCMInput, isSCMRepository, isSCMResource, isSCMResourceGroup, isSCMResourceNode, isSCMViewSeparator, isSCMViewService, toDiffEditorArguments };
+export { StatusBarAction, collectContextMenuActions, connectPrimaryMenu, connectPrimaryMenuToInlineActionBar, getActionViewItemProvider, getProviderKey, getRepositoryResourceCount, isSCMActionButton, isSCMHistoryItemChangeNode, isSCMHistoryItemChangeTreeElement, isSCMHistoryItemGroupTreeElement, isSCMHistoryItemTreeElement, isSCMHistoryItemViewModelTreeElement, isSCMInput, isSCMRepository, isSCMResource, isSCMResourceGroup, isSCMResourceNode, isSCMViewSeparator, isSCMViewService, toDiffEditorArguments };

package/vscode/src/vs/workbench/contrib/scm/common/scmService.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { SCMInputChangeReason } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -11,8 +11,10 @@ import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 
-class SCMInput {
+class SCMInput extends Disposable {
     get value() {
         return this._value;
     }
@@ -51,6 +53,7 @@ class SCMInput {
         this._onDidChangeValidateInput.fire();
     }
     constructor(repository, history) {
+        super();
         this.repository = repository;
         this.history = history;
         this._value = '';
@@ -75,7 +78,7 @@ class SCMInput {
         this.didChangeHistory = false;
         if (this.repository.provider.rootUri) {
             this.historyNavigator = history.getHistory(this.repository.provider.label, this.repository.provider.rootUri);
-            this.history.onWillSaveHistory(event => {
+            this._register(this.history.onWillSaveHistory(event => {
                 if (this.historyNavigator.isAtEnd()) {
                     this.saveValue();
                 }
@@ -83,7 +86,7 @@ class SCMInput {
                     event.historyDidIndeedChange();
                 }
                 this.didChangeHistory = false;
-            });
+            }));
         }
         else {
             this.historyNavigator = ( new HistoryNavigator2([''], 100));
@@ -95,7 +98,7 @@ class SCMInput {
             return;
         }
         if (!transient) {
-            this.historyNavigator.add(this._value);
+            this.historyNavigator.replaceLast(this._value);
             this.historyNavigator.add(value);
             this.didChangeHistory = true;
         }
@@ -264,8 +267,9 @@ SCMInputHistory = ( __decorate([
 let SCMService = class SCMService {
     get repositories() { return ( this._repositories.values()); }
     get repositoryCount() { return this._repositories.size; }
-    constructor(logService, workspaceContextService, contextKeyService, storageService) {
+    constructor(logService, workspaceContextService, contextKeyService, storageService, uriIdentityService) {
         this.logService = logService;
+        this.uriIdentityService = uriIdentityService;
         this._repositories = ( new Map());
         this._onDidAddProvider = ( new Emitter());
         this.onDidAddRepository = this._onDidAddProvider.event;
@@ -290,15 +294,36 @@ let SCMService = class SCMService {
         this.providerCount.set(this._repositories.size);
         return repository;
     }
-    getRepository(id) {
-        return this._repositories.get(id);
+    getRepository(idOrResource) {
+        if (typeof idOrResource === 'string') {
+            return this._repositories.get(idOrResource);
+        }
+        if (idOrResource.scheme !== Schemas.file &&
+            idOrResource.scheme !== Schemas.vscodeRemote) {
+            return undefined;
+        }
+        let bestRepository = undefined;
+        let bestMatchLength = Number.POSITIVE_INFINITY;
+        for (const repository of this.repositories) {
+            const root = repository.provider.rootUri;
+            if (!root) {
+                continue;
+            }
+            const path = this.uriIdentityService.extUri.relativePath(root, idOrResource);
+            if (path && !/^\.\./.test(path) && path.length < bestMatchLength) {
+                bestRepository = repository;
+                bestMatchLength = path.length;
+            }
+        }
+        return bestRepository;
     }
 };
 SCMService = ( __decorate([
     ( __param(0, ILogService)),
     ( __param(1, IWorkspaceContextService)),
     ( __param(2, IContextKeyService)),
-    ( __param(3, IStorageService))
+    ( __param(3, IStorageService)),
+    ( __param(4, IUriIdentityService))
 ], SCMService));
 
 export { SCMService };