@codingame/monaco-vscode-scm-service-override 6.0.2 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "6.0.2",
+  "version": "7.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@6.0.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.0.0"
   }
 }

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
-import { Disposable, MutableDisposable, DisposableStore, combinedDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore, combinedDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { VIEW_PANE_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMService, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
@@ -19,108 +19,126 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { ITitleService } from 'vscode/vscode/vs/workbench/services/title/browser/titleService.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { getRepositoryResourceCount } from './util.js';
+import 'vscode/vscode/vs/base/common/arrays';
+import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
+import { autorun, autorunWithStore } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
+import { observableFromEvent, observableFromEventOpts, derivedObservableWithCache, latestChangedValue } from 'vscode/vscode/vs/base/common/observableInternal/utils';
+import 'vscode/vscode/vs/base/common/cancellation';
+import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 
 const _moduleId = "vs/workbench/contrib/scm/browser/activity";
-function getCount(repository) {
-    if (typeof repository.provider.count === 'number') {
-        return repository.provider.count;
-    }
-    else {
-        return repository.provider.groups.reduce((r, g) => r + g.resources.length, 0);
-    }
-}
-let SCMStatusController = class SCMStatusController {
-    constructor(scmService, scmViewService, statusbarService, activityService, editorService, configurationService, uriIdentityService) {
+let SCMActiveRepositoryController = class SCMActiveRepositoryController extends Disposable {
+    constructor(activityService, configurationService, contextKeyService, editorService, logService, scmService, scmViewService, statusbarService, titleService) {
+        super();
+        this.activityService = activityService;
+        this.configurationService = configurationService;
+        this.contextKeyService = contextKeyService;
+        this.editorService = editorService;
+        this.logService = logService;
         this.scmService = scmService;
         this.scmViewService = scmViewService;
         this.statusbarService = statusbarService;
-        this.activityService = activityService;
-        this.editorService = editorService;
-        this.configurationService = configurationService;
-        this.uriIdentityService = uriIdentityService;
-        this.statusBarDisposable = Disposable.None;
-        this.focusDisposable = Disposable.None;
-        this.focusedRepository = undefined;
-        this.badgeDisposable = ( (new MutableDisposable()));
-        this.disposables = ( (new DisposableStore()));
-        this.repositoryDisposables = ( (new Set()));
-        this.scmService.onDidAddRepository(this.onDidAddRepository, this, this.disposables);
-        this.scmService.onDidRemoveRepository(this.onDidRemoveRepository, this, this.disposables);
-        const onDidChangeSCMCountBadge = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.countBadge'));
-        onDidChangeSCMCountBadge(this.renderActivityCount, this, this.disposables);
-        for (const repository of this.scmService.repositories) {
-            this.onDidAddRepository(repository);
-        }
-        this.scmViewService.onDidFocusRepository(this.focusRepository, this, this.disposables);
-        this.focusRepository(this.scmViewService.focusedRepository);
-        editorService.onDidActiveEditorChange(() => this.tryFocusRepositoryBasedOnActiveEditor(), this, this.disposables);
-        this.renderActivityCount();
-    }
-    tryFocusRepositoryBasedOnActiveEditor(repositories = this.scmService.repositories) {
-        const resource = EditorResourceAccessor.getOriginalUri(this.editorService.activeEditor);
-        if (!resource) {
-            return false;
-        }
-        let bestRepository = null;
-        let bestMatchLength = Number.POSITIVE_INFINITY;
-        for (const repository of repositories) {
-            const root = repository.provider.rootUri;
-            if (!root) {
-                continue;
+        this.titleService = titleService;
+        this._countBadgeConfig = observableConfigValue('scm.countBadge', 'all', this.configurationService);
+        this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
+        this._focusedRepository = observableFromEventOpts({ owner: this, equalsFn: () => false }, this.scmViewService.onDidFocusRepository, () => this.scmViewService.focusedRepository);
+        this._activeEditor = observableFromEventOpts({ owner: this, equalsFn: () => false }, this.editorService.onDidActiveEditorChange, () => this.editorService.activeEditor);
+        this._activeEditorRepository = derivedObservableWithCache(this, (reader, lastValue) => {
+            const activeResource = EditorResourceAccessor.getOriginalUri(this._activeEditor.read(reader));
+            if (!activeResource) {
+                this.logService.trace('SCMActiveRepositoryController (activeEditorRepository derived): no activeResource');
+                return lastValue;
             }
-            const path = this.uriIdentityService.extUri.relativePath(root, resource);
-            if (path && !/^\.\./.test(path) && path.length < bestMatchLength) {
-                bestRepository = repository;
-                bestMatchLength = path.length;
+            const repository = this.scmService.getRepository(activeResource);
+            if (!repository) {
+                this.logService.trace(`SCMActiveRepositoryController (activeEditorRepository derived): no repository for '${( (activeResource.toString()))}'`);
+                return lastValue;
             }
-        }
-        if (!bestRepository) {
-            return false;
-        }
-        this.focusRepository(bestRepository);
-        return true;
-    }
-    onDidAddRepository(repository) {
-        const onDidChange = Event.any(repository.provider.onDidChange, repository.provider.onDidChangeResources);
-        const changeDisposable = onDidChange(() => this.renderActivityCount());
-        const onDidRemove = Event.filter(this.scmService.onDidRemoveRepository, e => e === repository);
-        const removeDisposable = onDidRemove(() => {
-            disposable.dispose();
-            this.repositoryDisposables.delete(disposable);
-            this.renderActivityCount();
+            return Object.create(repository);
         });
-        const disposable = combinedDisposable(changeDisposable, removeDisposable);
-        this.repositoryDisposables.add(disposable);
-        this.tryFocusRepositoryBasedOnActiveEditor(Iterable.single(repository));
+        this._activeRepository = latestChangedValue(this, [this._activeEditorRepository, this._focusedRepository]);
+        this._countBadgeRepositories = derived(this, reader => {
+            switch (this._countBadgeConfig.read(reader)) {
+                case 'all': {
+                    const repositories = this._repositories.read(reader);
+                    return [...( (Iterable.map(
+                        repositories,
+                        r => ({ ...r.provider, resourceCount: this._getRepositoryResourceCount(r) })
+                    )))];
+                }
+                case 'focused': {
+                    const repository = this._activeRepository.read(reader);
+                    return repository ? [{ ...repository.provider, resourceCount: this._getRepositoryResourceCount(repository) }] : [];
+                }
+                case 'off':
+                    return [];
+                default:
+                    throw ( (new Error('Invalid countBadge setting')));
+            }
+        });
+        this._countBadge = derived(this, reader => {
+            let total = 0;
+            for (const repository of this._countBadgeRepositories.read(reader)) {
+                const count = repository.count?.read(reader);
+                const resourceCount = repository.resourceCount.read(reader);
+                total = total + (count ?? resourceCount);
+            }
+            return total;
+        });
+        this._activeRepositoryNameContextKey = ActiveRepositoryContextKeys.ActiveRepositoryName.bindTo(this.contextKeyService);
+        this._activeRepositoryBranchNameContextKey = ActiveRepositoryContextKeys.ActiveRepositoryBranchName.bindTo(this.contextKeyService);
+        this.titleService.registerVariables([
+            { name: 'activeRepositoryName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryName.key },
+            { name: 'activeRepositoryBranchName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryBranchName.key, }
+        ]);
+        this._register(autorun(reader => {
+            const repository = this._focusedRepository.read(reader);
+            const commands = repository?.provider.statusBarCommands.read(reader);
+            this.logService.trace('SCMActiveRepositoryController (focusedRepository):', repository?.id ?? 'no id');
+            this.logService.trace('SCMActiveRepositoryController (focusedRepository):', commands ? ( (commands.map(c => c.title))).join(', ') : 'no commands');
+        }));
+        this._register(autorun(reader => {
+            const repository = this._activeEditorRepository.read(reader);
+            const commands = repository?.provider.statusBarCommands.read(reader);
+            this.logService.trace('SCMActiveRepositoryController (activeEditorRepository):', repository?.id ?? 'no id');
+            this.logService.trace('SCMActiveRepositoryController (activeEditorRepository):', commands ? ( (commands.map(c => c.title))).join(', ') : 'no commands');
+        }));
+        this._register(autorunWithStore((reader, store) => {
+            this._updateActivityCountBadge(this._countBadge.read(reader), store);
+        }));
+        this._register(autorunWithStore((reader, store) => {
+            const repository = this._activeRepository.read(reader);
+            const commands = repository?.provider.statusBarCommands.read(reader);
+            this.logService.trace('SCMActiveRepositoryController (status bar):', repository?.id ?? 'no id');
+            this.logService.trace('SCMActiveRepositoryController (status bar):', commands ? ( (commands.map(c => c.title))).join(', ') : 'no commands');
+            this._updateStatusBar(repository, commands ?? [], store);
+        }));
+        this._register(autorun(reader => {
+            const repository = this._activeRepository.read(reader);
+            const currentHistoryItemGroup = repository?.provider.historyProviderObs.read(reader)?.currentHistoryItemGroupObs.read(reader);
+            this._updateActiveRepositoryContextKeys(repository, currentHistoryItemGroup);
+        }));
     }
-    onDidRemoveRepository(repository) {
-        if (this.focusedRepository !== repository) {
-            return;
-        }
-        this.focusRepository(Iterable.first(this.scmService.repositories));
+    _getRepositoryResourceCount(repository) {
+        return observableFromEvent(this, repository.provider.onDidChangeResources, () =>  getRepositoryResourceCount(repository.provider));
     }
-    focusRepository(repository) {
-        if (this.focusedRepository === repository) {
+    _updateActivityCountBadge(count, store) {
+        if (count === 0) {
             return;
         }
-        this.focusDisposable.dispose();
-        this.focusedRepository = repository;
-        if (repository && repository.provider.onDidChangeStatusBarCommands) {
-            this.focusDisposable = repository.provider.onDidChangeStatusBarCommands(() => this.renderStatusBar(repository));
-        }
-        this.renderStatusBar(repository);
-        this.renderActivityCount();
+        const badge = ( (new NumberBadge(count, num => ( localizeWithPath(_moduleId, 0, '{0} pending changes', num)))));
+        store.add(this.activityService.showViewActivity(VIEW_PANE_ID, { badge }));
     }
-    renderStatusBar(repository) {
-        this.statusBarDisposable.dispose();
+    _updateStatusBar(repository, commands, store) {
         if (!repository) {
+            this.logService.trace('SCMActiveRepositoryController (status bar): repository is undefined');
             return;
         }
-        const commands = repository.provider.statusBarCommands || [];
         const label = repository.provider.rootUri
             ? `${basename(repository.provider.rootUri)} (${repository.provider.label})`
             : repository.provider.label;
-        const disposables = ( (new DisposableStore()));
         for (let index = 0; index < commands.length; index++) {
             const command = commands[index];
             const tooltip = `${label}${command.tooltip ? ` - ${command.tooltip}` : ''}`;
@@ -137,110 +155,37 @@ let SCMStatusController = class SCMStatusController {
                 repoAgnosticActionName = '';
             }
             const statusbarEntry = {
-                name: ( localizeWithPath(_moduleId, 0, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
+                name: ( localizeWithPath(_moduleId, 1, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
                 text: command.title,
                 ariaLabel: tooltip,
                 tooltip,
                 command: command.id ? command : undefined
             };
-            disposables.add(index === 0 ?
+            store.add(index === 0 ?
                 this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, StatusbarAlignment.LEFT, 10000) :
                 this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, StatusbarAlignment.LEFT, { id: `status.scm.${index - 1}`, alignment: StatusbarAlignment.RIGHT, compact: true }));
         }
-        this.statusBarDisposable = disposables;
     }
-    renderActivityCount() {
-        const countBadgeType = this.configurationService.getValue('scm.countBadge');
-        let count = 0;
-        if (countBadgeType === 'all') {
-            count = Iterable.reduce(this.scmService.repositories, (r, repository) => r + getCount(repository), 0);
-        }
-        else if (countBadgeType === 'focused' && this.focusedRepository) {
-            count = getCount(this.focusedRepository);
-        }
-        if (count > 0) {
-            const badge = ( (new NumberBadge(count, num => ( localizeWithPath(_moduleId, 1, '{0} pending changes', num)))));
-            this.badgeDisposable.value = this.activityService.showViewActivity(VIEW_PANE_ID, { badge });
-        }
-        else {
-            this.badgeDisposable.value = undefined;
-        }
-    }
-    dispose() {
-        this.focusDisposable.dispose();
-        this.statusBarDisposable.dispose();
-        this.badgeDisposable.dispose();
-        this.disposables.dispose();
-        dispose(( (this.repositoryDisposables.values())));
-        this.repositoryDisposables.clear();
+    _updateActiveRepositoryContextKeys(repository, currentHistoryItemGroup) {
+        this._activeRepositoryNameContextKey.set(repository?.provider.name ?? '');
+        this._activeRepositoryBranchNameContextKey.set(currentHistoryItemGroup?.name ?? '');
     }
 };
-SCMStatusController = ( (__decorate([
-    ( (__param(0, ISCMService))),
-    ( (__param(1, ISCMViewService))),
-    ( (__param(2, IStatusbarService))),
-    ( (__param(3, IActivityService))),
-    ( (__param(4, IEditorService))),
-    ( (__param(5, IConfigurationService))),
-    ( (__param(6, IUriIdentityService)))
-], SCMStatusController)));
+SCMActiveRepositoryController = ( (__decorate([
+    ( (__param(0, IActivityService))),
+    ( (__param(1, IConfigurationService))),
+    ( (__param(2, IContextKeyService))),
+    ( (__param(3, IEditorService))),
+    ( (__param(4, ILogService))),
+    ( (__param(5, ISCMService))),
+    ( (__param(6, ISCMViewService))),
+    ( (__param(7, IStatusbarService))),
+    ( (__param(8, ITitleService)))
+], SCMActiveRepositoryController)));
 const ActiveRepositoryContextKeys = {
     ActiveRepositoryName: ( (new RawContextKey('scmActiveRepositoryName', ''))),
     ActiveRepositoryBranchName: ( (new RawContextKey('scmActiveRepositoryBranchName', ''))),
 };
-let SCMActiveRepositoryContextKeyController = class SCMActiveRepositoryContextKeyController {
-    constructor(contextKeyService, editorService, scmViewService, titleService, uriIdentityService) {
-        this.editorService = editorService;
-        this.scmViewService = scmViewService;
-        this.uriIdentityService = uriIdentityService;
-        this.focusedRepository = undefined;
-        this.focusDisposable = Disposable.None;
-        this.disposables = ( (new DisposableStore()));
-        this.activeRepositoryNameContextKey = ActiveRepositoryContextKeys.ActiveRepositoryName.bindTo(contextKeyService);
-        this.activeRepositoryBranchNameContextKey = ActiveRepositoryContextKeys.ActiveRepositoryBranchName.bindTo(contextKeyService);
-        titleService.registerVariables([
-            { name: 'activeRepositoryName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryName.key },
-            { name: 'activeRepositoryBranchName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryBranchName.key, }
-        ]);
-        editorService.onDidActiveEditorChange(this.onDidActiveEditorChange, this, this.disposables);
-        scmViewService.onDidFocusRepository(this.onDidFocusRepository, this, this.disposables);
-        this.onDidFocusRepository(scmViewService.focusedRepository);
-    }
-    onDidActiveEditorChange() {
-        const activeResource = EditorResourceAccessor.getOriginalUri(this.editorService.activeEditor);
-        if (activeResource?.scheme !== Schemas.file && activeResource?.scheme !== Schemas.vscodeRemote) {
-            return;
-        }
-        const repository = Iterable.find(this.scmViewService.repositories, r => Boolean(r.provider.rootUri && this.uriIdentityService.extUri.isEqualOrParent(activeResource, r.provider.rootUri)));
-        this.onDidFocusRepository(repository);
-    }
-    onDidFocusRepository(repository) {
-        if (!repository || this.focusedRepository === repository) {
-            return;
-        }
-        this.focusDisposable.dispose();
-        this.focusedRepository = repository;
-        if (repository && repository.provider.onDidChangeStatusBarCommands) {
-            this.focusDisposable = repository.provider.onDidChangeStatusBarCommands(() => this.updateContextKeys(repository));
-        }
-        this.updateContextKeys(repository);
-    }
-    updateContextKeys(repository) {
-        this.activeRepositoryNameContextKey.set(repository?.provider.name ?? '');
-        this.activeRepositoryBranchNameContextKey.set(repository?.provider.historyProvider?.currentHistoryItemGroup?.name ?? '');
-    }
-    dispose() {
-        this.focusDisposable.dispose();
-        this.disposables.dispose();
-    }
-};
-SCMActiveRepositoryContextKeyController = ( (__decorate([
-    ( (__param(0, IContextKeyService))),
-    ( (__param(1, IEditorService))),
-    ( (__param(2, ISCMViewService))),
-    ( (__param(3, ITitleService))),
-    ( (__param(4, IUriIdentityService)))
-], SCMActiveRepositoryContextKeyController)));
 let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyController {
     constructor(editorGroupsService, scmService, uriIdentityService) {
         this.scmService = scmService;
@@ -317,4 +262,4 @@ SCMActiveResourceContextKeyController = ( (__decorate([
     ( (__param(2, IUriIdentityService)))
 ], SCMActiveResourceContextKeyController)));
 
-export { SCMActiveRepositoryContextKeyController, SCMActiveResourceContextKeyController, SCMStatusController };
+export { SCMActiveRepositoryController, SCMActiveResourceContextKeyController };

package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css.js

@@ -1,6 +1,6 @@
 import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".scm-view{height:100%;position:relative}.scm-overflow-widgets-container{height:0;left:0;overflow:visible;position:absolute;top:0;width:0;z-index:5000}.scm-view .monaco-tl-contents>div{overflow:hidden;padding-right:12px}.scm-view .count{display:flex;margin-left:6px}.scm-view .count.hidden{display:none}.scm-view .scm-provider{align-items:center;display:flex;flex-direction:column;flex-flow:nowrap;height:100%}.scm-view.auto-provider-counts .scm-provider>.count[data-count=\"0\"],.scm-view.hide-provider-counts .scm-provider>.count{display:none}.scm-view .scm-provider>.label{flex:1;min-width:50px;overflow:hidden;text-overflow:ellipsis}.scm-view .scm-provider>.label>.name{font-weight:700}.scm-view .scm-provider>.label>.description{font-size:.9em;margin-left:.5em;opacity:.7}.scm-view .scm-provider>.actions{justify-content:flex-end;overflow:hidden}.scm-view .monaco-editor .selected-text{border-radius:0}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item{align-items:center;display:flex;padding-left:4px}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item:first-child{min-width:20px}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.action-label,.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.monaco-dropdown>.dropdown-label>.action-label{align-items:center;display:flex;line-height:16px;overflow:hidden}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.action-label>.codicon{font-size:12px;justify-content:center}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item:last-of-type{padding-right:0}.scm-view .scm-provider>.body{flex-grow:1}.scm-view .scm-provider>.status>.monaco-action-bar>.actions-container{border-color:var(--vscode-sideBar-border)}.scm-view .monaco-list-row{line-height:22px}.scm-view .monaco-list-row .history,.scm-view .monaco-list-row .history-item-group,.scm-view .monaco-list-row .resource-group{align-items:center;display:flex;height:100%}.scm-view .monaco-list-row .history-item .monaco-icon-label,.scm-view .monaco-list-row .history-item-group .monaco-icon-label{align-items:center;flex-grow:1}.scm-view .monaco-list-row .history-item{align-items:center;display:flex}.scm-view .monaco-list-row .history-item .stats-container{border:1px solid var(--vscode-scm-historyItemStatisticsBorder);border-radius:2px;display:flex;font-size:11px;gap:4px;line-height:11px;margin-left:6px;min-height:18px;padding:0 4px}.scm-view .monaco-list-row.focused .history-item .stats-container,.scm-view .monaco-list-row.selected .history-item .stats-container{border:1px solid var(--vscode-scm-historyItemSelectedStatisticsBorder)}.scm-view .monaco-list-row .history-item .stats-container>.deletions-label,.scm-view .monaco-list-row .history-item .stats-container>.files-label,.scm-view .monaco-list-row .history-item .stats-container>.insertions-label{align-items:center;display:flex;opacity:.75}.scm-view .monaco-list-row .history-item .stats-container>.insertions-label{color:var(--vscode-scm-historyItemAdditionsForeground)}.scm-view .monaco-list-row .history-item .stats-container>.deletions-label{color:var(--vscode-scm-historyItemDeletionsForeground)}.scm-view .monaco-list-row .history-item .stats-container.hidden,.scm-view .monaco-list-row .history-item .stats-container>.deletions-label.hidden,.scm-view .monaco-list-row .history-item .stats-container>.insertions-label.hidden{display:none}.scm-view .monaco-list-row .history-item .monaco-icon-label .icon-container,.scm-view .monaco-list-row .history-item-group .monaco-icon-label .icon-container{display:flex;padding-right:4px}.scm-view .monaco-list-row .history-item .monaco-icon-label .avatar{border-radius:14px;height:14px;width:14px}.scm-view .monaco-list-row .separator-container{align-items:center;display:flex;padding-left:11px}.scm-view .monaco-list-row .separator-container .label-name{font-size:10px}.scm-view .monaco-list-row.focused .separator-container .label-name,.scm-view .monaco-list-row.selected .separator-container .label-name{color:var(--vscode-foreground)}.scm-view .monaco-list-row .separator-container .separator{border-top:1px solid var(--vscode-sideBar-border);display:flex;flex-grow:1;height:0;margin-left:6px}.scm-view .monaco-list-row .separator-container .actions{padding-left:6px}.scm-view .monaco-list-row .history-item-group>.name,.scm-view .monaco-list-row .history>.name,.scm-view .monaco-list-row .resource-group>.name{flex:1;overflow:hidden;text-overflow:ellipsis}.scm-view .monaco-list-row .resource{display:flex;height:100%}.scm-view .monaco-list-row .resource.faded{opacity:.7}.scm-view .monaco-list-row .resource>.name{flex:1;overflow:hidden}.scm-view .monaco-list-row .resource>.name>.monaco-icon-label:after{margin-right:3px}.scm-view .monaco-list-row .resource>.decoration-icon{background-position:50% 50%;background-repeat:no-repeat;height:100%;margin-left:5px;width:16px}.scm-view .monaco-list-row .resource>.decoration-icon.codicon{margin-right:0;margin-top:3px}.scm-view .monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions{flex-grow:100}.scm-view .monaco-list .monaco-list-row .history-item-group>.actions,.scm-view .monaco-list .monaco-list-row .history-item>.actions,.scm-view .monaco-list .monaco-list-row .resource-group>.actions,.scm-view .monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row .separator-container>.actions{display:none;max-width:fit-content}.scm-view .monaco-list .monaco-list-row.focused .history-item-group>.actions,.scm-view .monaco-list .monaco-list-row.focused .history-item>.actions,.scm-view .monaco-list .monaco-list-row.focused .resource-group>.actions,.scm-view .monaco-list .monaco-list-row.focused .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row.focused .separator-container>.actions,.scm-view .monaco-list .monaco-list-row:hover .history-item-group>.actions,.scm-view .monaco-list .monaco-list-row:hover .history-item>.actions,.scm-view .monaco-list .monaco-list-row:hover .resource-group>.actions,.scm-view .monaco-list .monaco-list-row:hover .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row:hover .separator-container>.actions,.scm-view .monaco-list:not(.selection-multiple) .monaco-list-row .resource:hover>.actions{display:block}.scm-view .monaco-list .monaco-list-row.focused.force-no-hover,.scm-view .monaco-list .monaco-list-row.force-no-hover,.scm-view .monaco-list .monaco-list-row.selected.force-no-hover,.scm-view .monaco-list .monaco-list-row:hover.force-no-hover{background:transparent!important}.scm-view .monaco-list .monaco-list-row.cursor-default{cursor:default}.scm-view.show-actions .scm-provider>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .history-item-group>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .history-item>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .resource-group>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .scm-input>.scm-editor>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .separator-container>.actions{display:block}.scm-view .monaco-list-row .actions .action-label{padding:2px}.scm-view .scm-input{align-items:center;display:flex;height:100%;padding-left:11px}.scm-view .scm-input .scm-editor .scm-editor-toolbar{padding:1px 3px 1px 1px}.scm-view .scm-input .scm-editor .scm-editor-toolbar.hidden{display:none}.scm-view .scm-input .scm-editor .scm-editor-toolbar.scroll-decoration{box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px inset}.scm-view .scm-input .scm-editor .scm-editor-toolbar .action-label.codicon.codicon-debug-stop{color:var(--vscode-icon-foreground)!important}.scm-view .scm-editor-container .monaco-editor{border-radius:2px}.scm-view .scm-editor-container .monaco-editor .focused .selected-text{background-color:var(--vscode-editor-selectionBackground)}.scm-view .scm-editor{align-items:flex-start;background-color:var(--vscode-input-background);border:1px solid var(--vscode-input-border,transparent);border-radius:2px;box-sizing:border-box;display:flex;width:100%}.scm-view .button-container{align-items:center;display:flex;height:100%;padding-left:11px}.scm-view .button-container .codicon.codicon-cloud-upload,.scm-view .button-container .codicon.codicon-sync{margin:0 4px 0 0}.scm-view .button-container .codicon.codicon-arrow-down,.scm-view .button-container .codicon.codicon-arrow-up{font-size:small!important;margin:0 4px 0 0}.scm-view .button-container>.monaco-button-dropdown{flex-grow:1;overflow:hidden}.scm-view .button-container>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.scm-view .button-container>.monaco-button-dropdown>.monaco-button.monaco-text-button{min-width:0}.scm-view .button-container>.monaco-button-dropdown>.monaco-button.monaco-text-button>span:not(.codicon){overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.scm-view .scm-editor.hidden{display:none}.monaco-workbench .part.panel .scm-view .scm-editor-container{outline:1px solid var(--vscode-panelInput-border)}.monaco-workbench .part.panel .scm-view .scm-editor.synthetic-focus,.scm-view .scm-editor.synthetic-focus{outline:1px solid var(--vscode-focusBorder);outline-offset:-1px}.scm-view .scm-editor.validation-info{outline:1px solid var(--vscode-inputValidation-infoBorder)!important;outline-offset:-1px}.scm-view .scm-editor.validation-warning{outline:1px solid var(--vscode-inputValidation-warningBorder)!important;outline-offset:-1px}.scm-view .scm-editor.validation-error{outline:1px solid var(--vscode-inputValidation-errorBorder)!important;outline-offset:-1px}.scm-editor-validation-container{border-bottom-left-radius:2px;border-bottom-right-radius:2px;border-style:solid;border-width:1px;border-top:none;box-sizing:border-box;display:flex;padding:2px}.scm-editor-validation-container.validation-info{background-color:var(--vscode-inputValidation-infoBackground);border-color:var(--vscode-inputValidation-infoBorder);color:var(--vscode-inputValidation-infoForeground)}.scm-editor-validation-container.validation-warning{background-color:var(--vscode-inputValidation-warningBackground);border-color:var(--vscode-inputValidation-warningBorder);color:var(--vscode-inputValidation-warningForeground)}.scm-editor-validation-container.validation-error{background-color:var(--vscode-inputValidation-errorBackground);border-color:var(--vscode-inputValidation-errorBorder);color:var(--vscode-inputValidation-errorForeground)}.scm-editor-validation{border-style:none;box-sizing:border-box;display:block;flex:auto;font-size:.9em;padding:1px 3px}.scm-editor-validation p{margin:0;padding:0}.scm-editor-validation a{color:var(--vscode-textLink-foreground);-webkit-user-select:none;user-select:none}.scm-editor-validation a:active,.scm-editor-validation a:hover{color:var(--vscode-textLink-activeForeground)}.scm-editor-validation-actions{align-self:start;margin-top:1px}.scm-view .scm-editor-placeholder{box-sizing:border-box;color:var(--vscode-input-placeholderForeground);overflow:hidden;padding:2px 6px;pointer-events:none;position:absolute;text-overflow:ellipsis;white-space:nowrap;z-index:1}.scm-view .scm-editor-placeholder.hidden{display:none}.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor,.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor .margin,.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor .monaco-editor-background,.scm-view .scm-editor-container .monaco-editor,.scm-view .scm-editor-container .monaco-editor .margin,.scm-view .scm-editor-container .monaco-editor-background{background-color:var(--vscode-input-background);color:inherit}.scm-view .scm-editor-container .mtk1{color:var(--vscode-input-foreground)}.scm-repositories-view .scm-provider{margin:0 12px 0 20px;overflow:hidden}.scm-repositories-view .scm-provider>.label>.name{font-weight:400}";
+var css = ".scm-view{height:100%;position:relative}.scm-overflow-widgets-container{height:0;left:0;overflow:visible;position:absolute;top:0;width:0;z-index:5000}.scm-view .monaco-tl-contents>div{overflow:hidden;padding-right:12px}.scm-view .count{display:flex;margin-left:6px}.scm-view .count.hidden{display:none}.scm-view .scm-provider{align-items:center;display:flex;flex-direction:column;flex-flow:nowrap;height:100%}.scm-view.auto-provider-counts .scm-provider>.count[data-count=\"0\"],.scm-view.hide-provider-counts .scm-provider>.count{display:none}.scm-view .scm-provider>.label{flex:1;min-width:50px;overflow:hidden;text-overflow:ellipsis}.scm-view .scm-provider>.label>.name{font-weight:700}.scm-view .scm-provider>.label>.description{font-size:.9em;margin-left:.5em;opacity:.7}.scm-view .scm-provider>.actions{justify-content:flex-end;overflow:hidden}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item{align-items:center;display:flex;padding-left:4px}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item:first-child{min-width:20px}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.action-label,.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.monaco-dropdown>.dropdown-label>.action-label{align-items:center;display:flex;line-height:16px;overflow:hidden}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.action-label>.codicon{font-size:12px;justify-content:center}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item:last-of-type{padding-right:0}.scm-view .scm-provider>.body{flex-grow:1}.scm-view .scm-provider>.status>.monaco-action-bar>.actions-container{border-color:var(--vscode-sideBar-border)}.scm-view .monaco-list-row{line-height:22px}.scm-view .monaco-list-row .history,.scm-view .monaco-list-row .history-item-group,.scm-view .monaco-list-row .resource-group{align-items:center;display:flex;height:100%}.scm-view .monaco-list-row .history-item .monaco-icon-label,.scm-view .monaco-list-row .history-item-group .monaco-icon-label{align-items:center;flex-grow:1}.scm-view .monaco-list-row .history-item{align-items:center;display:flex}.scm-view .monaco-list-row .history-item>.graph-container{display:flex;flex-shrink:0;height:22px}.scm-view .monaco-list-row .history-item>.graph-container>.graph>circle{stroke:var(--vscode-sideBar-background)}.scm-view .monaco-list-row .history-item>.label-container{display:flex;flex-shrink:0;gap:4px;opacity:.75}.scm-view .monaco-list-row .history-item>.label-container>.codicon{border:1px solid var(--vscode-scm-historyItemStatisticsBorder);border-radius:2px;font-size:14px;margin:1px 0;padding:2px}.scm-view .monaco-list-row .history-item .stats-container{border:1px solid var(--vscode-scm-historyItemStatisticsBorder);border-radius:2px;display:flex;font-size:11px;gap:4px;line-height:11px;margin-left:6px;min-height:18px;padding:0 4px}.scm-view .monaco-list-row.focused .history-item .stats-container,.scm-view .monaco-list-row.selected .history-item .stats-container{border:1px solid var(--vscode-scm-historyItemSelectedStatisticsBorder)}.scm-view .monaco-list-row .history-item .stats-container>.deletions-label,.scm-view .monaco-list-row .history-item .stats-container>.files-label,.scm-view .monaco-list-row .history-item .stats-container>.insertions-label{align-items:center;display:flex;opacity:.75}.scm-view .monaco-list-row .history-item .stats-container>.insertions-label{color:var(--vscode-scm-historyItemAdditionsForeground)}.scm-view .monaco-list-row .history-item .stats-container>.deletions-label{color:var(--vscode-scm-historyItemDeletionsForeground)}.scm-view .monaco-list-row .history-item .stats-container.hidden,.scm-view .monaco-list-row .history-item .stats-container>.deletions-label.hidden,.scm-view .monaco-list-row .history-item .stats-container>.insertions-label.hidden{display:none}.scm-view .monaco-list-row .history-item .monaco-icon-label .icon-container,.scm-view .monaco-list-row .history-item-group .monaco-icon-label .icon-container{display:flex;padding-right:4px}.scm-view .monaco-list-row .history-item .monaco-icon-label .avatar{border-radius:14px;height:14px;width:14px}.scm-view .monaco-list-row .separator-container{align-items:center;display:flex;padding-left:11px}.scm-view .monaco-list-row .separator-container .label-name{font-size:10px}.scm-view .monaco-list-row.focused .separator-container .label-name,.scm-view .monaco-list-row.selected .separator-container .label-name{color:var(--vscode-foreground)}.scm-view .monaco-list-row .separator-container .separator{border-top:1px solid var(--vscode-sideBar-border);display:flex;flex-grow:1;height:0;margin-left:6px}.scm-view .monaco-list-row .separator-container .actions{padding-left:6px}.scm-view .monaco-list-row .history-item-group>.name,.scm-view .monaco-list-row .history>.name,.scm-view .monaco-list-row .resource-group>.name{flex:1;overflow:hidden;text-overflow:ellipsis}.scm-view .monaco-list-row .resource{display:flex;height:100%}.scm-view .monaco-list-row .resource.faded{opacity:.7}.scm-view .monaco-list-row .resource>.name{flex:1;overflow:hidden}.scm-view .monaco-list-row .resource>.name>.monaco-icon-label:after{margin-right:3px}.scm-view .monaco-list-row .resource>.decoration-icon{background-position:50% 50%;background-repeat:no-repeat;height:100%;margin-left:5px;width:16px}.scm-view .monaco-list-row .resource>.decoration-icon.codicon{margin-right:0;margin-top:3px}.scm-view .monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions{flex-grow:100}.scm-view .monaco-list .monaco-list-row .history-item-group>.actions,.scm-view .monaco-list .monaco-list-row .history-item>.actions,.scm-view .monaco-list .monaco-list-row .resource-group>.actions,.scm-view .monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row .separator-container>.actions{display:none;max-width:fit-content}.scm-view .monaco-list .monaco-list-row.focused .history-item-group>.actions,.scm-view .monaco-list .monaco-list-row.focused .history-item>.actions,.scm-view .monaco-list .monaco-list-row.focused .resource-group>.actions,.scm-view .monaco-list .monaco-list-row.focused .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row.focused .separator-container>.actions,.scm-view .monaco-list .monaco-list-row:hover .history-item-group>.actions,.scm-view .monaco-list .monaco-list-row:hover .history-item>.actions,.scm-view .monaco-list .monaco-list-row:hover .resource-group>.actions,.scm-view .monaco-list .monaco-list-row:hover .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row:hover .separator-container>.actions,.scm-view .monaco-list:not(.selection-multiple) .monaco-list-row .resource:hover>.actions{display:block}.scm-view .monaco-list .monaco-list-row.focused.force-no-hover,.scm-view .monaco-list .monaco-list-row.force-no-hover,.scm-view .monaco-list .monaco-list-row.selected.force-no-hover,.scm-view .monaco-list .monaco-list-row:hover.force-no-hover{background:transparent!important}.scm-view .monaco-list .monaco-list-row.cursor-default{cursor:default}.scm-view.show-actions .scm-provider>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .history-item-group>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .history-item>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .resource-group>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .scm-input>.scm-editor>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .separator-container>.actions{display:block}.scm-view .monaco-list-row .actions .action-label{padding:2px}.scm-view .scm-input{align-items:center;display:flex;height:100%;padding-left:11px}.scm-view .scm-input .scm-editor .scm-editor-toolbar{padding:1px 3px 1px 1px}.scm-view .scm-input .scm-editor .scm-editor-toolbar.hidden{display:none}.scm-view .scm-input .scm-editor .scm-editor-toolbar.scroll-decoration{box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px inset}.scm-view .scm-input .scm-editor .scm-editor-toolbar .action-label.codicon.codicon-debug-stop{color:var(--vscode-icon-foreground)!important}.scm-view .scm-editor-container .monaco-editor{border-radius:2px}.scm-view .scm-editor{align-items:flex-start;background-color:var(--vscode-input-background);border:1px solid var(--vscode-input-border,transparent);border-radius:2px;box-sizing:border-box;display:flex;width:100%}.scm-view .button-container{align-items:center;display:flex;height:100%;padding-left:11px}.scm-view .button-container .codicon.codicon-cloud-upload,.scm-view .button-container .codicon.codicon-sync{margin:0 4px 0 0}.scm-view .button-container .codicon.codicon-arrow-down,.scm-view .button-container .codicon.codicon-arrow-up{font-size:small!important;margin:0 4px 0 0}.scm-view .button-container>.monaco-button-dropdown{flex-grow:1;overflow:hidden}.scm-view .button-container>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.scm-view .button-container>.monaco-button-dropdown>.monaco-button.monaco-text-button{min-width:0}.scm-view .button-container>.monaco-button-dropdown>.monaco-button.monaco-text-button>span:not(.codicon){overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.scm-view .scm-editor.hidden{display:none}.monaco-workbench .part.panel .scm-view .scm-editor-container{outline:1px solid var(--vscode-panelInput-border)}.monaco-workbench .part.panel .scm-view .scm-editor.synthetic-focus,.scm-view .scm-editor.synthetic-focus{outline:1px solid var(--vscode-focusBorder);outline-offset:-1px}.scm-view .scm-editor.validation-info{outline:1px solid var(--vscode-inputValidation-infoBorder)!important;outline-offset:-1px}.scm-view .scm-editor.validation-warning{outline:1px solid var(--vscode-inputValidation-warningBorder)!important;outline-offset:-1px}.scm-view .scm-editor.validation-error{outline:1px solid var(--vscode-inputValidation-errorBorder)!important;outline-offset:-1px}.scm-editor-validation-container{border-bottom-left-radius:2px;border-bottom-right-radius:2px;border-style:solid;border-width:1px;border-top:none;box-sizing:border-box;display:flex;padding:2px}.scm-editor-validation-container.validation-info{background-color:var(--vscode-inputValidation-infoBackground);border-color:var(--vscode-inputValidation-infoBorder);color:var(--vscode-inputValidation-infoForeground)}.scm-editor-validation-container.validation-warning{background-color:var(--vscode-inputValidation-warningBackground);border-color:var(--vscode-inputValidation-warningBorder);color:var(--vscode-inputValidation-warningForeground)}.scm-editor-validation-container.validation-error{background-color:var(--vscode-inputValidation-errorBackground);border-color:var(--vscode-inputValidation-errorBorder);color:var(--vscode-inputValidation-errorForeground)}.scm-editor-validation{border-style:none;box-sizing:border-box;display:block;flex:auto;font-size:.9em;padding:1px 3px}.scm-editor-validation p{margin:0;padding:0}.scm-editor-validation a{color:var(--vscode-textLink-foreground);-webkit-user-select:none;user-select:none}.scm-editor-validation a:active,.scm-editor-validation a:hover{color:var(--vscode-textLink-activeForeground)}.scm-editor-validation-actions{align-self:start;margin-top:1px}.scm-view .scm-editor-placeholder{box-sizing:border-box;color:var(--vscode-input-placeholderForeground);overflow:hidden;padding:2px 6px;pointer-events:none;position:absolute;text-overflow:ellipsis;white-space:nowrap;z-index:1}.scm-view .scm-editor-placeholder.hidden{display:none}.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor,.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor .margin,.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor .monaco-editor-background,.scm-view .scm-editor-container .monaco-editor,.scm-view .scm-editor-container .monaco-editor .margin,.scm-view .scm-editor-container .monaco-editor-background{background-color:var(--vscode-input-background);color:inherit}.scm-view .scm-editor-container .mtk1{color:var(--vscode-input-foreground)}.scm-repositories-view .scm-provider{margin:0 12px 0 20px;overflow:hidden}.scm-repositories-view .scm-provider>.label>.name{font-weight:400}";
 n(css,{});
 
 export { css, css as default };

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

@@ -226,7 +226,7 @@ let SCMHistoryProviderMenus = class SCMHistoryProviderMenus {
     }
     getOutgoingHistoryItemGroupMenu(menuId, historyItemGroup) {
         const contextKeyService = this.contextKeyService.createOverlay([
-            ['scmHistoryItemGroupHasUpstream', !!historyItemGroup.repository.provider.historyProvider?.currentHistoryItemGroup?.base],
+            ['scmHistoryItemGroupHasRemote', !!historyItemGroup.repository.provider.historyProvider?.currentHistoryItemGroup?.remote],
         ]);
         return this.menuService.createMenu(menuId, contextKeyService);
     }

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

@@ -6,7 +6,7 @@ import { VIEWLET_ID, VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID } from 'vscode/vsco
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { SCMActiveResourceContextKeyController, SCMActiveRepositoryContextKeyController, SCMStatusController } from './activity.js';
+import { SCMActiveRepositoryController, SCMActiveResourceContextKeyController } from './activity.js';
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Extensions as Extensions$2, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -115,11 +115,9 @@ viewsRegistry.registerViews([{
         containerIcon: sourceControlViewIcon
     }], viewContainer);
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(SCMActiveResourceContextKeyController, LifecyclePhase.Restored);
-( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(SCMActiveRepositoryContextKeyController, LifecyclePhase.Restored);
+    .registerWorkbenchContribution(SCMActiveRepositoryController, LifecyclePhase.Restored);
 ( (Registry.as(Extensions.Workbench)))
-    .registerWorkbenchContribution(SCMStatusController, LifecyclePhase.Restored);
+    .registerWorkbenchContribution(SCMActiveResourceContextKeyController, LifecyclePhase.Restored);
 registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetController, WorkbenchPhase.AfterRestored);
 ( (Registry.as(Extensions$2.Configuration))).registerConfiguration({
     id: 'scm',
@@ -483,12 +481,21 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
                 "Controls the default working set to use when switching to a source control history item group that does not have a working set."
             )),
             default: 'current'
+        },
+        'scm.experimental.showHistoryGraph': {
+            type: 'boolean',
+            description: ( localizeWithPath(
+                _moduleId,
+                70,
+                "Controls whether to show the history graph instead of incoming/outgoing changes in the Source Control view."
+            )),
+            default: false
         }
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'scm.acceptInput',
-    metadata: { description: ( localizeWithPath(_moduleId, 70, "Source Control: Accept Input")), args: [] },
+    metadata: { description: ( localizeWithPath(_moduleId, 71, "Source Control: Accept Input")), args: [] },
     weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.has('scmRepository'))),
     primary: KeyMod.CtrlCmd | KeyCode.Enter,
@@ -510,8 +517,25 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         return commandService.executeCommand(id, ...(args || []));
     }
 });
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'scm.clearInput',
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( (ContextKeyExpr.and(
+         (ContextKeyExpr.has('scmRepository')),
+         (Context.Visible.toNegated())
+    ))),
+    primary: KeyCode.Escape,
+    handler: async (accessor) => {
+        const scmService = accessor.get(ISCMService);
+        const contextKeyService = accessor.get(IContextKeyService);
+        const context = contextKeyService.getContext(getActiveElement());
+        const repositoryId = context.getValue('scmRepository');
+        const repository = repositoryId ? scmService.getRepository(repositoryId) : undefined;
+        repository?.input.setValue('', true);
+    }
+});
 const viewNextCommitCommand = {
-    description: { description: ( localizeWithPath(_moduleId, 71, "Source Control: View Next Commit")), args: [] },
+    description: { description: ( localizeWithPath(_moduleId, 72, "Source Control: View Next Commit")), args: [] },
     weight: KeybindingWeight.WorkbenchContrib,
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
@@ -523,7 +547,7 @@ const viewNextCommitCommand = {
     }
 };
 const viewPreviousCommitCommand = {
-    description: { description: ( localizeWithPath(_moduleId, 72, "Source Control: View Previous Commit")), args: [] },
+    description: { description: ( localizeWithPath(_moduleId, 73, "Source Control: View Previous Commit")), args: [] },
     weight: KeybindingWeight.WorkbenchContrib,
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
@@ -584,7 +608,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
     group: '100_end',
     command: {
         id: 'scm.openInTerminal',
-        title: ( localizeWithPath(_moduleId, 73, "Open in External Terminal"))
+        title: ( localizeWithPath(_moduleId, 74, "Open in External Terminal"))
     },
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('scmProviderHasRootUri', true)),
@@ -598,7 +622,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
     group: '100_end',
     command: {
         id: 'scm.openInIntegratedTerminal',
-        title: ( localizeWithPath(_moduleId, 74, "Open in Integrated Terminal"))
+        title: ( localizeWithPath(_moduleId, 75, "Open in Integrated Terminal"))
     },
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('scmProviderHasRootUri', true)),