Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Git - remove the commitInProgress context for the commit message commands (#172761)

Browse Source
This commit is contained in:
Ladislau Szomoru
2023-01-30 14:25:54 +01:00
committed by GitHub
parent 9d435f67c0
commit 907e888754
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/git/package.json
View File

@@ -1653,12 +1653,12 @@
{
"command": "git.commitMessageAccept",
"group": "navigation",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit && commitInProgress"
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit"
},
{
"command": "git.commitMessageDiscard",
"group": "navigation",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit && commitInProgress"
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit"
},
{
"command": "git.stageSelectedRanges",

7
extensions/git/src/model.ts
View File

@@ -18,7 +18,6 @@ import { IPushErrorHandlerRegistry } from './pushError';
import { ApiRepository } from './api/api1';
import { IRemoteSourcePublisherRegistry } from './remotePublisher';
import { IPostCommitCommandsProviderRegistry } from './postCommitCommands';
import { OperationKind } from './operation';
class RepositoryPick implements QuickPickItem {
@memoize get label(): string {
@@ -588,19 +587,13 @@ export class Model implements IRemoteSourcePublisherRegistry, IPostCommitCommand
checkForSubmodules();
const updateOperationInProgressContext = () => {
let commitInProgress = false;
let operationInProgress = false;
for (const { repository } of this.openRepositories.values()) {
if (repository.operations.isRunning(OperationKind.Commit)) {
commitInProgress = true;
}
if (repository.operations.shouldDisableCommands()) {
operationInProgress = true;
}
}
commands.executeCommand('setContext', 'commitInProgress', commitInProgress);
commands.executeCommand('setContext', 'operationInProgress', operationInProgress);
};