Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-13 15:35:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - Don't show progress for commands that support optimistic UI updates (#166124)

Browse Source 
Don't show progress for commands that support optimistic UI updates
This commit is contained in:
Ladislau Szomoru
2022-11-11 17:11:41 +01:00
committed by GitHub
parent f08b79d317
commit b4fbff3218
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/git/src/repository.ts
+21 -3
View File
@@ -308,11 +308,14 @@ export const enum Operation {
Diff = 'Diff',
MergeBase = 'MergeBase',
Add = 'Add',
AddNoProgress = 'AddNoProgress',
Remove = 'Remove',
RevertFiles = 'RevertFiles',
RevertFilesNoProgress = 'RevertFilesNoProgress',
Commit = 'Commit',
PostCommitCommand = 'PostCommitCommand',
Clean = 'Clean',
CleanNoProgress = 'CleanNoProgress',
Branch = 'Branch',
GetBranch = 'GetBranch',
GetBranches = 'GetBranches',
@@ -376,7 +379,10 @@ function isReadOnly(operation: Operation): boolean {
function shouldShowProgress(operation: Operation): boolean {
switch (operation) {
case Operation.AddNoProgress:
case Operation.CleanNoProgress:
case Operation.FetchNoProgress:
case Operation.RevertFilesNoProgress:
case Operation.CheckIgnore:
case Operation.GetObjectDetails:
case Operation.Show:
@@ -1225,8 +1231,12 @@ export class Repository implements Disposable {
}
async add(resources: Uri[], opts?: { update?: boolean }): Promise<void> {
const config = workspace.getConfiguration('git', Uri.file(this.root));
const optimisticUpdate = config.get<boolean>('optimisticUpdate') === true;
const operation = optimisticUpdate ? Operation.AddNoProgress : Operation.Add;
await this.run(
Operation.Add,
operation,
async () => {
await this.repository.add(resources.map(r => r.fsPath), opts);
this.closeDiffEditors([], [...resources.map(r => r.fsPath)]);
@@ -1276,8 +1286,12 @@ export class Repository implements Disposable {
}
async revert(resources: Uri[]): Promise<void> {
const config = workspace.getConfiguration('git', Uri.file(this.root));
const optimisticUpdate = config.get<boolean>('optimisticUpdate') === true;
const operation = optimisticUpdate ? Operation.RevertFilesNoProgress : Operation.RevertFiles;
await this.run(
Operation.RevertFiles,
operation,
async () => {
await this.repository.revert('HEAD', resources.map(r => r.fsPath));
this.closeDiffEditors([...resources.length !== 0 ?
@@ -1387,8 +1401,12 @@ export class Repository implements Disposable {
}
async clean(resources: Uri[]): Promise<void> {
const config = workspace.getConfiguration('git', Uri.file(this.root));
const optimisticUpdate = config.get<boolean>('optimisticUpdate') === true;
const operation = optimisticUpdate ? Operation.CleanNoProgress : Operation.Clean;
await this.run(
Operation.Clean,
operation,
async () => {
const toClean: string[] = [];
const toCheckout: string[] = [];