@codingame/monaco-vscode-scm-service-override 23.2.2 → 24.1.0

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

@@ -3,6 +3,7 @@ import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as scm from './media/scm.css';
 import { $, reset, append, h } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { HoverStyle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover';
 import { IconLabel } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabel';
 import { createMatches } from '@codingame/monaco-vscode-api/vscode/vs/base/common/filters';
 import { combinedDisposable, DisposableStore, Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -13,7 +14,6 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
-import { WorkbenchHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
@@ -31,17 +31,15 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { ViewAction, ViewPane, ViewPaneShowActions } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
+import { ViewAction, ViewPane, ViewPaneShowActions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPane';
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
-import { renderSCMHistoryItemGraph, historyItemHoverDefaultLabelBackground, historyItemHoverLabelForeground, SWIMLANE_WIDTH, renderSCMHistoryGraphPlaceholder, getHistoryItemIndex, toISCMHistoryItemViewModelArray } from '@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/workbench/contrib/scm/browser/scmHistory';
-import { getHistoryItemEditorTitle, isSCMHistoryItemViewModelTreeElement, isSCMHistoryItemChangeViewModelTreeElement, isSCMHistoryItemChangeNode, isSCMHistoryItemLoadMoreTreeElement, isSCMRepository, getProviderKey } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/browser/util';
-import { SCMIncomingHistoryItemId, SCMOutgoingHistoryItemId } from '@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/workbench/contrib/scm/common/history';
+import { toHistoryItemHoverContent, renderSCMHistoryItemGraph, historyItemHoverDefaultLabelBackground, historyItemHoverLabelForeground, SWIMLANE_WIDTH, renderSCMHistoryGraphPlaceholder, getHistoryItemIndex, toISCMHistoryItemViewModelArray } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/scmHistory';
+import { getHistoryItemEditorTitle, isSCMHistoryItemViewModelTreeElement, isSCMHistoryItemChangeViewModelTreeElement, isSCMHistoryItemChangeNode, isSCMHistoryItemLoadMoreTreeElement, isSCMRepository, getProviderKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/util';
+import { SCMIncomingHistoryItemId, SCMOutgoingHistoryItemId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/history';
 import { HISTORY_VIEW_PANE_ID, ViewMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMService, ISCMViewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
-import { Position } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
-import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { registerAction2, MenuId, Action2, MenuRegistry, isIMenuItem } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
@@ -59,23 +57,24 @@ import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/ite
 import { clamp } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { compare } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
-import { getDefaultHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { groupBy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/collections';
 import { getActionBarActions, getFlatContextMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
-import { ResourceLabels } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/browser/labels';
+import { ResourceLabels } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels';
 import { FileKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { WorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { ScmHistoryItemResolver } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
-import { ResourceTree } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/base/common/resourceTree';
+import { ScmHistoryItemResolver } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
+import { ResourceTree } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resourceTree';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { CodeDataTransfers } from '@codingame/monaco-vscode-api/vscode/vs/platform/dnd/browser/dnd';
+import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -125,23 +124,23 @@ class SCMHistoryItemRefsActionViewItem extends ActionViewItem {
             icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitBranch));
             const name = $('.name');
             if (this._historyItemsFilter === 'all') {
-                name.textContent = ( localize(10425, "All"));
+                name.textContent = ( localize(10560, "All"));
             }
             else if (this._historyItemsFilter === 'auto') {
-                name.textContent = ( localize(10426, "Auto"));
+                name.textContent = ( localize(10561, "Auto"));
             }
             else if (this._historyItemsFilter.length === 1) {
                 name.textContent = this._historyItemsFilter[0].name;
             }
             else {
-                name.textContent = ( localize(10427, "{0} Items", this._historyItemsFilter.length));
+                name.textContent = ( localize(10562, "{0} Items", this._historyItemsFilter.length));
             }
             reset(this.label, icon, name);
         }
     }
     getTooltip() {
         if (this._historyItemsFilter === 'all') {
-            return localize(10428, "All history item references");
+            return localize(10563, "All history item references");
         }
         else if (this._historyItemsFilter === 'auto') {
             const historyProvider = this._repository.provider.historyProvider.get();
@@ -163,7 +162,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: PICK_REPOSITORY_ACTION_ID,
-            title: ( localize(10429, "Repository Picker")),
+            title: ( localize(10564, "Repository Picker")),
             viewId: HISTORY_VIEW_PANE_ID,
             f1: false,
             menu: {
@@ -182,7 +181,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: PICK_HISTORY_ITEM_REFS_ACTION_ID,
-            title: ( localize(10430, "History Item Reference Picker")),
+            title: ( localize(10565, "History Item Reference Picker")),
             icon: Codicon.gitBranch,
             viewId: HISTORY_VIEW_PANE_ID,
             precondition: ( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)),
@@ -202,7 +201,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.revealCurrentHistoryItem',
-            title: ( localize(10431, "Go to Current History Item")),
+            title: ( localize(10566, "Go to Current History Item")),
             icon: Codicon.target,
             viewId: HISTORY_VIEW_PANE_ID,
             precondition: ( ContextKeyExpr.and(( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)), ( ContextKeys.SCMCurrentHistoryItemRefInFilter.isEqualTo(true)))),
@@ -222,7 +221,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.refresh',
-            title: ( localize(10432, "Refresh")),
+            title: ( localize(10567, "Refresh")),
             viewId: HISTORY_VIEW_PANE_ID,
             f1: false,
             icon: Codicon.refresh,
@@ -241,7 +240,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.setListViewMode',
-            title: ( localize(10433, "View as List")),
+            title: ( localize(10568, "View as List")),
             viewId: HISTORY_VIEW_PANE_ID,
             toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.List)),
             menu: { id: MenuId.SCMHistoryTitle, group: '9_viewmode', order: 1 },
@@ -256,7 +255,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.setTreeViewMode',
-            title: ( localize(10434, "View as Tree")),
+            title: ( localize(10569, "View as Tree")),
             viewId: HISTORY_VIEW_PANE_ID,
             toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.Tree)),
             menu: { id: MenuId.SCMHistoryTitle, group: '9_viewmode', order: 2 },
@@ -271,7 +270,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.viewChanges',
-            title: ( localize(10435, "Open Changes")),
+            title: ( localize(10570, "Open Changes")),
             icon: Codicon.diffMultiple,
             f1: false,
             menu: [
@@ -292,35 +291,47 @@ registerAction2(class extends Action2 {
     }
     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();
         const historyItemRef = historyProvider?.historyItemRef.get();
         const historyItemRemoteRef = historyProvider?.historyItemRemoteRef.get();
-        if (historyItems.length > 1) {
-            const ancestor = await historyProvider?.resolveHistoryItemRefsCommonAncestor([historyItem.id, historyItemLast.id]);
-            if (!ancestor || (ancestor !== historyItem.id && ancestor !== historyItemLast.id)) {
-                return;
-            }
+        if (!provider || !historyProvider || !historyItemRef || historyItems.length === 0) {
+            return;
         }
+        const historyItem = historyItems[0];
         let title, historyItemId, historyItemParentId;
-        if (historyItem.id === SCMIncomingHistoryItemId) {
-            title = `${historyItem.subject} - ${historyItemRef?.name} \u2194 ${historyItemRemoteRef?.name}`;
-            historyItemId = historyProvider.historyItemRemoteRef.get().id;
-            historyItemParentId = historyItem.parentIds[0];
-        }
-        else if (historyItem.id === SCMOutgoingHistoryItemId) {
-            title = `${historyItem.subject} - ${historyItemRemoteRef?.name} \u2194 ${historyItemRef?.name}`;
-            historyItemId = historyProvider.historyItemRef.get().id;
-            historyItemParentId = historyItem.parentIds[0];
+        if (historyItemRemoteRef && (historyItem.id === SCMIncomingHistoryItemId || historyItem.id === SCMOutgoingHistoryItemId)) {
+            const mergeBase = await historyProvider.resolveHistoryItemRefsCommonAncestor([
+                historyItemRef.name,
+                historyItemRemoteRef.name
+            ]);
+            if (mergeBase && historyItem.id === SCMIncomingHistoryItemId) {
+                title = `${historyItem.subject} - ${historyItemRef.name} \u2194 ${historyItemRemoteRef.name}`;
+                historyItemId = historyItemRemoteRef.id;
+                historyItemParentId = mergeBase;
+            }
+            else if (mergeBase && historyItem.id === SCMOutgoingHistoryItemId) {
+                title = `${historyItem.subject} - ${historyItemRemoteRef.name} \u2194 ${historyItemRef.name}`;
+                historyItemId = historyItemRef.id;
+                historyItemParentId = mergeBase;
+            }
         }
         else {
             title = getHistoryItemEditorTitle(historyItem);
             historyItemId = historyItem.id;
-            historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
+            if (historyItem.parentIds.length > 0) {
+                if (historyItem.parentIds[0] === SCMIncomingHistoryItemId && historyItemRemoteRef) {
+                    historyItemParentId = await historyProvider.resolveHistoryItemRefsCommonAncestor([
+                        historyItemRef.name,
+                        historyItemRemoteRef.name
+                    ]);
+                }
+                else {
+                    historyItemParentId = historyItem.parentIds[0];
+                }
+            }
+        }
+        if (!title || !historyItemId || !historyItemParentId) {
+            return;
         }
         const multiDiffSourceUri = ScmHistoryItemResolver.getMultiDiffSourceUri(provider, historyItemId, historyItemParentId, '');
         commandService.executeCommand('_workbench.openMultiDiffEditor', { title, multiDiffSourceUri });
@@ -330,7 +341,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.openFile',
-            title: ( localize(10436, "Open File")),
+            title: ( localize(10571, "Open File")),
             icon: Codicon.goToFile,
             f1: false,
             menu: [
@@ -354,10 +365,10 @@ registerAction2(class extends Action2 {
         }
         let version;
         if (historyItem.id === SCMIncomingHistoryItemId) {
-            version = ( localize(10437, "Incoming Changes"));
+            version = ( localize(10572, "Incoming Changes"));
         }
         else if (historyItem.id === SCMOutgoingHistoryItemId) {
-            version = ( localize(10438, "Outgoing Changes"));
+            version = ( localize(10573, "Outgoing Changes"));
         }
         else {
             version = historyItem.displayId ?? historyItem.id;
@@ -389,20 +400,20 @@ let HistoryItemRenderer = class HistoryItemRenderer {
     static { HistoryItemRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'history-item'; }
     get templateId() { return HistoryItemRenderer_1.TEMPLATE_ID; }
-    constructor(hoverDelegate, _commandService, _configurationService, _contextKeyService, _contextMenuService, _hoverService, _keybindingService, _menuService, _telemetryService) {
-        this.hoverDelegate = hoverDelegate;
+    constructor(_viewContainerLocation, _commandService, _configurationService, _contextKeyService, _contextMenuService, _hoverService, _keybindingService, _markdownRendererService, _menuService, _telemetryService) {
+        this._viewContainerLocation = _viewContainerLocation;
         this._commandService = _commandService;
         this._configurationService = _configurationService;
         this._contextKeyService = _contextKeyService;
         this._contextMenuService = _contextMenuService;
         this._hoverService = _hoverService;
         this._keybindingService = _keybindingService;
+        this._markdownRendererService = _markdownRendererService;
         this._menuService = _menuService;
         this._telemetryService = _telemetryService;
         this._badgesConfig = observableConfigValue('scm.graph.badges', 'filter', this._configurationService);
     }
     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, {
@@ -426,12 +437,11 @@ let HistoryItemRenderer = class HistoryItemRenderer {
         const provider = node.element.repository.provider;
         const historyItemViewModel = node.element.historyItemViewModel;
         const historyItem = historyItemViewModel.historyItem;
-        const hoverContent = {
-            markdown: historyItem.tooltip ?? historyItem.message,
-            markdownNotSupportedFallback: historyItem.message
-        };
-        const historyItemHover = this._hoverService.setupManagedHover(this.hoverDelegate, templateData.element, hoverContent);
+        const { content, disposables } = toHistoryItemHoverContent(this._markdownRendererService, historyItem, true);
+        const { hoverOptions, hoverLifecycleOptions } = this._getHoverOptions();
+        const historyItemHover = this._hoverService.setupDelayedHover(templateData.element, { ...hoverOptions, content }, hoverLifecycleOptions);
         templateData.elementDisposables.add(historyItemHover);
+        templateData.elementDisposables.add(disposables);
         templateData.graphContainer.textContent = '';
         templateData.graphContainer.classList.toggle('current', historyItemViewModel.kind === 'HEAD');
         templateData.graphContainer.classList.toggle('incoming-changes', historyItemViewModel.kind === 'incoming-changes');
@@ -452,7 +462,7 @@ let HistoryItemRenderer = class HistoryItemRenderer {
     _renderBadges(historyItem, templateData) {
         templateData.elementDisposables.add(autorun(reader => {
             const labelConfig = this._badgesConfig.read(reader);
-            templateData.labelContainer.textContent = '';
+            templateData.labelContainer.replaceChildren();
             const references = historyItem.references ?
                 historyItem.references.slice(0) : [];
             if (references.length > 0 && references[0].color) {
@@ -504,6 +514,39 @@ let HistoryItemRenderer = class HistoryItemRenderer {
         elements.description.textContent = showDescription ? historyItemRefs[0].name : '';
         append(templateData.labelContainer, elements.root);
     }
+    _getHoverOptions() {
+        if (this._viewContainerLocation === ViewContainerLocation.Panel) {
+            return {
+                hoverOptions: {
+                    additionalClasses: ['history-item-hover'],
+                    appearance: {
+                        compact: true
+                    },
+                    position: {
+                        hoverPosition: HoverPosition.RIGHT
+                    },
+                    style: HoverStyle.Mouse
+                },
+                hoverLifecycleOptions: undefined
+            };
+        }
+        return {
+            hoverOptions: {
+                additionalClasses: ['history-item-hover'],
+                appearance: {
+                    compact: true,
+                    showPointer: true
+                },
+                position: {
+                    hoverPosition: HoverPosition.RIGHT
+                },
+                style: HoverStyle.Pointer
+            },
+            hoverLifecycleOptions: {
+                groupId: 'scm-history-item'
+            }
+        };
+    }
     _processMatches(historyItemViewModel, filterData) {
         if (!filterData) {
             return [undefined, undefined];
@@ -528,8 +571,9 @@ HistoryItemRenderer = HistoryItemRenderer_1 = ( __decorate([
     ( __param(4, IContextMenuService)),
     ( __param(5, IHoverService)),
     ( __param(6, IKeybindingService)),
-    ( __param(7, IMenuService)),
-    ( __param(8, ITelemetryService))
+    ( __param(7, IMarkdownRendererService)),
+    ( __param(8, IMenuService)),
+    ( __param(9, ITelemetryService))
 ], HistoryItemRenderer));
 let HistoryItemChangeRenderer = class HistoryItemChangeRenderer {
     static { HistoryItemChangeRenderer_1 = this; }
@@ -634,7 +678,6 @@ let HistoryItemLoadMoreRenderer = class HistoryItemLoadMoreRenderer {
         this._configurationService = _configurationService;
     }
     renderTemplate(container) {
-        container.parentElement.parentElement.querySelector('.monaco-tl-twistie').classList.add('force-no-twistie');
         const element = append(container, $('.history-item-load-more'));
         const graphPlaceholder = append(element, $('.graph-placeholder'));
         const historyItemPlaceholderContainer = append(element, $('.history-item-placeholder'));
@@ -655,7 +698,7 @@ let HistoryItemLoadMoreRenderer = class HistoryItemLoadMoreRenderer {
             templateData.elementDisposables.add(autorun(reader => {
                 const isLoadingMore = this._isLoadingMore.read(reader);
                 const icon = `$(${isLoadingMore ? 'loading~spin' : 'fold-down'})`;
-                templateData.historyItemPlaceholderLabel.setLabel(( localize(10439, "{0} Load More...", icon)));
+                templateData.historyItemPlaceholderLabel.setLabel(( localize(10574, "{0} Load More...", icon)));
             }));
         }
     }
@@ -673,34 +716,6 @@ let HistoryItemLoadMoreRenderer = class HistoryItemLoadMoreRenderer {
 HistoryItemLoadMoreRenderer = HistoryItemLoadMoreRenderer_1 = ( __decorate([
     ( __param(2, IConfigurationService))
 ], HistoryItemLoadMoreRenderer));
-let HistoryItemHoverDelegate = class HistoryItemHoverDelegate extends WorkbenchHoverDelegate {
-    constructor(_viewContainerLocation, layoutService, configurationService, hoverService) {
-        super(_viewContainerLocation === ViewContainerLocation.Panel ? 'mouse' : 'element', {
-            instantHover: _viewContainerLocation !== ViewContainerLocation.Panel
-        }, () => this.getHoverOptions(), configurationService, hoverService);
-        this._viewContainerLocation = _viewContainerLocation;
-        this.layoutService = layoutService;
-    }
-    getHoverOptions() {
-        const sideBarPosition = this.layoutService.getSideBarPosition();
-        let hoverPosition;
-        if (this._viewContainerLocation === ViewContainerLocation.Sidebar) {
-            hoverPosition = sideBarPosition === Position.LEFT ? HoverPosition.RIGHT : HoverPosition.LEFT;
-        }
-        else if (this._viewContainerLocation === ViewContainerLocation.AuxiliaryBar) {
-            hoverPosition = sideBarPosition === Position.LEFT ? HoverPosition.LEFT : HoverPosition.RIGHT;
-        }
-        else {
-            hoverPosition = HoverPosition.RIGHT;
-        }
-        return { additionalClasses: ['history-item-hover'], position: { hoverPosition, forcePosition: true } };
-    }
-};
-HistoryItemHoverDelegate = ( __decorate([
-    ( __param(1, IWorkbenchLayoutService)),
-    ( __param(2, IConfigurationService)),
-    ( __param(3, IHoverService))
-], HistoryItemHoverDelegate));
 let SCMHistoryViewPaneActionRunner = class SCMHistoryViewPaneActionRunner extends ActionRunner {
     constructor(_progressService) {
         super();
@@ -715,7 +730,7 @@ SCMHistoryViewPaneActionRunner = ( __decorate([
 ], SCMHistoryViewPaneActionRunner));
 class SCMHistoryTreeAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(10440, "Source Control History");
+        return localize(10575, "Source Control History");
     }
     getAriaLabel(element) {
         if (isSCMRepository(element)) {
@@ -823,11 +838,29 @@ class SCMHistoryTreeDataSource extends Disposable {
                 historyItemId = historyItemViewModel.kind === 'incoming-changes'
                     ? historyItemRemoteRef.id
                     : historyItemRef.id;
-                historyItemParentId = historyItem.parentIds[0];
+                historyItemParentId = await historyProvider.resolveHistoryItemRefsCommonAncestor([
+                    historyItemRef.name,
+                    historyItemRemoteRef.name
+                ]);
             }
             else {
                 historyItemId = historyItem.id;
-                historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
+                if (historyItem.parentIds.length > 0) {
+                    if (historyItem.parentIds[0] === SCMIncomingHistoryItemId) {
+                        const historyItemRef = historyProvider?.historyItemRef.get();
+                        const historyItemRemoteRef = historyProvider?.historyItemRemoteRef.get();
+                        if (!historyProvider || !historyItemRef || !historyItemRemoteRef) {
+                            return [];
+                        }
+                        historyItemParentId = await historyProvider.resolveHistoryItemRefsCommonAncestor([
+                            historyItemRef.name,
+                            historyItemRemoteRef.name
+                        ]);
+                    }
+                    else {
+                        historyItemParentId = historyItem.parentIds[0];
+                    }
+                }
             }
             const historyItemChanges = (await historyProvider?.provideHistoryItemChanges(historyItemId, historyItemParentId)) ?? [];
             if (this.viewMode() === ViewMode.List) {
@@ -1191,8 +1224,8 @@ let RepositoryPicker = class RepositoryPicker {
         this._quickInputService = _quickInputService;
         this._scmViewService = _scmViewService;
         this._autoQuickPickItem = {
-            label: ( localize(10426, "Auto")),
-            description: ( localize(10441, "Show the source control graph for the active repository")),
+            label: ( localize(10561, "Auto")),
+            description: ( localize(10576, "Show the source control graph for the active repository")),
             repository: 'auto'
         };
     }
@@ -1210,7 +1243,7 @@ let RepositoryPicker = class RepositoryPicker {
             repository: r
         }))));
         return this._quickInputService.pick(picks, {
-            placeHolder: ( localize(10442, "Select the repository to view, type to filter all repositories"))
+            placeHolder: ( localize(10577, "Select the repository to view, type to filter all repositories"))
         });
     }
 };
@@ -1226,21 +1259,21 @@ let HistoryItemRefPicker = class HistoryItemRefPicker extends Disposable {
         this._quickInputService = _quickInputService;
         this._allQuickPickItem = {
             id: 'all',
-            label: ( localize(10425, "All")),
-            description: ( localize(10428, "All history item references")),
+            label: ( localize(10560, "All")),
+            description: ( localize(10563, "All history item references")),
             historyItemRef: 'all'
         };
         this._autoQuickPickItem = {
             id: 'auto',
-            label: ( localize(10426, "Auto")),
-            description: ( localize(10443, "Current history item reference(s)")),
+            label: ( localize(10561, "Auto")),
+            description: ( localize(10578, "Current history item reference(s)")),
             historyItemRef: 'auto'
         };
     }
     async pickHistoryItemRef() {
         const quickPick = this._quickInputService.createQuickPick({ useSeparators: true });
         this._store.add(quickPick);
-        quickPick.placeholder = ( localize(10444, "Select one/more history item references to view, type to filter"));
+        quickPick.placeholder = ( localize(10579, "Select one/more history item references to view, type to filter"));
         quickPick.canSelectMany = true;
         quickPick.hideCheckAll = true;
         quickPick.busy = true;
@@ -1372,16 +1405,21 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
         ]);
         element.badge.textContent = 'Outdated';
         container.appendChild(element.root);
-        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), element.root, {
-            markdown: {
-                value: ( localize(10445, "Please refresh the graph using the refresh action ($(refresh)).")),
-                supportThemeIcons: true
-            },
-            markdownNotSupportedFallback: undefined
-        }));
         this._register(autorun(reader => {
             const outdated = this._repositoryOutdated.read(reader);
             element.root.style.display = outdated ? '' : 'none';
+            if (outdated) {
+                reader.store.add(this.hoverService.setupDelayedHover(element.root, {
+                    appearance: {
+                        compact: true,
+                        showPointer: true
+                    },
+                    content: ( new MarkdownString(( localize(10580, "Please refresh the graph using the refresh action ($(refresh)).")), { supportThemeIcons: true })),
+                    position: {
+                        hoverPosition: HoverPosition.BELOW
+                    }
+                }));
+            }
         }));
     }
     renderBody(container) {
@@ -1574,15 +1612,13 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
     }
     _createTree(container) {
         this._treeIdentityProvider = ( new SCMHistoryTreeIdentityProvider());
-        const historyItemHoverDelegate = this.instantiationService.createInstance(HistoryItemHoverDelegate, this.viewDescriptorService.getViewLocationById(this.id));
-        this._register(historyItemHoverDelegate);
         const resourceLabels = this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility });
         this._register(resourceLabels);
         this._treeDataSource = this.instantiationService.createInstance(SCMHistoryTreeDataSource, () => this._treeViewModel.viewMode.get());
         this._register(this._treeDataSource);
         const compressionEnabled = observableConfigValue('scm.compactFolders', true, this.configurationService);
         this._tree = this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree, 'SCM History Tree', container, ( new ListDelegate()), ( new SCMHistoryTreeCompressionDelegate()), [
-            this.instantiationService.createInstance(HistoryItemRenderer, historyItemHoverDelegate),
+            this.instantiationService.createInstance(HistoryItemRenderer, this.viewDescriptorService.getViewLocationById(this.id)),
             this.instantiationService.createInstance(HistoryItemChangeRenderer, () => this._treeViewModel.viewMode.get(), resourceLabels),
             this.instantiationService.createInstance(HistoryItemLoadMoreRenderer, this._repositoryIsLoadingMore, () => this._loadMore()),
         ], this._treeDataSource, {
@@ -1593,7 +1629,12 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
             dnd: ( new SCMHistoryTreeDragAndDrop()),
             keyboardNavigationLabelProvider: ( new SCMHistoryTreeKeyboardNavigationLabelProvider()),
             horizontalScrolling: false,
-            multipleSelectionSupport: false
+            multipleSelectionSupport: false,
+            twistieAdditionalCssClass: (e) => {
+                return isSCMHistoryItemViewModelTreeElement(e) || isSCMHistoryItemLoadMoreTreeElement(e)
+                    ? 'force-no-twistie'
+                    : undefined;
+            }
         });
         this._register(this._tree);
         this._tree.onDidOpen(this._onDidOpen, this, this._store);
@@ -1617,9 +1658,9 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
             const historyItemChange = e.element.historyItemChange;
             const historyItem = e.element.historyItemViewModel.historyItem;
             const historyItemDisplayId = historyItem.id === SCMIncomingHistoryItemId
-                ? ( localize(10437, "Incoming Changes"))
+                ? ( localize(10572, "Incoming Changes"))
                 : historyItem.id === SCMOutgoingHistoryItemId
-                    ? ( localize(10438, "Outgoing Changes"))
+                    ? ( localize(10573, "Outgoing Changes"))
                     : historyItem.displayId ?? historyItem.id;
             const historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
             const historyItemParentDisplayId = historyItemParentId && historyItem.displayId

package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.d.ts

@@ -1,4 +1,4 @@
-import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPane";
 import { ISCMViewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
 import { ISCMService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
@@ -10,9 +10,13 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 export declare class SCMRepositoriesViewPane extends ViewPane {
     private readonly scmService;
     private readonly scmViewService;
+    private readonly commandService;
+    private readonly storageService;
     private tree;
     private treeDataSource;
     private treeIdentityProvider;
@@ -22,13 +26,14 @@ export declare class SCMRepositoriesViewPane extends ViewPane {
     private readonly providerCountBadgeObs;
     private readonly visibilityDisposables;
     private readonly repositoryDisposables;
-    constructor(options: IViewPaneOptions, scmService: ISCMService, scmViewService: ISCMViewService, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, instantiationService: IInstantiationService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService);
+    constructor(options: IViewPaneOptions, scmService: ISCMService, scmViewService: ISCMViewService, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, commandService: ICommandService, instantiationService: IInstantiationService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, storageService: IStorageService);
     protected renderBody(container: HTMLElement): void;
     protected layoutBody(height: number, width: number): void;
     focus(): void;
     private createTree;
     private onDidAddRepository;
     private onDidRemoveRepository;
+    private onTreeDidOpen;
     private onTreeContextMenu;
     private onTreeSelectionChange;
     private onTreeDidChangeFocus;
@@ -41,5 +46,7 @@ export declare class SCMRepositoriesViewPane extends ViewPane {
     private updateBodySize;
     private updateTreeSelection;
     private getTreeSelection;
+    private loadTreeViewState;
+    private storeTreeViewState;
     dispose(): void;
 }