@codingame/monaco-vscode-scm-service-override 22.1.8 → 23.0.0

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

@@ -34,9 +34,10 @@ import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/t
 import { ViewAction, ViewPane, ViewPaneShowActions } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/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-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/scm/browser/scmHistory';
-import { getHistoryItemEditorTitle, isSCMHistoryItemViewModelTreeElement, isSCMHistoryItemChangeViewModelTreeElement, isSCMHistoryItemChangeNode, isSCMHistoryItemLoadMoreTreeElement, getHistoryItemHoverContent, isSCMRepository, getProviderKey } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/scm/browser/util';
-import { HISTORY_VIEW_PANE_ID, ViewMode } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm';
+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 { 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';
@@ -58,25 +59,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 { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
 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-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/browser/labels';
+import { ResourceLabels } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/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-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
-import { ResourceTree } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/base/common/resourceTree';
+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 { 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 { autorun, autorunWithStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+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';
 import { waitForState } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utilsCancellation';
@@ -125,23 +125,23 @@ class SCMHistoryItemRefsActionViewItem extends ActionViewItem {
             icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitBranch));
             const name = $('.name');
             if (this._historyItemsFilter === 'all') {
-                name.textContent = ( localize(10128, "All"));
+                name.textContent = ( localize(10402, "All"));
             }
             else if (this._historyItemsFilter === 'auto') {
-                name.textContent = ( localize(10129, "Auto"));
+                name.textContent = ( localize(10403, "Auto"));
             }
             else if (this._historyItemsFilter.length === 1) {
                 name.textContent = this._historyItemsFilter[0].name;
             }
             else {
-                name.textContent = ( localize(10130, "{0} Items", this._historyItemsFilter.length));
+                name.textContent = ( localize(10404, "{0} Items", this._historyItemsFilter.length));
             }
             reset(this.label, icon, name);
         }
     }
     getTooltip() {
         if (this._historyItemsFilter === 'all') {
-            return localize(10131, "All history item references");
+            return localize(10405, "All history item references");
         }
         else if (this._historyItemsFilter === 'auto') {
             const historyProvider = this._repository.provider.historyProvider.get();
@@ -163,12 +163,12 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: PICK_REPOSITORY_ACTION_ID,
-            title: ( localize(10132, "Repository Picker")),
+            title: ( localize(10406, "Repository Picker")),
             viewId: HISTORY_VIEW_PANE_ID,
             f1: false,
             menu: {
                 id: MenuId.SCMHistoryTitle,
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.has('scm.providerCount')), ContextKeyExpr.greater('scm.providerCount', 1))),
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.has('scm.providerCount')), ContextKeyExpr.greater('scm.providerCount', 1), ( ContextKeyExpr.equals('config.scm.repositories.selectionMode', 'multiple')))),
                 group: 'navigation',
                 order: 0
             }
@@ -182,7 +182,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: PICK_HISTORY_ITEM_REFS_ACTION_ID,
-            title: ( localize(10133, "History Item Reference Picker")),
+            title: ( localize(10407, "History Item Reference Picker")),
             icon: Codicon.gitBranch,
             viewId: HISTORY_VIEW_PANE_ID,
             precondition: ( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)),
