@codingame/monaco-vscode-scm-service-override 2.2.1 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.0.0",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }

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

@@ -5,7 +5,7 @@ import { Disposable, MutableDisposable, DisposableStore, combinedDisposable, dis
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { VIEW_PANE_ID, ISCMService, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { NumberBadge, IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { RawContextKey, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
@@ -13,6 +13,7 @@ import { EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 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';
 
 function getCount(repository) {
     if (typeof repository.provider.count === 'number') {
@@ -186,6 +187,63 @@ SCMStatusController = ( __decorate([
     ( __param(5, IConfigurationService)),
     ( __param(6, IUriIdentityService))
 ], SCMStatusController));
+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?.label ?? '');
+    }
+    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(contextKeyService, editorService, scmService, uriIdentityService) {
         this.editorService = editorService;
@@ -247,4 +305,4 @@ SCMActiveResourceContextKeyController = ( __decorate([
     ( __param(3, IUriIdentityService))
 ], SCMActiveResourceContextKeyController));
 
-export { SCMActiveResourceContextKeyController, SCMStatusController };
+export { SCMActiveRepositoryContextKeyController, SCMActiveResourceContextKeyController, SCMStatusController };

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

@@ -1,6 +1,6 @@
 import n from '../../../../../../../../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 .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-right:8px;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{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.selected .history-item-group>.actions,.scm-view .monaco-list .monaco-list-row.selected .history-item>.actions,.scm-view .monaco-list .monaco-list-row.selected .resource-group>.actions,.scm-view .monaco-list .monaco-list-row.selected .resource>.name>.monaco-icon-label>.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: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{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 .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-right:8px;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}";
 n(css,{});
 
 export { css, css as default };

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

@@ -181,21 +181,25 @@ SCMRepositoryMenus = ( __decorate([
     ( __param(3, IMenuService))
 ], SCMRepositoryMenus));
 let SCMHistoryProviderMenus = class SCMHistoryProviderMenus {
-    get incomingHistoryItemGroupMenu() { return this._incomingHistoryItemGroupMenu; }
-    get outgoingHistoryItemGroupMenu() { return this._outgoingHistoryItemGroupMenu; }
     constructor(contextKeyService, menuService) {
         this.contextKeyService = contextKeyService;
         this.menuService = menuService;
         this.historyItemMenus = ( new Map());
         this.disposables = ( new DisposableStore());
-        this._incomingHistoryItemGroupMenu = this.menuService.createMenu(MenuId.SCMIncomingChanges, this.contextKeyService);
-        this.disposables.add(this._incomingHistoryItemGroupMenu);
-        this._outgoingHistoryItemGroupMenu = this.menuService.createMenu(MenuId.SCMOutgoingChanges, this.contextKeyService);
-        this.disposables.add(this._outgoingHistoryItemGroupMenu);
     }
     getHistoryItemMenu(historyItem) {
         return this.getOrCreateHistoryItemMenu(historyItem);
     }
+    getHistoryItemGroupMenu(historyItemGroup) {
+        return historyItemGroup.direction === 'incoming' ?
+            this.menuService.createMenu(MenuId.SCMIncomingChanges, this.contextKeyService) :
+            this.getOutgoingHistoryItemGroupMenu(MenuId.SCMOutgoingChanges, historyItemGroup);
+    }
+    getHistoryItemGroupContextMenu(historyItemGroup) {
+        return historyItemGroup.direction === 'incoming' ?
+            this.menuService.createMenu(MenuId.SCMIncomingChangesContext, this.contextKeyService) :
+            this.getOutgoingHistoryItemGroupMenu(MenuId.SCMOutgoingChangesContext, historyItemGroup);
+    }
     getOrCreateHistoryItemMenu(historyItem) {
         let result = this.historyItemMenus.get(historyItem);
         if (!result) {
@@ -218,6 +222,12 @@ let SCMHistoryProviderMenus = class SCMHistoryProviderMenus {
         }
         return result;
     }
+    getOutgoingHistoryItemGroupMenu(menuId, historyItemGroup) {
+        const contextKeyService = this.contextKeyService.createOverlay([
+            ['scmHistoryItemGroupHasUpstream', !!historyItemGroup.repository.provider.historyProvider?.currentHistoryItemGroup?.base],
+        ]);
+        return this.menuService.createMenu(menuId, contextKeyService);
+    }
     dispose() {
         this.disposables.dispose();
     }

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

@@ -4,7 +4,7 @@ import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { DirtyDiffWorkbenchController } from 'vscode/vscode/vs/workbench/contrib/scm/browser/dirtydiffDecorator';
 import { VIEWLET_ID, VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID, ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { SCMActiveResourceContextKeyController, SCMStatusController } from './activity.js';
+import { SCMActiveResourceContextKeyController, SCMActiveRepositoryContextKeyController, SCMStatusController } from './activity.js';
 import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { ICommandService, CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
@@ -120,6 +120,8 @@ viewsRegistry.registerViews([{
     }], viewContainer);
 ( Registry.as(Extensions.Workbench))
     .registerWorkbenchContribution(SCMActiveResourceContextKeyController, 3 );
+( Registry.as(Extensions.Workbench))
+    .registerWorkbenchContribution(SCMActiveRepositoryContextKeyController, 3 );
 ( Registry.as(Extensions.Workbench))
     .registerWorkbenchContribution(SCMStatusController, 3 );
 ( Registry.as(Extensions$2.Configuration)).registerConfiguration({

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

@@ -32,7 +32,7 @@ class ListDelegate {
 }
 let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
     constructor(options, scmViewService, keybindingService, contextMenuService, instantiationService, viewDescriptorService, contextKeyService, configurationService, openerService, themeService, telemetryService) {
-        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+        super({ ...options, titleMenuId: MenuId.SCMSourceControlTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
         this.scmViewService = scmViewService;
         this.disposables = ( new DisposableStore());
     }

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

@@ -5,7 +5,7 @@ import { basename, dirname } from 'vscode/vscode/vs/base/common/resources';
 import { Disposable, DisposableStore, toDisposable, combinedDisposable, MutableDisposable, DisposableMap, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ViewAction, ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { append, $, asCSSUrl, prepend, Dimension, trackFocus, clearNode } from 'vscode/vscode/vs/base/browser/dom';
-import { VIEW_PANE_ID, SCMInputChangeReason, ISCMViewService, ISCMService, REPOSITORIES_VIEW_PANE_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
+import { VIEW_PANE_ID, SCMInputChangeReason, ISCMViewService, ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
 import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
@@ -14,7 +14,7 @@ import { IContextMenuService, IContextViewService } from 'vscode/vscode/vs/platf
 import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
-import { MenuId, MenuRegistry, registerAction2, MenuItemAction, IMenuService, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { MenuId, MenuRegistry, registerAction2, Action2, MenuItemAction, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { Action, Separator, ActionRunner } from 'vscode/vscode/vs/base/common/actions';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
@@ -40,6 +40,7 @@ import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { MenuPreventer } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/menuPreventer';
 import { SelectionClipboardContributionID } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/selectionClipboard';
+import { EditorDictation } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation';
 import { ContextMenuController } from 'vscode/vscode/vs/editor/contrib/contextmenu/browser/contextmenu';
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { format, compare } from 'vscode/vscode/vs/base/common/strings';
@@ -81,12 +82,13 @@ import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation
 import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
 import { IconLabel } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabel';
 import { registerColor, transparent, foreground, listActiveSelectionForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
-import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
+import { WorkbenchToolBar, MenuWorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { DropdownWithPrimaryActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
 import { clamp } from 'vscode/vscode/vs/base/common/numbers';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 
-var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1, HistoryItemGroupRenderer_1, HistoryItemRenderer_1, HistoryItemChangeRenderer_1, SCMInputWidget_1;
+var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1, HistoryItemGroupRenderer_1, HistoryItemRenderer_1, HistoryItemChangeRenderer_1, SeparatorRenderer_1, SCMInputWidget_1;
 registerColor('scm.historyItemAdditionsForeground', {
     dark: 'gitDecoration.addedResourceForeground',
     light: 'gitDecoration.addedResourceForeground',
@@ -647,10 +649,10 @@ let HistoryItemGroupRenderer = class HistoryItemGroupRenderer {
         const repositoryMenus = this.scmViewService.menus.getRepositoryMenus(historyItemGroup.repository.provider);
         const historyProviderMenu = repositoryMenus.historyProviderMenu;
         if (historyProviderMenu) {
-            const menuId = historyItemGroup.direction === 'incoming' ? MenuId.SCMIncomingChanges : MenuId.SCMOutgoingChanges;
-            const menu = historyItemGroup.direction === 'incoming' ? historyProviderMenu.incomingHistoryItemGroupMenu : historyProviderMenu.outgoingHistoryItemGroupMenu;
+            const menu = historyProviderMenu.getHistoryItemGroupMenu(historyItemGroup);
+            const resetMenuId = historyItemGroup.direction === 'incoming' ? MenuId.SCMIncomingChanges : MenuId.SCMOutgoingChanges;
             templateData.elementDisposables.add(connectPrimaryMenu(menu, (primary, secondary) => {
-                templateData.toolBar.setActions(primary, secondary, [menuId]);
+                templateData.toolBar.setActions(primary, secondary, [resetMenuId]);
             }));
             templateData.toolBar.context = historyItemGroup;
         }
@@ -851,16 +853,37 @@ let HistoryItemChangeRenderer = class HistoryItemChangeRenderer {
 HistoryItemChangeRenderer = HistoryItemChangeRenderer_1 = ( __decorate([
     ( __param(2, ILabelService))
 ], HistoryItemChangeRenderer));
-class SeparatorRenderer {
+let SeparatorRenderer = class SeparatorRenderer {
+    static { SeparatorRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'separator'; }
-    get templateId() { return SeparatorRenderer.TEMPLATE_ID; }
+    get templateId() { return SeparatorRenderer_1.TEMPLATE_ID; }
+    constructor(contextKeyService, contextMenuService, keybindingService, menuService, telemetryService) {
+        this.contextKeyService = contextKeyService;
+        this.contextMenuService = contextMenuService;
+        this.keybindingService = keybindingService;
+        this.menuService = menuService;
+        this.telemetryService = telemetryService;
+    }
     renderTemplate(container) {
         container.parentElement.parentElement.querySelector('.monaco-tl-twistie').classList.add('force-no-twistie');
         container.parentElement.parentElement.classList.add('cursor-default', 'force-no-hover');
+        const disposables = ( new DisposableStore());
         const element = append(container, $('.separator-container'));
         const label = ( new IconLabel(element, { supportIcons: true, }));
         append(element, $('.separator'));
-        return { label, disposables: ( new DisposableStore()) };
+        disposables.add(label);
+        const toolBar = ( new MenuWorkbenchToolBar(
+            append(element, $('.actions')),
+            MenuId.SCMChangesSeparator,
+            { moreIcon: Codicon.gear },
+            this.menuService,
+            this.contextKeyService,
+            this.contextMenuService,
+            this.keybindingService,
+            this.telemetryService
+        ));
+        disposables.add(toolBar);
+        return { label, disposables };
     }
     renderElement(element, index, templateData, height) {
         templateData.label.setLabel(element.element.label, undefined, { title: element.element.ariaLabel });
@@ -869,9 +892,16 @@ class SeparatorRenderer {
         throw new Error('Should never happen since node is incompressible');
     }
     disposeTemplate(templateData) {
-        throw new Error('Method not implemented.');
+        templateData.disposables.dispose();
     }
-}
+};
+SeparatorRenderer = SeparatorRenderer_1 = ( __decorate([
+    ( __param(0, IContextKeyService)),
+    ( __param(1, IContextMenuService)),
+    ( __param(2, IKeybindingService)),
+    ( __param(3, IMenuService)),
+    ( __param(4, ITelemetryService))
+], SeparatorRenderer));
 class ListDelegate {
     constructor(inputRenderer) {
         this.inputRenderer = inputRenderer;
@@ -1188,6 +1218,7 @@ SCMAccessibilityProvider = ( __decorate([
 const Menus = {
     ViewSort: ( new MenuId('SCMViewSort')),
     Repositories: ( new MenuId('SCMRepositories')),
+    ChangesSettings: ( new MenuId('SCMChangesSettings')),
 };
 const ContextKeys = {
     SCMViewMode: ( new RawContextKey('scmViewMode', "list" )),
@@ -1211,7 +1242,19 @@ MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
     )),
     submenu: Menus.ViewSort,
     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_PANE_ID)), ( ContextKeys.RepositoryCount.notEqualsTo(0)))),
-    group: '0_view&sort'
+    group: '0_view&sort',
+    order: 1
+});
+MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
+    title: ( localizeWithPath(
+        'vs/workbench/contrib/scm/browser/scmViewPane',
+        'scmChanges',
+        "Incoming & Outgoing"
+    )),
+    submenu: Menus.ChangesSettings,
+    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_PANE_ID)), ( ContextKeys.RepositoryCount.notEqualsTo(0)))),
+    group: '0_view&sort',
+    order: 2
 });
 MenuRegistry.appendMenuItem(Menus.ViewSort, {
     title: ( localizeWithPath(
@@ -1220,8 +1263,151 @@ MenuRegistry.appendMenuItem(Menus.ViewSort, {
         "Repositories"
     )),
     submenu: Menus.Repositories,
+    when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
     group: '0_repositories'
 });
+class SCMChangesSettingAction extends Action2 {
+    constructor(settingKey, settingValue, desc) {
+        super({
+            ...desc,
+            f1: false,
+            toggled: ( ContextKeyExpr.equals(`config.${settingKey}`, settingValue)),
+        });
+        this.settingKey = settingKey;
+        this.settingValue = settingValue;
+    }
+    run(accessor) {
+        const configurationService = accessor.get(IConfigurationService);
+        configurationService.updateValue(this.settingKey, this.settingValue);
+    }
+}
+MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
+    title: ( localizeWithPath(
+        'vs/workbench/contrib/scm/browser/scmViewPane',
+        'incomingChanges',
+        "Show Incoming Changes"
+    )),
+    submenu: MenuId.SCMIncomingChangesSetting,
+    group: '1_incoming&outgoing',
+    order: 1
+});
+MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
+    title: ( localizeWithPath(
+        'vs/workbench/contrib/scm/browser/scmViewPane',
+        'incomingChanges',
+        "Show Incoming Changes"
+    )),
+    submenu: MenuId.SCMIncomingChangesSetting,
+    group: '1_incoming&outgoing',
+    order: 1
+});
+registerAction2(class extends SCMChangesSettingAction {
+    constructor() {
+        super('scm.showIncomingChanges', 'always', {
+            id: 'workbench.scm.action.showIncomingChanges.always',
+            title: ( localizeWithPath('vs/workbench/contrib/scm/browser/scmViewPane', 'always', "Always")),
+            menu: { id: MenuId.SCMIncomingChangesSetting },
+        });
+    }
+});
+registerAction2(class extends SCMChangesSettingAction {
+    constructor() {
+        super('scm.showIncomingChanges', 'auto', {
+            id: 'workbench.scm.action.showIncomingChanges.auto',
+            title: ( localizeWithPath('vs/workbench/contrib/scm/browser/scmViewPane', 'auto', "Auto")),
+            menu: {
+                id: MenuId.SCMIncomingChangesSetting,
+            }
+        });
+    }
+});
+registerAction2(class extends SCMChangesSettingAction {
+    constructor() {
+        super('scm.showIncomingChanges', 'never', {
+            id: 'workbench.scm.action.showIncomingChanges.never',
+            title: ( localizeWithPath('vs/workbench/contrib/scm/browser/scmViewPane', 'never', "Never")),
+            menu: {
+                id: MenuId.SCMIncomingChangesSetting,
+            }
+        });
+    }
+});
+MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
+    title: ( localizeWithPath(
+        'vs/workbench/contrib/scm/browser/scmViewPane',
+        'outgoingChanges',
+        "Show Outgoing Changes"
+    )),
+    submenu: MenuId.SCMOutgoingChangesSetting,
+    group: '1_incoming&outgoing',
+    order: 2
+});
+MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
+    title: ( localizeWithPath(
+        'vs/workbench/contrib/scm/browser/scmViewPane',
+        'outgoingChanges',
+        "Show Outgoing Changes"
+    )),
+    submenu: MenuId.SCMOutgoingChangesSetting,
+    group: '1_incoming&outgoing',
+    order: 2
+});
+registerAction2(class extends SCMChangesSettingAction {
+    constructor() {
+        super('scm.showOutgoingChanges', 'always', {
+            id: 'workbench.scm.action.showOutgoingChanges.always',
+            title: ( localizeWithPath('vs/workbench/contrib/scm/browser/scmViewPane', 'always', "Always")),
+            menu: {
+                id: MenuId.SCMOutgoingChangesSetting,
+            }
+        });
+    }
+});
+registerAction2(class extends SCMChangesSettingAction {
+    constructor() {
+        super('scm.showOutgoingChanges', 'auto', {
+            id: 'workbench.scm.action.showOutgoingChanges.auto',
+            title: ( localizeWithPath('vs/workbench/contrib/scm/browser/scmViewPane', 'auto', "Auto")),
+            menu: {
+                id: MenuId.SCMOutgoingChangesSetting,
+            }
+        });
+    }
+});
+registerAction2(class extends SCMChangesSettingAction {
+    constructor() {
+        super('scm.showOutgoingChanges', 'never', {
+            id: 'workbench.scm.action.showOutgoingChanges.never',
+            title: ( localizeWithPath('vs/workbench/contrib/scm/browser/scmViewPane', 'never', "Never")),
+            menu: {
+                id: MenuId.SCMOutgoingChangesSetting,
+            }
+        });
+    }
+});
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'workbench.scm.action.scm.showChangesSummary',
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/scm/browser/scmViewPane',
+                'showChangesSummary',
+                "Show Changes Summary"
+            )),
+            f1: false,
+            toggled: ( ContextKeyExpr.equals('config.scm.showChangesSummary', true)),
+            menu: [
+                { id: MenuId.SCMChangesSeparator, order: 3 },
+                { id: Menus.ChangesSettings, order: 3 },
+            ]
+        });
+    }
+    run(accessor) {
+        const configurationService = accessor.get(IConfigurationService);
+        const configValue = configurationService.getValue('scm.showChangesSummary') === true;
+        configurationService.updateValue('scm.showChangesSummary', !configValue);
+    }
+});
 class RepositoryVisibilityAction extends Action2 {
     constructor(repository) {
         super({
@@ -1381,8 +1567,7 @@ class RepositorySortAction extends ViewAction {
                     group: '1_sort'
                 },
                 {
-                    id: MenuId.ViewTitle,
-                    when: ( ContextKeyExpr.equals('view', REPOSITORIES_VIEW_PANE_ID)),
+                    id: MenuId.SCMSourceControlTitle,
                     group: '1_sort',
                 },
             ]
@@ -1893,7 +2078,8 @@ let SCMInputWidget = class SCMInputWidget {
                 SuggestController.ID,
                 InlineCompletionsController.ID,
                 CodeActionController.ID,
-                FormatOnType.ID
+                FormatOnType.ID,
+                EditorDictation.ID
             ])
         };
         const services = ( new ServiceCollection([IContextKeyService, this.contextKeyService]));
@@ -1931,11 +2117,11 @@ let SCMInputWidget = class SCMInputWidget {
         Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.showInputActionButton'))(() => this.layout(), this, this.disposables);
         this.onDidChangeContentHeight = Event.signal(Event.filter(this.inputEditor.onDidContentSizeChange, e => e.contentHeightChanged, this.disposables));
         this.toolbar = instantiationService2.createInstance(SCMInputWidgetToolbar, this.toolbarContainer, {
-            actionViewItemProvider: action => {
+            actionViewItemProvider: (action, options) => {
                 if (action instanceof MenuItemAction && this.toolbar.dropdownActions.length > 1) {
-                    return instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, this.toolbar.dropdownAction, this.toolbar.dropdownActions, '', this.contextMenuService, { actionRunner: this.toolbar.actionRunner });
+                    return instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, this.toolbar.dropdownAction, this.toolbar.dropdownActions, '', this.contextMenuService, { actionRunner: this.toolbar.actionRunner, hoverDelegate: options.hoverDelegate });
                 }
-                return createActionViewItem(instantiationService, action);
+                return createActionViewItem(instantiationService, action, options);
             },
             menuOptions: {
                 shouldForwardArgs: true
@@ -1945,8 +2131,8 @@ let SCMInputWidget = class SCMInputWidget {
         this.disposables.add(this.toolbar);
     }
     getContentHeight() {
-        const lineHeight = this.inputEditor.getOption(66 );
-        const { top, bottom } = this.inputEditor.getOption(83 );
+        const lineHeight = this.inputEditor.getOption(67 );
+        const { top, bottom } = this.inputEditor.getOption(84 );
         const inputMinLinesConfig = this.configurationService.getValue('scm.inputMinLineCount');
         const inputMinLines = typeof inputMinLinesConfig === 'number' ? clamp(inputMinLinesConfig, 1, 50) : 1;
         const editorMinHeight = inputMinLines * lineHeight + top + bottom;
@@ -2125,10 +2311,11 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             this.storageService.store(`scm.viewSortKey`, sortKey, 1 , 0 );
         }
     }
-    constructor(options, commandService, editorService, menuService, scmService, scmViewService, storageService, uriIdentityService, keybindingService, themeService, contextMenuService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, telemetryService) {
+    constructor(options, commandService, editorService, logService, menuService, scmService, scmViewService, storageService, uriIdentityService, keybindingService, themeService, contextMenuService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, telemetryService) {
         super({ ...options, titleMenuId: MenuId.SCMTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
         this.commandService = commandService;
         this.editorService = editorService;
+        this.logService = logService;
         this.menuService = menuService;
         this.scmService = scmService;
         this.scmViewService = scmViewService;
@@ -2418,9 +2605,17 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             repositoryDisposables.add(repository.provider.onDidChange(() => this.updateChildren(repository)));
             repositoryDisposables.add(repository.input.onDidChangeVisibility(() => this.updateChildren(repository)));
             repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(() => this.updateChildren(repository)));
-            if (repository.provider.historyProvider) {
-                repositoryDisposables.add(repository.provider.historyProvider.onDidChangeCurrentHistoryItemGroup(() => this.updateChildren(repository)));
-            }
+            repositoryDisposables.add(Event.runAndSubscribe(repository.provider.onDidChangeHistoryProvider, () => {
+                if (!repository.provider.historyProvider) {
+                    this.logService.debug('SCMViewPane:onDidChangeVisibleRepositories - no history provider present');
+                    return;
+                }
+                repositoryDisposables.add(repository.provider.historyProvider.onDidChangeCurrentHistoryItemGroup(() => {
+                    this.updateChildren(repository);
+                    this.logService.debug('SCMViewPane:onDidChangeCurrentHistoryItemGroup - update children');
+                }));
+                this.logService.debug('SCMViewPane:onDidChangeVisibleRepositories - onDidChangeCurrentHistoryItemGroup listener added');
+            }));
             const resourceGroupDisposables = repositoryDisposables.add(( new DisposableMap()));
             const onDidChangeResourceGroups = () => {
                 for (const [resourceGroup] of resourceGroupDisposables) {
@@ -2463,10 +2658,12 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         const element = e.element;
         let context = element;
         let actions = [];
+        let actionRunner = ( new RepositoryPaneActionRunner(() => this.getSelectedResources()));
         if (isSCMRepository(element)) {
             const menus = this.scmViewService.menus.getRepositoryMenus(element.provider);
             const menu = menus.repositoryContextMenu;
             context = element.provider;
+            actionRunner = ( new RepositoryActionRunner(() => this.getSelectedRepositories()));
             actions = collectContextMenuActions(menu);
         }
         else if (isSCMInput(element) || isSCMActionButton(element)) ;
@@ -2492,9 +2689,22 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
                 actions = collectContextMenuActions(menu);
             }
         }
-        const actionRunner = isSCMRepository(element) ?
-            ( new RepositoryActionRunner(() => this.getSelectedRepositories())) :
-            ( new RepositoryPaneActionRunner(() => this.getSelectedResources()));
+        else if (isSCMHistoryItemGroupTreeElement(element)) {
+            const menus = this.scmViewService.menus.getRepositoryMenus(element.repository.provider);
+            const menu = menus.historyProviderMenu?.getHistoryItemGroupContextMenu(element);
+            if (menu) {
+                actionRunner = ( new HistoryItemGroupActionRunner());
+                createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, actions);
+            }
+        }
+        else if (isSCMHistoryItemTreeElement(element)) {
+            const menus = this.scmViewService.menus.getRepositoryMenus(element.historyItemGroup.repository.provider);
+            const menu = menus.historyProviderMenu?.getHistoryItemMenu(element);
+            if (menu) {
+                actionRunner = ( new HistoryItemActionRunner());
+                actions = collectContextMenuActions(menu);
+            }
+        }
         actionRunner.onWillRun(() => this.tree.domFocus());
         this.contextMenuService.showContextMenu({
             getAnchor: () => e.anchor,
@@ -2653,25 +2863,27 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
 SCMViewPane = ( __decorate([
     ( __param(1, ICommandService)),
     ( __param(2, IEditorService)),
-    ( __param(3, IMenuService)),
-    ( __param(4, ISCMService)),
-    ( __param(5, ISCMViewService)),
-    ( __param(6, IStorageService)),
-    ( __param(7, IUriIdentityService)),
-    ( __param(8, IKeybindingService)),
-    ( __param(9, IThemeService)),
-    ( __param(10, IContextMenuService)),
-    ( __param(11, IInstantiationService)),
-    ( __param(12, IViewDescriptorService)),
-    ( __param(13, IConfigurationService)),
-    ( __param(14, IContextKeyService)),
-    ( __param(15, IOpenerService)),
-    ( __param(16, ITelemetryService))
+    ( __param(3, ILogService)),
+    ( __param(4, IMenuService)),
+    ( __param(5, ISCMService)),
+    ( __param(6, ISCMViewService)),
+    ( __param(7, IStorageService)),
+    ( __param(8, IUriIdentityService)),
+    ( __param(9, IKeybindingService)),
+    ( __param(10, IThemeService)),
+    ( __param(11, IContextMenuService)),
+    ( __param(12, IInstantiationService)),
+    ( __param(13, IViewDescriptorService)),
+    ( __param(14, IConfigurationService)),
+    ( __param(15, IContextKeyService)),
+    ( __param(16, IOpenerService)),
+    ( __param(17, ITelemetryService))
 ], SCMViewPane));
 let SCMTreeDataSource = class SCMTreeDataSource {
-    constructor(viewMode, configurationService, scmViewService, uriIdentityService) {
+    constructor(viewMode, configurationService, logService, scmViewService, uriIdentityService) {
         this.viewMode = viewMode;
         this.configurationService = configurationService;
+        this.logService = logService;
         this.scmViewService = scmViewService;
         this.uriIdentityService = uriIdentityService;
         this.historyProviderCache = ( new Map());
@@ -2827,7 +3039,7 @@ let SCMTreeDataSource = class SCMTreeDataSource {
         const historyProviderCacheEntry = this.getHistoryProviderCacheEntry(element);
         let incomingHistoryItemGroup = historyProviderCacheEntry?.incomingHistoryItemGroup;
         let outgoingHistoryItemGroup = historyProviderCacheEntry?.outgoingHistoryItemGroup;
-        if (!incomingHistoryItemGroup || !outgoingHistoryItemGroup) {
+        if (!incomingHistoryItemGroup && !outgoingHistoryItemGroup) {
             const ancestor = await historyProvider.resolveHistoryItemGroupCommonAncestor(currentHistoryItemGroup.id, currentHistoryItemGroup.base?.id);
             if (!ancestor) {
                 return [];
@@ -3009,9 +3221,17 @@ let SCMTreeDataSource = class SCMTreeDataSource {
     onDidChangeVisibleRepositories({ added, removed }) {
         for (const repository of added) {
             const repositoryDisposables = ( new DisposableStore());
-            if (repository.provider.historyProvider) {
-                repositoryDisposables.add(repository.provider.historyProvider.onDidChangeCurrentHistoryItemGroup(() => this.historyProviderCache.delete(repository)));
-            }
+            repositoryDisposables.add(Event.runAndSubscribe(repository.provider.onDidChangeHistoryProvider, () => {
+                if (!repository.provider.historyProvider) {
+                    this.logService.debug('SCMTreeDataSource:onDidChangeVisibleRepositories - no history provider present');
+                    return;
+                }
+                repositoryDisposables.add(repository.provider.historyProvider.onDidChangeCurrentHistoryItemGroup(() => {
+                    this.historyProviderCache.delete(repository);
+                    this.logService.debug('SCMTreeDataSource:onDidChangeCurrentHistoryItemGroup - cache cleared');
+                }));
+                this.logService.debug('SCMTreeDataSource:onDidChangeVisibleRepositories - onDidChangeCurrentHistoryItemGroup listener added');
+            }));
             this.repositoryDisposables.set(repository, repositoryDisposables);
         }
         for (const repository of removed) {
@@ -3034,8 +3254,9 @@ let SCMTreeDataSource = class SCMTreeDataSource {
 };
 SCMTreeDataSource = ( __decorate([
     ( __param(1, IConfigurationService)),
-    ( __param(2, ISCMViewService)),
-    ( __param(3, IUriIdentityService))
+    ( __param(2, ILogService)),
+    ( __param(3, ISCMViewService)),
+    ( __param(4, IUriIdentityService))
 ], SCMTreeDataSource));
 class SCMActionButton {
     constructor(container, contextMenuService, commandService, notificationService) {

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

@@ -100,8 +100,8 @@ class StatusBarAction extends Action {
     }
 }
 class StatusBarActionViewItem extends ActionViewItem {
-    constructor(action) {
-        super(null, action, {});
+    constructor(action, options) {
+        super(null, action, { ...options, icon: false, label: true });
     }
     updateLabel() {
         if (this.options.label && this.label) {
@@ -110,11 +110,11 @@ class StatusBarActionViewItem extends ActionViewItem {
     }
 }
 function getActionViewItemProvider(instaService) {
-    return action => {
+    return (action, options) => {
         if (action instanceof StatusBarAction) {
-            return ( new StatusBarActionViewItem(action));
+            return ( new StatusBarActionViewItem(action, options));
         }
-        return createActionViewItem(instaService, action);
+        return createActionViewItem(instaService, action, options);
     };
 }