@codingame/monaco-vscode-scm-service-override 4.5.2 → 5.0.1

package/package.json

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

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

@@ -225,7 +225,7 @@ let SCMActiveRepositoryContextKeyController = class SCMActiveRepositoryContextKe
     }
     updateContextKeys(repository) {
         this.activeRepositoryNameContextKey.set(repository?.provider.name ?? '');
-        this.activeRepositoryBranchNameContextKey.set(repository?.provider.historyProvider?.currentHistoryItemGroup?.label ?? '');
+        this.activeRepositoryBranchNameContextKey.set(repository?.provider.historyProvider?.currentHistoryItemGroup?.name ?? '');
     }
     dispose() {
         this.focusDisposable.dispose();

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-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}";
+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}";
 n(css,{});
 
 export { css, css as default };

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

@@ -1,6 +1,6 @@
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2 } 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 } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
@@ -27,6 +27,7 @@ import { WorkspaceTrustContext, MANAGE_TRUST_COMMAND_ID } from 'vscode/vscode/vs
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import '../common/quickDiffService.js';
 import { getActiveElement } from 'vscode/vscode/vs/base/browser/dom';
+import { SCMWorkingSetController } from './workingSet.js';
 
 const _moduleId = "vs/workbench/contrib/scm/browser/scm.contribution";
 ModesRegistry.registerLanguage({
@@ -115,6 +116,7 @@ viewsRegistry.registerViews([{
     .registerWorkbenchContribution(SCMActiveRepositoryContextKeyController, 3 );
 ( (Registry.as(Extensions.Workbench)))
     .registerWorkbenchContribution(SCMStatusController, 3 );
+registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetController, 3 );
 ( (Registry.as(Extensions$2.Configuration))).registerConfiguration({
     id: 'scm',
     order: 5,
@@ -446,12 +448,43 @@ viewsRegistry.registerViews([{
                 "Controls whether the All Changes entry is shown for incoming/outgoing changes in the Source Control view."
             )),
             default: true
+        },
+        'scm.workingSets.enabled': {
+            type: 'boolean',
+            description: ( localizeWithPath(
+                _moduleId,
+                66,
+                "Controls whether to store editor working sets when switching between source control history item groups."
+            )),
+            default: false
+        },
+        'scm.workingSets.default': {
+            type: 'string',
+            enum: ['empty', 'current'],
+            enumDescriptions: [
+                ( localizeWithPath(
+                    _moduleId,
+                    67,
+                    "Use an empty working set when switching to a source control history item group that does not have a working set."
+                )),
+                ( localizeWithPath(
+                    _moduleId,
+                    68,
+                    "Use the current working set when switching to a source control history item group that does not have a working set."
+                ))
+            ],
+            description: ( localizeWithPath(
+                _moduleId,
+                69,
+                "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'
         }
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'scm.acceptInput',
-    metadata: { description: ( localizeWithPath(_moduleId, 66, "Source Control: Accept Input")), args: [] },
+    metadata: { description: ( localizeWithPath(_moduleId, 70, "Source Control: Accept Input")), args: [] },
     weight: 200 ,
     when: ( (ContextKeyExpr.has('scmRepository'))),
     primary: 2048  | 3 ,
@@ -474,7 +507,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 const viewNextCommitCommand = {
-    description: { description: ( localizeWithPath(_moduleId, 67, "Source Control: View Next Commit")), args: [] },
+    description: { description: ( localizeWithPath(_moduleId, 71, "Source Control: View Next Commit")), args: [] },
     weight: 200 ,
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
@@ -486,7 +519,7 @@ const viewNextCommitCommand = {
     }
 };
 const viewPreviousCommitCommand = {
-    description: { description: ( localizeWithPath(_moduleId, 68, "Source Control: View Previous Commit")), args: [] },
+    description: { description: ( localizeWithPath(_moduleId, 72, "Source Control: View Previous Commit")), args: [] },
     weight: 200 ,
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
@@ -547,7 +580,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
     group: '100_end',
     command: {
         id: 'scm.openInTerminal',
-        title: ( localizeWithPath(_moduleId, 69, "Open in External Terminal"))
+        title: ( localizeWithPath(_moduleId, 73, "Open in External Terminal"))
     },
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('scmProviderHasRootUri', true)),
@@ -561,7 +594,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
     group: '100_end',
     command: {
         id: 'scm.openInIntegratedTerminal',
-        title: ( localizeWithPath(_moduleId, 70, "Open in Integrated Terminal"))
+        title: ( localizeWithPath(_moduleId, 74, "Open in Integrated Terminal"))
     },
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('scmProviderHasRootUri', true)),

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

@@ -21,6 +21,7 @@ import { getActionViewItemProvider, collectContextMenuActions } from './util.js'
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 const _moduleId = "vs/workbench/contrib/scm/browser/scmRepositoriesViewPane";
 class ListDelegate {
@@ -32,8 +33,8 @@ class ListDelegate {
     }
 }
 let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
-    constructor(options, scmViewService, keybindingService, contextMenuService, instantiationService, viewDescriptorService, contextKeyService, configurationService, openerService, themeService, telemetryService) {
-        super({ ...options, titleMenuId: MenuId.SCMSourceControlTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+    constructor(options, scmViewService, keybindingService, contextMenuService, instantiationService, viewDescriptorService, contextKeyService, configurationService, openerService, themeService, telemetryService, hoverService) {
+        super({ ...options, titleMenuId: MenuId.SCMSourceControlTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.scmViewService = scmViewService;
         this.disposables = ( (new DisposableStore()));
     }
@@ -165,7 +166,8 @@ SCMRepositoriesViewPane = ( (__decorate([
     ( (__param(7, IConfigurationService))),
     ( (__param(8, IOpenerService))),
     ( (__param(9, IThemeService))),
-    ( (__param(10, ITelemetryService)))
+    ( (__param(10, ITelemetryService))),
+    ( (__param(11, IHoverService)))
 ], SCMRepositoriesViewPane)));
 
 export { SCMRepositoriesViewPane };

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

@@ -62,6 +62,7 @@ let RepositoryRenderer = class RepositoryRenderer {
             this.contextKeyService,
             this.contextMenuService,
             this.keybindingService,
+            this.commandService,
             this.telemetryService
         ));
         const countContainer = append(provider, $('.count'));

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

@@ -4,7 +4,7 @@ import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { basename, dirname } from 'vscode/vscode/vs/base/common/resources';
 import { Disposable, DisposableStore, toDisposable, combinedDisposable, MutableDisposable, dispose, DisposableMap } 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 { append, $, asCSSUrl, prepend, Dimension, trackFocus, isPointerEvent, clearNode } from 'vscode/vscode/vs/base/browser/dom';
 import { VIEW_PANE_ID, SCMInputChangeReason } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMViewService, ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
@@ -45,12 +45,11 @@ import { MenuPreventer } from 'vscode/vscode/vs/workbench/contrib/codeEditor/bro
 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 { language, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { compare, format } from 'vscode/vscode/vs/base/common/strings';
 import { SuggestController } from 'vscode/vscode/vs/editor/contrib/suggest/browser/suggestController';
 import { SnippetController2 } from 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
-import { HoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/hover';
 import { ColorDetector } from 'vscode/vscode/vs/editor/contrib/colorPicker/browser/colorDetector';
 import { LinkDetector } from 'vscode/vscode/vs/editor/contrib/links/browser/links';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
@@ -69,6 +68,7 @@ import { ButtonWithDropdown, Button } from 'vscode/vscode/vs/base/browser/ui/but
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { RepositoryContextKeys } from './scmViewService.js';
 import { DragAndDropController } from 'vscode/vscode/vs/editor/contrib/dnd/browser/dnd';
+import { CopyPasteController } from 'vscode/vscode/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController';
 import { DropIntoEditorController } from 'vscode/vscode/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController';
 import { MessageController } from 'vscode/vscode/vs/editor/contrib/message/browser/messageController';
 import { defaultCountBadgeStyles, defaultButtonStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
@@ -100,6 +100,11 @@ import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellati
 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.service';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
+import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
+import { OpenScmGroupAction } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
+import { HoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverController';
 
 var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1, HistoryItemGroupRenderer_1, HistoryItemRenderer_1, HistoryItemChangeRenderer_1, SeparatorRenderer_1, SCMInputWidget_1;
 const _moduleId = "vs/workbench/contrib/scm/browser/scmViewPane";
@@ -127,6 +132,46 @@ registerColor('scm.historyItemSelectedStatisticsBorder', {
     hcDark: ( (transparent(listActiveSelectionForeground, 0.2))),
     hcLight: ( (transparent(listActiveSelectionForeground, 0.2)))
 }, ( localizeWithPath(_moduleId, 3, "History item selected statistics border color.")));
+function processResourceFilterData(uri, filterData) {
+    if (!filterData) {
+        return [undefined, undefined];
+    }
+    if (!filterData.label) {
+        const matches = createMatches(filterData);
+        return [matches, undefined];
+    }
+    const fileName = basename(uri);
+    const label = filterData.label;
+    const pathLength = label.length - fileName.length;
+    const matches = createMatches(filterData.score);
+    if (label === fileName) {
+        return [matches, undefined];
+    }
+    const labelMatches = [];
+    const descriptionMatches = [];
+    for (const match of matches) {
+        if (match.start > pathLength) {
+            labelMatches.push({
+                start: match.start - pathLength,
+                end: match.end - pathLength
+            });
+        }
+        else if (match.end < pathLength) {
+            descriptionMatches.push(match);
+        }
+        else {
+            labelMatches.push({
+                start: 0,
+                end: match.end - pathLength
+            });
+            descriptionMatches.push({
+                start: match.start,
+                end: pathLength
+            });
+        }
+    }
+    return [labelMatches, descriptionMatches];
+}
 let ActionButtonRenderer = class ActionButtonRenderer {
     static { ActionButtonRenderer_1 = this; }
     static { this.DEFAULT_HEIGHT = 30; }
@@ -462,7 +507,7 @@ let ResourceRenderer = class ResourceRenderer {
         else {
             const menus = this.scmViewService.menus.getRepositoryMenus(resourceOrFolder.resourceGroup.provider);
             this._renderActionBar(template, resourceOrFolder, menus.getResourceMenu(resourceOrFolder));
-            [matches, descriptionMatches] = this._processFilterData(uri, node.filterData);
+            [matches, descriptionMatches] = processResourceFilterData(uri, node.filterData);
             template.element.classList.toggle('faded', resourceOrFolder.decorations.faded);
             strikethrough = resourceOrFolder.decorations.strikeThrough;
         }
@@ -512,46 +557,6 @@ let ResourceRenderer = class ResourceRenderer {
         }
         template.actionBar.context = resourceOrFolder;
     }
-    _processFilterData(uri, filterData) {
-        if (!filterData) {
-            return [undefined, undefined];
-        }
-        if (!filterData.label) {
-            const matches = createMatches(filterData);
-            return [matches, undefined];
-        }
-        const fileName = basename(uri);
-        const label = filterData.label;
-        const pathLength = label.length - fileName.length;
-        const matches = createMatches(filterData.score);
-        if (label === fileName) {
-            return [matches, undefined];
-        }
-        const labelMatches = [];
-        const descriptionMatches = [];
-        for (const match of matches) {
-            if (match.start > pathLength) {
-                labelMatches.push({
-                    start: match.start - pathLength,
-                    end: match.end - pathLength
-                });
-            }
-            else if (match.end < pathLength) {
-                descriptionMatches.push(match);
-            }
-            else {
-                labelMatches.push({
-                    start: 0,
-                    end: match.end - pathLength
-                });
-                descriptionMatches.push({
-                    start: match.start,
-                    end: pathLength
-                });
-            }
-        }
-        return [labelMatches, descriptionMatches];
-    }
     onDidColorThemeChange() {
         for (const [template, data] of this.renderedResources) {
             this.renderIcon(template, data);
@@ -610,11 +615,12 @@ let HistoryItemGroupRenderer = class HistoryItemGroupRenderer {
     static { HistoryItemGroupRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'history-item-group'; }
     get templateId() { return HistoryItemGroupRenderer_1.TEMPLATE_ID; }
-    constructor(actionRunner, contextKeyService, contextMenuService, keybindingService, menuService, scmViewService, telemetryService) {
+    constructor(actionRunner, contextKeyService, contextMenuService, keybindingService, commandService, menuService, scmViewService, telemetryService) {
         this.actionRunner = actionRunner;
         this.contextKeyService = contextKeyService;
         this.contextMenuService = contextMenuService;
         this.keybindingService = keybindingService;
+        this.commandService = commandService;
         this.menuService = menuService;
         this.scmViewService = scmViewService;
         this.telemetryService = telemetryService;
@@ -632,6 +638,7 @@ let HistoryItemGroupRenderer = class HistoryItemGroupRenderer {
             this.contextKeyService,
             this.contextMenuService,
             this.keybindingService,
+            this.commandService,
             this.telemetryService
         )));
         templateDisposables.add(toolBar);
@@ -677,9 +684,10 @@ HistoryItemGroupRenderer = HistoryItemGroupRenderer_1 = ( (__decorate([
     ( (__param(1, IContextKeyService))),
     ( (__param(2, IContextMenuService))),
     ( (__param(3, IKeybindingService))),
-    ( (__param(4, IMenuService))),
-    ( (__param(5, ISCMViewService))),
-    ( (__param(6, ITelemetryService)))
+    ( (__param(4, ICommandService))),
+    ( (__param(5, IMenuService))),
+    ( (__param(6, ISCMViewService))),
+    ( (__param(7, ITelemetryService)))
 ], HistoryItemGroupRenderer)));
 class HistoryItemActionRunner extends ActionRunner {
     async runAction(action, context) {
@@ -691,8 +699,8 @@ class HistoryItemActionRunner extends ActionRunner {
         args.push({
             id: context.id,
             parentIds: context.parentIds,
-            label: context.label,
-            description: context.description,
+            message: context.message,
+            author: context.author,
             icon: context.icon,
             timestamp: context.timestamp,
             statistics: context.statistics,
@@ -704,15 +712,19 @@ let HistoryItemRenderer = class HistoryItemRenderer {
     static { HistoryItemRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'history-item'; }
     get templateId() { return HistoryItemRenderer_1.TEMPLATE_ID; }
-    constructor(actionRunner, actionViewItemProvider, scmViewService) {
+    constructor(actionRunner, actionViewItemProvider, hoverService, scmViewService) {
         this.actionRunner = actionRunner;
         this.actionViewItemProvider = actionViewItemProvider;
+        this.hoverService = hoverService;
         this.scmViewService = scmViewService;
     }
     renderTemplate(container) {
         container.parentElement.parentElement.querySelector('.monaco-tl-twistie').classList.add('force-twistie');
         const element = append(container, $('.history-item'));
-        const iconLabel = ( (new IconLabel(element, { supportIcons: true })));
+        const iconLabel = ( (new IconLabel(
+            element,
+            { supportIcons: true, supportHighlights: true, supportDescriptionHighlights: true }
+        )));
         const iconContainer = prepend(iconLabel.element, $('.icon-container'));
         const disposables = ( (new DisposableStore()));
         const actionsContainer = append(element, $('.actions'));
@@ -725,7 +737,9 @@ let HistoryItemRenderer = class HistoryItemRenderer {
         const filesLabel = append(statsContainer, $('.files-label'));
         const insertionsLabel = append(statsContainer, $('.insertions-label'));
         const deletionsLabel = append(statsContainer, $('.deletions-label'));
-        return { iconContainer, label: iconLabel, actionBar, statsContainer, filesLabel, insertionsLabel, deletionsLabel, elementDisposables: ( (new DisposableStore())), disposables };
+        const statsCustomHover = this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('element'), statsContainer, '');
+        disposables.add(statsCustomHover);
+        return { iconContainer, label: iconLabel, actionBar, statsContainer, statsCustomHover, filesLabel, insertionsLabel, deletionsLabel, elementDisposables: ( (new DisposableStore())), disposables };
     }
     renderElement(node, index, templateData, height) {
         const historyItem = node.element;
@@ -733,7 +747,9 @@ let HistoryItemRenderer = class HistoryItemRenderer {
         if (historyItem.icon && ThemeIcon.isThemeIcon(historyItem.icon)) {
             templateData.iconContainer.classList.add(...ThemeIcon.asClassNameArray(historyItem.icon));
         }
-        templateData.label.setLabel(historyItem.label, historyItem.description);
+        const title = this.getTooltip(historyItem);
+        const [matches, descriptionMatches] = this.processMatches(historyItem, node.filterData);
+        templateData.label.setLabel(historyItem.message, historyItem.author, { matches, descriptionMatches, title });
         templateData.actionBar.clear();
         templateData.actionBar.context = historyItem;
         const menus = this.scmViewService.menus.getRepositoryMenus(historyItem.historyItemGroup.repository.provider);
@@ -746,6 +762,27 @@ let HistoryItemRenderer = class HistoryItemRenderer {
     renderCompressedElements(node, index, templateData, height) {
         throw ( (new Error('Should never happen since node is incompressible')));
     }
+    getTooltip(historyItem) {
+        const markdown = ( (new MarkdownString('', { isTrusted: true, supportThemeIcons: true })));
+        if (historyItem.author) {
+            markdown.appendMarkdown(`$(account) **${historyItem.author}**\n\n`);
+        }
+        if (historyItem.timestamp) {
+            const dateFormatter = new Intl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' });
+            markdown.appendMarkdown(`$(history) ${dateFormatter.format(historyItem.timestamp)}\n\n`);
+        }
+        markdown.appendMarkdown(historyItem.message);
+        return { markdown, markdownNotSupportedFallback: historyItem.message };
+    }
+    processMatches(historyItem, filterData) {
+        if (!filterData) {
+            return [undefined, undefined];
+        }
+        return [
+            historyItem.message === filterData.label ? createMatches(filterData.score) : undefined,
+            historyItem.author === filterData.label ? createMatches(filterData.score) : undefined
+        ];
+    }
     renderStatistics(node, index, templateData, height) {
         const historyItem = node.element;
         if (historyItem.statistics) {
@@ -764,10 +801,9 @@ let HistoryItemRenderer = class HistoryItemRenderer {
                 historyItem.statistics.deletions === 1 ? ( localizeWithPath(_moduleId, 8, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
                     historyItem.statistics.deletions > 1 ? ( localizeWithPath(_moduleId, 9, "{0} deletions{1}", historyItem.statistics.deletions, '(-)')) : ''
             ];
-            const statsTitle = statsAriaLabel
-                .filter(l => l !== '').join(', ');
-            templateData.statsContainer.title = statsTitle;
+            const statsTitle = statsAriaLabel.filter(l => l !== '').join(', ');
             templateData.statsContainer.setAttribute('aria-label', statsTitle);
+            templateData.statsCustomHover.update(statsTitle);
             templateData.filesLabel.textContent = ( (historyItem.statistics.files.toString()));
             templateData.insertionsLabel.textContent = historyItem.statistics.insertions > 0 ? `+${historyItem.statistics.insertions}` : '';
             templateData.insertionsLabel.classList.toggle('hidden', historyItem.statistics.insertions === 0);
@@ -784,7 +820,8 @@ let HistoryItemRenderer = class HistoryItemRenderer {
     }
 };
 HistoryItemRenderer = HistoryItemRenderer_1 = ( (__decorate([
-    ( (__param(2, ISCMViewService)))
+    ( (__param(2, IHoverService))),
+    ( (__param(3, ISCMViewService)))
 ], HistoryItemRenderer)));
 let HistoryItemChangeRenderer = class HistoryItemChangeRenderer {
     static { HistoryItemChangeRenderer_1 = this; }
@@ -807,15 +844,27 @@ let HistoryItemChangeRenderer = class HistoryItemChangeRenderer {
         const uri = ResourceTree.isResourceNode(historyItemChangeOrFolder) ? historyItemChangeOrFolder.element?.uri ?? historyItemChangeOrFolder.uri : historyItemChangeOrFolder.uri;
         const fileKind = ResourceTree.isResourceNode(historyItemChangeOrFolder) ? FileKind.FOLDER : FileKind.FILE;
         const hidePath = this.viewMode() === "tree" ;
-        templateData.fileLabel.setFile(uri, { fileDecorations: { colors: false, badges: true }, fileKind, hidePath, });
+        let matches;
+        let descriptionMatches;
+        if (ResourceTree.isResourceNode(historyItemChangeOrFolder)) {
+            if (!historyItemChangeOrFolder.element) {
+                matches = createMatches(node.filterData);
+            }
+        }
+        else {
+            [matches, descriptionMatches] = processResourceFilterData(uri, node.filterData);
+        }
+        templateData.fileLabel.setFile(uri, { fileDecorations: { colors: false, badges: true }, fileKind, hidePath, matches, descriptionMatches });
     }
     renderCompressedElements(node, index, templateData, height) {
         const compressed = node.element;
         const folder = compressed.elements[compressed.elements.length - 1];
         const label = ( (compressed.elements.map(e => e.name)));
+        const matches = createMatches(node.filterData);
         templateData.fileLabel.setResource({ resource: folder.uri, name: label }, {
             fileDecorations: { colors: false, badges: true },
             fileKind: FileKind.FOLDER,
+            matches,
             separator: this.labelService.getSeparator(folder.uri.scheme)
         });
     }
@@ -830,10 +879,11 @@ let SeparatorRenderer = class SeparatorRenderer {
     static { SeparatorRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'separator'; }
     get templateId() { return SeparatorRenderer_1.TEMPLATE_ID; }
-    constructor(contextKeyService, contextMenuService, keybindingService, menuService, telemetryService) {
+    constructor(contextKeyService, contextMenuService, keybindingService, commandService, menuService, telemetryService) {
         this.contextKeyService = contextKeyService;
         this.contextMenuService = contextMenuService;
         this.keybindingService = keybindingService;
+        this.commandService = commandService;
         this.menuService = menuService;
         this.telemetryService = telemetryService;
     }
@@ -853,6 +903,7 @@ let SeparatorRenderer = class SeparatorRenderer {
             this.contextKeyService,
             this.contextMenuService,
             this.keybindingService,
+            this.commandService,
             this.telemetryService
         )));
         disposables.add(toolBar);
@@ -872,8 +923,9 @@ SeparatorRenderer = SeparatorRenderer_1 = ( (__decorate([
     ( (__param(0, IContextKeyService))),
     ( (__param(1, IContextMenuService))),
     ( (__param(2, IKeybindingService))),
-    ( (__param(3, IMenuService))),
-    ( (__param(4, ITelemetryService)))
+    ( (__param(3, ICommandService))),
+    ( (__param(4, IMenuService))),
+    ( (__param(5, ITelemetryService)))
 ], SeparatorRenderer)));
 class ListDelegate {
     constructor(inputRenderer) {
@@ -1040,7 +1092,7 @@ let SCMTreeKeyboardNavigationLabelProvider = class SCMTreeKeyboardNavigationLabe
             return element.label;
         }
         else if (isSCMHistoryItemTreeElement(element)) {
-            return element.label;
+            return [element.message, element.author];
         }
         else if (isSCMViewSeparator(element)) {
             return element.label;
@@ -1150,7 +1202,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
             return element.ariaLabel ?? `${element.label.trim()}${element.description ? `, ${element.description}` : ''}`;
         }
         else if (isSCMHistoryItemTreeElement(element)) {
-            return `${stripIcons(element.label).trim()}${element.description ? `, ${element.description}` : ''}`;
+            return `${stripIcons(element.message).trim()}${element.author ? `, ${element.author}` : ''}`;
         }
         else if (isSCMHistoryItemChangeTreeElement(element)) {
             const result = [basename(element.uri)];
@@ -1665,7 +1717,7 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
     get dropdownActions() { return this._dropdownActions; }
     get dropdownAction() { return this._dropdownAction; }
     constructor(container, options, menuService, contextKeyService, contextMenuService, commandService, keybindingService, storageService, telemetryService) {
-        super(container, { resetMenu: MenuId.SCMInputBox, ...options }, menuService, contextKeyService, contextMenuService, keybindingService, telemetryService);
+        super(container, { resetMenu: MenuId.SCMInputBox, ...options }, menuService, contextKeyService, contextMenuService, keybindingService, commandService, telemetryService);
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
         this.storageService = storageService;
@@ -1678,7 +1730,7 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
             id: "scm.input.cancelAction" ,
             title: ( localizeWithPath(_moduleId, 32, "Cancel")),
             icon: Codicon.debugStop,
-        }, undefined, undefined, undefined, contextKeyService, commandService)));
+        }, undefined, undefined, undefined, undefined, contextKeyService, commandService)));
     }
     setInput(input) {
         this.repositoryDisposables.clear();
@@ -1961,7 +2013,6 @@ let SCMInputWidget = class SCMInputWidget {
         this.contextMenuService = contextMenuService;
         this.disposables = ( (new DisposableStore()));
         this.repositoryDisposables = ( (new DisposableStore()));
-        this.validationDisposable = Disposable.None;
         this.validationHasFocus = false;
         this.lastLayoutWasTrash = false;
         this.shouldFocusAfterLayout = false;
@@ -1982,6 +2033,7 @@ let SCMInputWidget = class SCMInputWidget {
                 ColorDetector.ID,
                 ContextMenuController.ID,
                 DragAndDropController.ID,
+                CopyPasteController.ID,
                 DropIntoEditorController.ID,
                 LinkDetector.ID,
                 MenuPreventer.ID,
@@ -1993,7 +2045,7 @@ let SCMInputWidget = class SCMInputWidget {
                 InlineCompletionsController.ID,
                 CodeActionController.ID,
                 FormatOnType.ID,
-                EditorDictation.ID
+                EditorDictation.ID,
             ])
         };
         const services = ( (new ServiceCollection([IContextKeyService, this.contextKeyService])));
@@ -2015,6 +2067,10 @@ let SCMInputWidget = class SCMInputWidget {
                 }
             }, 0);
         }));
+        this.disposables.add(this.inputEditor.onDidBlurEditorWidget(() => {
+            CopyPasteController.get(this.inputEditor)?.clearWidgets();
+            DropIntoEditorController.get(this.inputEditor)?.clearWidgets();
+        }));
         const firstLineKey = this.contextKeyService.createKey('scmInputIsInFirstPosition', false);
         const lastLineKey = this.contextKeyService.createKey('scmInputIsInLastPosition', false);
         this.disposables.add(this.inputEditor.onDidChangeCursorPosition(({ position }) => {
@@ -2100,7 +2156,7 @@ let SCMInputWidget = class SCMInputWidget {
             return;
         }
         const disposables = ( (new DisposableStore()));
-        this.validationDisposable = this.contextViewService.showContextView({
+        this.validationContextView = this.contextViewService.showContextView({
             getAnchor: () => this.element,
             render: container => {
                 this.element.style.borderBottomLeftRadius = '0';
@@ -2175,7 +2231,8 @@ let SCMInputWidget = class SCMInputWidget {
         this.placeholderTextContainer.style.lineHeight = `${lineHeight}px`;
     }
     clearValidation() {
-        this.validationDisposable.dispose();
+        this.validationContextView?.close();
+        this.validationContextView = undefined;
         this.validationHasFocus = false;
     }
     dispose() {
@@ -2225,8 +2282,8 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             this.storageService.store(`scm.viewSortKey`, sortKey, 1 , 0 );
         }
     }
-    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);
+    constructor(options, commandService, editorService, logService, menuService, scmService, scmViewService, storageService, uriIdentityService, keybindingService, themeService, contextMenuService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, telemetryService, hoverService) {
+        super({ ...options, titleMenuId: MenuId.SCMTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.commandService = commandService;
         this.editorService = editorService;
         this.logService = logService;
@@ -2433,7 +2490,25 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         }
         else if (isSCMResource(e.element)) {
             if (e.element.command?.id === API_OPEN_EDITOR_COMMAND_ID || e.element.command?.id === API_OPEN_DIFF_EDITOR_COMMAND_ID) {
-                await this.commandService.executeCommand(e.element.command.id, ...(e.element.command.arguments || []), e);
+                if (isPointerEvent(e.browserEvent) && e.browserEvent.button === 1) {
+                    const resourceGroup = e.element.resourceGroup;
+                    const title = `${resourceGroup.provider.label}: ${resourceGroup.label}`;
+                    await OpenScmGroupAction.openMultiFileDiffEditor(this.editorService, title, resourceGroup.provider.rootUri, resourceGroup.id, {
+                        ...e.editorOptions,
+                        viewState: {
+                            revealData: {
+                                resource: {
+                                    original: e.element.multiDiffEditorOriginalUri,
+                                    modified: e.element.multiDiffEditorModifiedUri,
+                                }
+                            }
+                        },
+                        preserveFocus: true,
+                    });
+                }
+                else {
+                    await this.commandService.executeCommand(e.element.command.id, ...(e.element.command.arguments || []), e);
+                }
             }
             else {
                 await e.element.open(!!e.editorOptions.preserveFocus);
@@ -2791,7 +2866,8 @@ SCMViewPane = ( (__decorate([
     ( (__param(14, IConfigurationService))),
     ( (__param(15, IContextKeyService))),
     ( (__param(16, IOpenerService))),
-    ( (__param(17, ITelemetryService)))
+    ( (__param(17, ITelemetryService))),
+    ( (__param(18, IHoverService)))
 ], SCMViewPane)));
 let SCMTreeDataSource = class SCMTreeDataSource {
     constructor(viewMode, configurationService, logService, scmViewService, uriIdentityService) {
@@ -2936,12 +3012,12 @@ let SCMTreeDataSource = class SCMTreeDataSource {
             }
             incomingHistoryItemGroup = currentHistoryItemGroup.base ? {
                 id: currentHistoryItemGroup.base.id,
-                label: currentHistoryItemGroup.base.label,
+                label: currentHistoryItemGroup.base.name,
                 ariaLabel: ( localizeWithPath(
                     _moduleId,
                     40,
                     "Incoming changes from {0}",
-                    currentHistoryItemGroup.base.label
+                    currentHistoryItemGroup.base.name
                 )),
                 icon: Codicon.arrowCircleDown,
                 direction: 'incoming',
@@ -2952,8 +3028,8 @@ let SCMTreeDataSource = class SCMTreeDataSource {
             } : undefined;
             outgoingHistoryItemGroup = {
                 id: currentHistoryItemGroup.id,
-                label: currentHistoryItemGroup.label,
-                ariaLabel: ( localizeWithPath(_moduleId, 41, "Outgoing changes to {0}", currentHistoryItemGroup.label)),
+                label: currentHistoryItemGroup.name,
+                ariaLabel: ( localizeWithPath(_moduleId, 41, "Outgoing changes to {0}", currentHistoryItemGroup.name)),
                 icon: Codicon.arrowCircleUp,
                 direction: 'outgoing',
                 ancestor: ancestor.id,
@@ -3004,7 +3080,7 @@ let SCMTreeDataSource = class SCMTreeDataSource {
             children.push({
                 ...historyItemsElement[0],
                 icon: historyItemsElement[0].icon ?? Codicon.files,
-                label: ( localizeWithPath(_moduleId, 42, "All Changes")),
+                message: ( localizeWithPath(_moduleId, 42, "All Changes")),
                 historyItemGroup: element,
                 type: 'allChanges'
             });

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

@@ -14,6 +14,7 @@ import { binarySearch } from 'vscode/vscode/vs/base/common/arrays';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 
 function getProviderStorageKey(provider) {
     return `${provider.contextValue}:${provider.label}${provider.rootUri ? `:${( provider.rootUri.toString())}` : ''}`;
@@ -72,7 +73,7 @@ let SCMViewService = class SCMViewService {
     get focusedRepository() {
         return this._repositories.find(r => r.focused)?.repository;
     }
-    constructor(scmService, contextKeyService, instantiationService, configurationService, storageService, workspaceContextService) {
+    constructor(scmService, contextKeyService, extensionService, instantiationService, configurationService, storageService, workspaceContextService) {
         this.configurationService = configurationService;
         this.storageService = storageService;
         this.workspaceContextService = workspaceContextService;
@@ -124,6 +125,10 @@ let SCMViewService = class SCMViewService {
             this.onDidAddRepository(repository);
         }
         storageService.onWillSaveState(this.onWillSaveState, this, this.disposables);
+        extensionService.onWillStop(() => {
+            this.onWillSaveState();
+            this.didFinishLoading = false;
+        }, this, this.disposables);
     }
     onDidAddRepository(repository) {
         if (!this.didFinishLoading) {
@@ -133,7 +138,7 @@ let SCMViewService = class SCMViewService {
             repository, discoveryTime: Date.now(), focused: false, selectionIndex: -1
         };
         let removed = Iterable.empty();
-        if (this.previousState) {
+        if (this.previousState && !this.didFinishLoading) {
             const index = this.previousState.all.indexOf(getProviderStorageKey(repository.provider));
             if (index === -1) {
                 const added = [];
@@ -272,8 +277,8 @@ let SCMViewService = class SCMViewService {
         }
         const all = ( this.repositories.map(r => getProviderStorageKey(r.provider)));
         const visible = ( this.visibleRepositories.map(r => all.indexOf(getProviderStorageKey(r.provider))));
-        const raw = JSON.stringify({ all, sortKey: this._repositoriesSortKey, visible });
-        this.storageService.store('scm:view:visibleRepositories', raw, 1 , 1 );
+        this.previousState = { all, sortKey: this._repositoriesSortKey, visible };
+        this.storageService.store('scm:view:visibleRepositories', JSON.stringify(this.previousState), 1 , 1 );
     }
     eventuallyFinishLoading() {
         this.finishLoading();
@@ -283,7 +288,6 @@ let SCMViewService = class SCMViewService {
             return;
         }
         this.didFinishLoading = true;
-        this.previousState = undefined;
     }
     dispose() {
         this.disposables.dispose();
@@ -297,10 +301,11 @@ SCMViewService.__decorator = ( __decorate([
 SCMViewService = ( __decorate([
     ( __param(0, ISCMService)),
     ( __param(1, IContextKeyService)),
-    ( __param(2, IInstantiationService)),
-    ( __param(3, IConfigurationService)),
-    ( __param(4, IStorageService)),
-    ( __param(5, IWorkspaceContextService))
+    ( __param(2, IExtensionService)),
+    ( __param(3, IInstantiationService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, IStorageService)),
+    ( __param(6, IWorkspaceContextService))
 ], SCMViewService));
 
 export { RepositoryContextKeys, SCMViewService };

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

@@ -117,5 +117,8 @@ function getActionViewItemProvider(instaService) {
         return createActionViewItem(instaService, action, options);
     };
 }
+function getProviderKey(provider) {
+    return `${provider.contextValue}:${provider.label}${provider.rootUri ? `:${( provider.rootUri.toString())}` : ''}`;
+}
 
-export { StatusBarAction, collectContextMenuActions, connectPrimaryMenu, connectPrimaryMenuToInlineActionBar, getActionViewItemProvider, isSCMActionButton, isSCMHistoryItemChangeNode, isSCMHistoryItemChangeTreeElement, isSCMHistoryItemGroupTreeElement, isSCMHistoryItemTreeElement, isSCMInput, isSCMRepository, isSCMResource, isSCMResourceGroup, isSCMResourceNode, isSCMViewSeparator, isSCMViewService, toDiffEditorArguments };
+export { StatusBarAction, collectContextMenuActions, connectPrimaryMenu, connectPrimaryMenuToInlineActionBar, getActionViewItemProvider, getProviderKey, isSCMActionButton, isSCMHistoryItemChangeNode, isSCMHistoryItemChangeTreeElement, isSCMHistoryItemGroupTreeElement, isSCMHistoryItemTreeElement, isSCMInput, isSCMRepository, isSCMResource, isSCMResourceGroup, isSCMResourceNode, isSCMViewSeparator, isSCMViewService, toDiffEditorArguments };

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

@@ -0,0 +1,118 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { DisposableMap, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { getProviderKey } from './util.js';
+import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
+import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+
+let SCMWorkingSetController = class SCMWorkingSetController {
+    static { this.ID = 'workbench.contrib.scmWorkingSets'; }
+    constructor(configurationService, editorGroupsService, scmService, storageService) {
+        this.configurationService = configurationService;
+        this.editorGroupsService = editorGroupsService;
+        this.scmService = scmService;
+        this.storageService = storageService;
+        this._repositoryDisposables = ( new DisposableMap());
+        this._scmServiceDisposables = ( new DisposableStore());
+        this._disposables = ( new DisposableStore());
+        const onDidChangeConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.workingSets.enabled'), this._disposables);
+        this._disposables.add(Event.runAndSubscribe(onDidChangeConfiguration, () => this._onDidChangeConfiguration()));
+    }
+    _onDidChangeConfiguration() {
+        if (!this.configurationService.getValue('scm.workingSets.enabled')) {
+            this.storageService.remove('scm.workingSets', 1 );
+            this._scmServiceDisposables.clear();
+            this._repositoryDisposables.clearAndDisposeAll();
+            return;
+        }
+        this._workingSets = this._loadWorkingSets();
+        this.scmService.onDidAddRepository(this._onDidAddRepository, this, this._scmServiceDisposables);
+        this.scmService.onDidRemoveRepository(this._onDidRemoveRepository, this, this._scmServiceDisposables);
+        for (const repository of this.scmService.repositories) {
+            this._onDidAddRepository(repository);
+        }
+    }
+    _onDidAddRepository(repository) {
+        const disposables = ( new DisposableStore());
+        disposables.add(Event.runAndSubscribe(repository.provider.onDidChangeHistoryProvider, () => {
+            if (!repository.provider.historyProvider) {
+                return;
+            }
+            disposables.add(Event.runAndSubscribe(repository.provider.historyProvider.onDidChangeCurrentHistoryItemGroup, async () => {
+                if (!repository.provider.historyProvider?.currentHistoryItemGroup?.id) {
+                    return;
+                }
+                const providerKey = getProviderKey(repository.provider);
+                const currentHistoryItemGroupId = repository.provider.historyProvider.currentHistoryItemGroup.id;
+                const repositoryWorkingSets = this._workingSets.get(providerKey);
+                if (!repositoryWorkingSets) {
+                    this._workingSets.set(providerKey, { currentHistoryItemGroupId, editorWorkingSets: ( new Map()) });
+                    return;
+                }
+                if (repositoryWorkingSets.currentHistoryItemGroupId === currentHistoryItemGroupId) {
+                    return;
+                }
+                this._saveWorkingSet(providerKey, currentHistoryItemGroupId, repositoryWorkingSets);
+                await this._restoreWorkingSet(providerKey, currentHistoryItemGroupId);
+            }));
+        }));
+        this._repositoryDisposables.set(repository, disposables);
+    }
+    _onDidRemoveRepository(repository) {
+        this._workingSets.delete(getProviderKey(repository.provider));
+        this._repositoryDisposables.deleteAndDispose(repository);
+    }
+    _loadWorkingSets() {
+        const workingSets = ( new Map());
+        const workingSetsRaw = this.storageService.get('scm.workingSets', 1 );
+        if (!workingSetsRaw) {
+            return workingSets;
+        }
+        for (const serializedWorkingSet of JSON.parse(workingSetsRaw)) {
+            workingSets.set(serializedWorkingSet.providerKey, {
+                currentHistoryItemGroupId: serializedWorkingSet.currentHistoryItemGroupId,
+                editorWorkingSets: ( new Map(serializedWorkingSet.editorWorkingSets))
+            });
+        }
+        return workingSets;
+    }
+    _saveWorkingSet(providerKey, currentHistoryItemGroupId, repositoryWorkingSets) {
+        const previousHistoryItemGroupId = repositoryWorkingSets.currentHistoryItemGroupId;
+        const editorWorkingSets = repositoryWorkingSets.editorWorkingSets;
+        const editorWorkingSet = this.editorGroupsService.saveWorkingSet(previousHistoryItemGroupId);
+        this._workingSets.set(providerKey, { currentHistoryItemGroupId, editorWorkingSets: editorWorkingSets.set(previousHistoryItemGroupId, editorWorkingSet) });
+        const workingSets = [];
+        for (const [providerKey, { currentHistoryItemGroupId, editorWorkingSets }] of this._workingSets) {
+            workingSets.push({ providerKey, currentHistoryItemGroupId, editorWorkingSets: [...editorWorkingSets] });
+        }
+        this.storageService.store('scm.workingSets', JSON.stringify(workingSets), 1 , 1 );
+    }
+    async _restoreWorkingSet(providerKey, currentHistoryItemGroupId) {
+        const workingSets = this._workingSets.get(providerKey);
+        if (!workingSets) {
+            return;
+        }
+        let editorWorkingSetId = workingSets.editorWorkingSets.get(currentHistoryItemGroupId);
+        if (!editorWorkingSetId && this.configurationService.getValue('scm.workingSets.default') === 'empty') {
+            editorWorkingSetId = 'empty';
+        }
+        if (editorWorkingSetId) {
+            await this.editorGroupsService.applyWorkingSet(editorWorkingSetId);
+        }
+    }
+    dispose() {
+        this._repositoryDisposables.dispose();
+        this._scmServiceDisposables.dispose();
+        this._disposables.dispose();
+    }
+};
+SCMWorkingSetController = ( __decorate([
+    ( __param(0, IConfigurationService)),
+    ( __param(1, IEditorGroupsService)),
+    ( __param(2, ISCMService)),
+    ( __param(3, IStorageService))
+], SCMWorkingSetController));
+
+export { SCMWorkingSetController };