@@ -202,7 +202,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.revealCurrentHistoryItem',
-            title: ( localize(10134, "Go to Current History Item")),
+            title: ( localize(10408, "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 +222,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.refresh',
-            title: ( localize(10135, "Refresh")),
+            title: ( localize(10409, "Refresh")),
             viewId: HISTORY_VIEW_PANE_ID,
             f1: false,
             icon: Codicon.refresh,
@@ -241,7 +241,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.setListViewMode',
-            title: ( localize(10136, "View as List")),
+            title: ( localize(10410, "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 +256,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.setTreeViewMode',
-            title: ( localize(10137, "View as Tree")),
+            title: ( localize(10411, "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 +271,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.viewChanges',
-            title: ( localize(10138, "Open Changes")),
+            title: ( localize(10412, "Open Changes")),
             icon: Codicon.diffMultiple,
             f1: false,
             menu: [
@@ -298,21 +298,31 @@ registerAction2(class extends Action2 {
         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;
             }
         }
-        const title = historyItems.length === 1 ?
-            getHistoryItemEditorTitle(historyItem) :
-            ( localize(
-            10139,
-            "All Changes ({0} ↔ {1})",
-            historyItemLast.displayId ?? historyItemLast.id,
-            historyItem.displayId ?? historyItem.id
-        ));
-        const multiDiffSourceUri = ScmHistoryItemResolver.getMultiDiffSourceUri(provider, historyItem);
+        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];
+        }
+        else {
+            title = getHistoryItemEditorTitle(historyItem);
+            historyItemId = historyItem.id;
+            historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
+        }
+        const multiDiffSourceUri = ScmHistoryItemResolver.getMultiDiffSourceUri(provider, historyItemId, historyItemParentId, '');
         commandService.executeCommand('_workbench.openMultiDiffEditor', { title, multiDiffSourceUri });
     }
 });
@@ -320,7 +330,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.openFile',
-            title: ( localize(10140, "Open File")),
+            title: ( localize(10413, "Open File")),
             icon: Codicon.goToFile,
             f1: false,
             menu: [
@@ -342,10 +352,18 @@ registerAction2(class extends Action2 {
         if (!historyItem || !historyItemChange.modifiedUri) {
             return;
         }
-        await editorService.openEditor({
-            resource: historyItemChange.modifiedUri,
-            label: `${basename(historyItemChange.modifiedUri.fsPath)} (${historyItem.displayId ?? historyItem.id})`,
-        });
+        let version;
+        if (historyItem.id === SCMIncomingHistoryItemId) {
+            version = ( localize(10414, "Incoming Changes"));
+        }
+        else if (historyItem.id === SCMOutgoingHistoryItemId) {
+            version = ( localize(10415, "Outgoing Changes"));
+        }
+        else {
+            version = historyItem.displayId ?? historyItem.id;
+        }
+        const name = basename(historyItemChange.modifiedUri.fsPath);
+        await editorService.openEditor({ resource: historyItemChange.modifiedUri, label: `${name} (${version})` });
     }
 });
 class ListDelegate {
@@ -371,9 +389,8 @@ let HistoryItemRenderer = class HistoryItemRenderer {
     static { HistoryItemRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'history-item'; }
     get templateId() { return HistoryItemRenderer_1.TEMPLATE_ID; }
-    constructor(hoverDelegate, _clipboardService, _commandService, _configurationService, _contextKeyService, _contextMenuService, _hoverService, _keybindingService, _menuService, _telemetryService, _themeService) {
+    constructor(hoverDelegate, _commandService, _configurationService, _contextKeyService, _contextMenuService, _hoverService, _keybindingService, _menuService, _telemetryService) {
         this.hoverDelegate = hoverDelegate;
-        this._clipboardService = _clipboardService;
         this._commandService = _commandService;
         this._configurationService = _configurationService;
         this._contextKeyService = _contextKeyService;
@@ -382,7 +399,6 @@ let HistoryItemRenderer = class HistoryItemRenderer {
         this._keybindingService = _keybindingService;
         this._menuService = _menuService;
         this._telemetryService = _telemetryService;
-        this._themeService = _themeService;
         this._badgesConfig = observableConfigValue('scm.graph.badges', 'filter', this._configurationService);
     }
     renderTemplate(container) {
@@ -410,12 +426,16 @@ let HistoryItemRenderer = class HistoryItemRenderer {
         const provider = node.element.repository.provider;
         const historyItemViewModel = node.element.historyItemViewModel;
         const historyItem = historyItemViewModel.historyItem;
-        const historyItemHover = this._hoverService.setupManagedHover(this.hoverDelegate, templateData.element, getHistoryItemHoverContent(this._themeService, historyItem), {
-            actions: this._getHoverActions(provider, historyItem),
-        });
+        const hoverContent = {
+            markdown: historyItem.tooltip ?? historyItem.message,
+            markdownNotSupportedFallback: historyItem.message
+        };
+        const historyItemHover = this._hoverService.setupManagedHover(this.hoverDelegate, templateData.element, hoverContent);
         templateData.elementDisposables.add(historyItemHover);
         templateData.graphContainer.textContent = '';
-        templateData.graphContainer.classList.toggle('current', historyItemViewModel.isCurrent);
+        templateData.graphContainer.classList.toggle('current', historyItemViewModel.kind === 'HEAD');
+        templateData.graphContainer.classList.toggle('incoming-changes', historyItemViewModel.kind === 'incoming-changes');
+        templateData.graphContainer.classList.toggle('outgoing-changes', historyItemViewModel.kind === 'outgoing-changes');
         templateData.graphContainer.appendChild(renderSCMHistoryItemGraph(historyItemViewModel));
         const historyItemRef = provider.historyProvider.get()?.historyItemRef?.get();
         const extraClasses = historyItemRef?.revision === historyItem.id ? ['history-item-current'] : [];
@@ -444,9 +464,12 @@ let HistoryItemRenderer = class HistoryItemRenderer {
                 if (key === '' && labelConfig !== 'all') {
                     continue;
                 }
+                if (!historyItemRefs) {
+                    continue;
+                }
                 const historyItemRefByIconId = groupBy(historyItemRefs, ref => ThemeIcon.isThemeIcon(ref.icon) ? ref.icon.id : '');
                 for (const [key, historyItemRefs] of Object.entries(historyItemRefByIconId)) {
-                    if (key === '') {
+                    if (key === '' || !historyItemRefs) {
                         continue;
                     }
                     this._renderBadge(historyItemRefs, false, templateData);
@@ -481,31 +504,6 @@ let HistoryItemRenderer = class HistoryItemRenderer {
         elements.description.textContent = showDescription ? historyItemRefs[0].name : '';
         append(templateData.labelContainer, elements.root);
     }
-    _getHoverActions(provider, historyItem) {
-        const actions = this._menuService.getMenuActions(MenuId.SCMHistoryItemHover, this._contextKeyService, {
-            arg: provider,
-            shouldForwardArgs: true
-        }).flatMap(item => item[1]);
-        return [
-            {
-                commandId: 'workbench.scm.action.graph.copyHistoryItemId',
-                iconClass: 'codicon.codicon-copy',
-                label: historyItem.displayId ?? historyItem.id,
-                run: () => this._clipboardService.writeText(historyItem.id)
-            },
-            ...( actions.map(action => {
-                const iconClass = ThemeIcon.isThemeIcon(action.item.icon)
-                    ? ThemeIcon.asClassNameArray(action.item.icon).join('.')
-                    : undefined;
-                return {
-                    commandId: action.id,
-                    label: action.label,
-                    iconClass,
-                    run: () => action.run(historyItem)
-                };
-            }))
-        ];
-    }
     _processMatches(historyItemViewModel, filterData) {
         if (!filterData) {
             return [undefined, undefined];
@@ -524,16 +522,14 @@ let HistoryItemRenderer = class HistoryItemRenderer {
     }
 };
 HistoryItemRenderer = HistoryItemRenderer_1 = ( __decorate([
-    ( __param(1, IClipboardService)),
-    ( __param(2, ICommandService)),
-    ( __param(3, IConfigurationService)),
-    ( __param(4, IContextKeyService)),
-    ( __param(5, IContextMenuService)),
-    ( __param(6, IHoverService)),
-    ( __param(7, IKeybindingService)),
-    ( __param(8, IMenuService)),
-    ( __param(9, ITelemetryService)),
-    ( __param(10, IThemeService))
+    ( __param(1, ICommandService)),
+    ( __param(2, IConfigurationService)),
+    ( __param(3, IContextKeyService)),
+    ( __param(4, IContextMenuService)),
+    ( __param(5, IHoverService)),
+    ( __param(6, IKeybindingService)),
+    ( __param(7, IMenuService)),
+    ( __param(8, ITelemetryService))
 ], HistoryItemRenderer));
 let HistoryItemChangeRenderer = class HistoryItemChangeRenderer {
     static { HistoryItemChangeRenderer_1 = this; }
@@ -659,7 +655,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(10141, "{0} Load More...", icon)));
+                templateData.historyItemPlaceholderLabel.setLabel(( localize(10416, "{0} Load More...", icon)));
             }));
         }
     }
@@ -719,7 +715,7 @@ SCMHistoryViewPaneActionRunner = ( __decorate([
 ], SCMHistoryViewPaneActionRunner));
 class SCMHistoryTreeAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(10142, "Source Control History");
+        return localize(10417, "Source Control History");
     }
     getAriaLabel(element) {
         if (isSCMRepository(element)) {
@@ -813,10 +809,27 @@ class SCMHistoryTreeDataSource extends Disposable {
             }
         }
         else if (isSCMHistoryItemViewModelTreeElement(inputOrElement)) {
-            const historyItem = inputOrElement.historyItemViewModel.historyItem;
-            const historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
             const historyProvider = inputOrElement.repository.provider.historyProvider.get();
-            const historyItemChanges = (await historyProvider?.provideHistoryItemChanges(historyItem.id, historyItemParentId)) ?? [];
+            const historyItemViewModel = inputOrElement.historyItemViewModel;
+            const historyItem = historyItemViewModel.historyItem;
+            let historyItemId, historyItemParentId;
+            if (historyItemViewModel.kind === 'incoming-changes' ||
+                historyItemViewModel.kind === 'outgoing-changes') {
+                const historyItemRef = historyProvider?.historyItemRef.get();
+                const historyItemRemoteRef = historyProvider?.historyItemRemoteRef.get();
+                if (!historyProvider || !historyItemRef || !historyItemRemoteRef) {
+                    return [];
+                }
+                historyItemId = historyItemViewModel.kind === 'incoming-changes'
+                    ? historyItemRemoteRef.id
+                    : historyItemRef.id;
+                historyItemParentId = historyItem.parentIds[0];
+            }
+            else {
+                historyItemId = historyItem.id;
+                historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
+            }
+            const historyItemChanges = (await historyProvider?.provideHistoryItemChanges(historyItemId, historyItemParentId)) ?? [];
             if (this.viewMode() === ViewMode.List) {
                 children.push(...( historyItemChanges.map(change => ({
                     repository: inputOrElement.repository,
@@ -891,9 +904,10 @@ class SCMHistoryTreeDragAndDrop {
             const provider = element.repository.provider;
             const historyItem = element.historyItemViewModel.historyItem;
             const attachmentName = `$(${Codicon.repo.id})\u00A0${provider.name}\u00A0$(${Codicon.gitCommit.id})\u00A0${historyItem.displayId ?? historyItem.id}`;
+            const historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
             historyItems.push({
                 name: attachmentName,
-                resource: ScmHistoryItemResolver.getMultiDiffSourceUri(provider, historyItem),
+                resource: ScmHistoryItemResolver.getMultiDiffSourceUri(provider, historyItem.id, historyItemParentId, historyItem.displayId),
                 historyItem: historyItem
             });
         }
@@ -910,7 +924,8 @@ class SCMHistoryTreeDragAndDrop {
         if (isSCMHistoryItemViewModelTreeElement(element)) {
             const provider = element.repository.provider;
             const historyItem = element.historyItemViewModel.historyItem;
-            return ScmHistoryItemResolver.getMultiDiffSourceUri(provider, historyItem);
+            const historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
+            return ScmHistoryItemResolver.getMultiDiffSourceUri(provider, historyItem.id, historyItemParentId, historyItem.displayId);
         }
         return undefined;
     }
@@ -945,7 +960,7 @@ let SCMHistoryViewModel = class SCMHistoryViewModel extends Disposable {
             if (selectedRepository !== 'auto') {
                 return selectedRepository;
             }
-            return this._scmViewService.activeRepository.read(reader);
+            return this._scmViewService.activeRepository.read(reader)?.repository;
         });
         this.repository = latestChangedValue(this, [firstRepository, graphRepository]);
         const closedRepository = observableFromEvent(this, this._scmService.onDidRemoveRepository, repository => repository);
@@ -1007,6 +1022,8 @@ let SCMHistoryViewModel = class SCMHistoryViewModel extends Disposable {
     async getHistoryItems() {
         const repository = this.repository.get();
         const historyProvider = repository?.provider.historyProvider.get();
+        const historyItemRef = historyProvider?.historyItemRef.get();
+        const historyItemRemoteRef = historyProvider?.historyItemRemoteRef.get();
         if (!repository || !historyProvider) {
             this._scmHistoryItemCountCtx.set(0);
             this.isViewModelEmpty.set(true, undefined);
@@ -1015,6 +1032,8 @@ let SCMHistoryViewModel = class SCMHistoryViewModel extends Disposable {
         let state = this._repositoryState.get(repository);
         if (!state || state.loadMore !== false) {
             const historyItems = state?.viewModels
+                .filter(vm => vm.historyItemViewModel.kind !== 'incoming-changes' &&
+                vm.historyItemViewModel.kind !== 'outgoing-changes')
                 .map(vm => vm.historyItemViewModel.historyItem) ?? [];
             const historyItemRefs = state?.historyItemsFilter ??
                 (await this._resolveHistoryItemFilter(repository, historyProvider));
@@ -1025,14 +1044,24 @@ let SCMHistoryViewModel = class SCMHistoryViewModel extends Disposable {
                     historyItemRefs: historyItemRefIds, limit, skip: historyItems.length
                 })) ?? []));
             } while (typeof state?.loadMore === 'string' && !historyItems.find(item => item.id === state?.loadMore));
+            const mergeBase = historyItemRef && historyItemRemoteRef && state?.mergeBase === undefined
+                ? await historyProvider.resolveHistoryItemRefsCommonAncestor([
+                    historyItemRef.name,
+                    historyItemRemoteRef.name
+                ])
+                : state?.mergeBase;
             const colorMap = this._getGraphColorMap(historyItemRefs);
-            const viewModels = ( toISCMHistoryItemViewModelArray(historyItems, colorMap, historyProvider.historyItemRef.get())
+            const addIncomingChangesNode = this._scmViewService.graphShowIncomingChangesConfig.get()
+                && ( historyItemRefs.some(ref => ref.id === historyItemRemoteRef?.id));
+            const addOutgoingChangesNode = this._scmViewService.graphShowOutgoingChangesConfig.get()
+                && ( historyItemRefs.some(ref => ref.id === historyItemRef?.id));
+            const viewModels = ( toISCMHistoryItemViewModelArray(historyItems, colorMap, historyProvider.historyItemRef.get(), historyProvider.historyItemRemoteRef.get(), historyProvider.historyItemBaseRef.get(), addIncomingChangesNode, addOutgoingChangesNode, mergeBase)
                 .map(historyItemViewModel => ({
                 repository,
                 historyItemViewModel,
                 type: 'historyItemViewModel'
             })));
-            state = { historyItemsFilter: historyItemRefs, viewModels, loadMore: false };
+            state = { historyItemsFilter: historyItemRefs, viewModels, mergeBase, loadMore: false };
             this._repositoryState.set(repository, state);
             this._scmHistoryItemCountCtx.set(viewModels.length);
             this.isViewModelEmpty.set(viewModels.length === 0, undefined);
@@ -1162,8 +1191,8 @@ let RepositoryPicker = class RepositoryPicker {
         this._quickInputService = _quickInputService;
         this._scmViewService = _scmViewService;
         this._autoQuickPickItem = {
-            label: ( localize(10129, "Auto")),
-            description: ( localize(10143, "Show the source control graph for the active repository")),
+            label: ( localize(10403, "Auto")),
+            description: ( localize(10418, "Show the source control graph for the active repository")),
             repository: 'auto'
         };
     }
@@ -1181,7 +1210,7 @@ let RepositoryPicker = class RepositoryPicker {
             repository: r
         }))));
         return this._quickInputService.pick(picks, {
-            placeHolder: ( localize(10144, "Select the repository to view, type to filter all repositories"))
+            placeHolder: ( localize(10419, "Select the repository to view, type to filter all repositories"))
         });
     }
 };
@@ -1197,21 +1226,21 @@ let HistoryItemRefPicker = class HistoryItemRefPicker extends Disposable {
         this._quickInputService = _quickInputService;
         this._allQuickPickItem = {
             id: 'all',
-            label: ( localize(10128, "All")),
-            description: ( localize(10131, "All history item references")),
+            label: ( localize(10402, "All")),
+            description: ( localize(10405, "All history item references")),
             historyItemRef: 'all'
         };
         this._autoQuickPickItem = {
             id: 'auto',
-            label: ( localize(10129, "Auto")),
-            description: ( localize(10145, "Current history item reference(s)")),
+            label: ( localize(10403, "Auto")),
+            description: ( localize(10420, "Current history item reference(s)")),
             historyItemRef: 'auto'
         };
     }
     async pickHistoryItemRef() {
         const quickPick = this._quickInputService.createQuickPick({ useSeparators: true });
         this._store.add(quickPick);
-        quickPick.placeholder = ( localize(10146, "Select one/more history item references to view, type to filter"));
+        quickPick.placeholder = ( localize(10421, "Select one/more history item references to view, type to filter"));
         quickPick.canSelectMany = true;
         quickPick.hideCheckAll = true;
         quickPick.busy = true;
@@ -1308,7 +1337,7 @@ HistoryItemRefPicker = ( __decorate([
     ( __param(2, IQuickInputService))
 ], HistoryItemRefPicker));
 let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
-    constructor(options, _editorService, _instantiationService, _menuService, _progressService, configurationService, contextMenuService, keybindingService, instantiationService, viewDescriptorService, contextKeyService, openerService, themeService, hoverService) {
+    constructor(options, _editorService, _instantiationService, _menuService, _progressService, _scmViewService, configurationService, contextMenuService, keybindingService, instantiationService, viewDescriptorService, contextKeyService, openerService, themeService, hoverService) {
         super({
             ...options,
             titleMenuId: MenuId.SCMHistoryTitle,
@@ -1318,18 +1347,22 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
         this._instantiationService = _instantiationService;
         this._menuService = _menuService;
         this._progressService = _progressService;
+        this._scmViewService = _scmViewService;
         this._repositoryIsLoadingMore = observableValue(this, false);
         this._repositoryOutdated = observableValue(this, false);
         this._visibilityDisposables = ( new DisposableStore());
         this._treeOperationSequencer = ( new Sequencer());
         this._treeLoadMoreSequencer = ( new Sequencer());
+        this._refreshThrottler = ( new Throttler());
         this._updateChildrenThrottler = ( new Throttler());
         this._contextMenuDisposables = ( new MutableDisposable());
         this._scmProviderCtx = ContextKeys.SCMProvider.bindTo(this.scopedContextKeyService);
         this._scmCurrentHistoryItemRefHasRemote = ContextKeys.SCMCurrentHistoryItemRefHasRemote.bindTo(this.scopedContextKeyService);
+        this._scmCurrentHistoryItemRefHasBase = ContextKeys.SCMCurrentHistoryItemRefHasBase.bindTo(this.scopedContextKeyService);
         this._scmCurrentHistoryItemRefInFilter = ContextKeys.SCMCurrentHistoryItemRefInFilter.bindTo(this.scopedContextKeyService);
         this._actionRunner = this.instantiationService.createInstance(SCMHistoryViewPaneActionRunner);
         this._register(this._actionRunner);
+        this._register(this._refreshThrottler);
         this._register(this._updateChildrenThrottler);
     }
     renderHeaderTitle(container) {
@@ -1341,7 +1374,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
         container.appendChild(element.root);
         this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), element.root, {
             markdown: {
-                value: ( localize(10147, "Please refresh the graph using the refresh action ($(refresh)).")),
+                value: ( localize(10422, "Please refresh the graph using the refresh action ($(refresh)).")),
                 supportThemeIcons: true
             },
             markdownNotSupportedFallback: undefined
@@ -1380,8 +1413,14 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
                 this._treeViewModel.isViewModelEmpty.read(reader);
                 this._onDidChangeViewWelcomeState.fire();
             }));
+            this._visibilityDisposables.add(runOnChange(this._scmViewService.graphShowIncomingChangesConfig, async () => {
+                await this.refresh();
+            }));
+            this._visibilityDisposables.add(runOnChange(this._scmViewService.graphShowOutgoingChangesConfig, async () => {
+                await this.refresh();
+            }));
             let isFirstRun = true;
-            this._visibilityDisposables.add(autorunWithStore((reader, store) => {
+            this._visibilityDisposables.add(autorun(reader => {
                 const repository = this._treeViewModel.repository.read(reader);
                 const historyProvider = repository?.provider.historyProvider.read(reader);
                 if (!repository || !historyProvider) {
@@ -1390,11 +1429,11 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
                 const historyItemRefId = derived(reader => {
                     return historyProvider.historyItemRef.read(reader)?.id;
                 });
-                store.add(runOnChange(historyItemRefId, async (historyItemRefIdValue) => {
+                reader.store.add(runOnChange(historyItemRefId, async (historyItemRefIdValue) => {
                     await this.refresh();
                     this._scmCurrentHistoryItemRefInFilter.set(this._isCurrentHistoryItemInFilter(historyItemRefIdValue));
                 }));
-                store.add(runOnChange(historyProvider.historyItemRefChanges, changes => {
+                reader.store.add(runOnChange(historyProvider.historyItemRefChanges, changes => {
                     if (changes.silent) {
                         if (this._tree.scrollTop === 0) {
                             this.refresh();
@@ -1405,14 +1444,17 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
                     }
                     this.refresh();
                 }));
-                store.add(runOnChange(this._treeViewModel.onDidChangeHistoryItemsFilter, async () => {
+                reader.store.add(runOnChange(this._treeViewModel.onDidChangeHistoryItemsFilter, async () => {
                     await this.refresh();
                     this._scmCurrentHistoryItemRefInFilter.set(this._isCurrentHistoryItemInFilter(historyItemRefId.read(undefined)));
                 }));
-                store.add(autorun(reader => {
+                reader.store.add(autorun(reader => {
                     this._scmCurrentHistoryItemRefHasRemote.set(!!historyProvider.historyItemRemoteRef.read(reader));
                 }));
-                store.add(runOnChange(this._treeViewModel.viewMode, async () => {
+                reader.store.add(autorun(reader => {
+                    this._scmCurrentHistoryItemRefHasBase.set(!!historyProvider.historyItemBaseRef.read(reader));
+                }));
+                reader.store.add(runOnChange(this._treeViewModel.viewMode, async () => {
                     await this._updateChildren();
                 }));
                 this._scmProviderCtx.set(repository.provider.providerId);
@@ -1466,8 +1508,17 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
         return this._treeViewModel?.isViewModelEmpty.get() === true;
     }
     async refresh() {
+        return this._refreshThrottler.queue(token => this._refresh(token));
+    }
+    async _refresh(token) {
+        if (token.isCancellationRequested) {
+            return;
+        }
         this._treeViewModel.clearRepositoryState();
         await this._updateChildren();
+        if (token.isCancellationRequested) {
+            return;
+        }
         this.updateActions();
         this._repositoryOutdated.set(false, undefined);
         this._tree.scrollTop = 0;
@@ -1565,7 +1616,11 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
         else if (isSCMHistoryItemChangeViewModelTreeElement(e.element)) {
             const historyItemChange = e.element.historyItemChange;
             const historyItem = e.element.historyItemViewModel.historyItem;
-            const historyItemDisplayId = historyItem.displayId ?? historyItem.id;
+            const historyItemDisplayId = historyItem.id === SCMIncomingHistoryItemId
+                ? ( localize(10414, "Incoming Changes"))
+                : historyItem.id === SCMOutgoingHistoryItemId
+                    ? ( localize(10415, "Outgoing Changes"))
+                    : historyItem.displayId ?? historyItem.id;
             const historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
             const historyItemParentDisplayId = historyItemParentId && historyItem.displayId
                 ? historyItemParentId.substring(0, historyItem.displayId.length)
@@ -1573,7 +1628,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
             if (historyItemChange.originalUri && historyItemChange.modifiedUri) {
                 const originalUriTitle = `${basename(historyItemChange.originalUri.fsPath)} (${historyItemParentDisplayId})`;
                 const modifiedUriTitle = `${basename(historyItemChange.modifiedUri.fsPath)} (${historyItemDisplayId})`;
-                const title = `${originalUriTitle} ↔ ${modifiedUriTitle}`;
+                const title = `${originalUriTitle} \u2194 ${modifiedUriTitle}`;
                 await this._editorService.openEditor({
                     label: title,
                     original: { resource: historyItemChange.originalUri },
@@ -1607,7 +1662,13 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
     _onContextMenu(e) {
         const element = e.element;
         if (isSCMHistoryItemViewModelTreeElement(element)) {
+            if (element.historyItemViewModel.kind === 'incoming-changes' || element.historyItemViewModel.kind === 'outgoing-changes') {
+                return;
+            }
             this._contextMenuDisposables.value = ( new DisposableStore());
+            const historyProvider = element.repository.provider.historyProvider.get();
+            const historyItemRef = historyProvider?.historyItemRef.get();
+            const historyItem = element.historyItemViewModel.historyItem;
             const historyItemRefMenuItems = MenuRegistry.getMenuItems(MenuId.SCMHistoryItemRefContext).filter(item => isIMenuItem(item));
             if (historyItemRefMenuItems.length > 0 && element.historyItemViewModel.historyItem.references?.length) {
                 const historyItemRefActions = ( new Map());
@@ -1654,7 +1715,10 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
                     }
                 }
             }
-            const menuActions = this._menuService.getMenuActions(MenuId.SCMHistoryItemContext, this.scopedContextKeyService, {
+            const contextKeyService = this.scopedContextKeyService.createOverlay([
+                ['scmHistoryItemHasCurrentHistoryItemRef', historyItem.references?.find(ref => ref.id === historyItemRef?.id) !== undefined]
+            ]);
+            const menuActions = this._menuService.getMenuActions(MenuId.SCMHistoryItemContext, contextKeyService, {
                 arg: element.repository.provider,
                 shouldForwardArgs: true
             }).filter(group => group[0] !== 'inline');
@@ -1714,15 +1778,16 @@ SCMHistoryViewPane = ( __decorate([
     ( __param(2, IInstantiationService)),
     ( __param(3, IMenuService)),
     ( __param(4, IProgressService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IContextMenuService)),
-    ( __param(7, IKeybindingService)),
-    ( __param(8, IInstantiationService)),
-    ( __param(9, IViewDescriptorService)),
-    ( __param(10, IContextKeyService)),
-    ( __param(11, IOpenerService)),
-    ( __param(12, IThemeService)),
-    ( __param(13, IHoverService))
+    ( __param(5, ISCMViewService)),
+    ( __param(6, IConfigurationService)),
+    ( __param(7, IContextMenuService)),
+    ( __param(8, IKeybindingService)),
+    ( __param(9, IInstantiationService)),
+    ( __param(10, IViewDescriptorService)),
+    ( __param(11, IContextKeyService)),
+    ( __param(12, IOpenerService)),
+    ( __param(13, IThemeService)),
+    ( __param(14, IHoverService))
 ], SCMHistoryViewPane));
 
 export { SCMHistoryViewPane };