fixes microsoft#79239

joaomoreno · joaomoreno · commit 14d47d35a962 · 2019-09-23T12:00:36.000+02:00
diff --git a/extensions/git/package.json b/extensions/git/package.json
@@ -469,11 +469,11 @@
         },
         {
           "command": "git.clean",
-          "when": "config.git.enabled && gitOpenRepositoryCount != 0 && !gitFreshRepository"
+          "when": "config.git.enabled && gitOpenRepositoryCount != 0"
         },
         {
           "command": "git.cleanAll",
-          "when": "config.git.enabled && gitOpenRepositoryCount != 0 && !gitFreshRepository"
+          "when": "config.git.enabled && gitOpenRepositoryCount != 0"
         },
         {
           "command": "git.commit",
@@ -763,7 +763,7 @@
         {
           "command": "git.cleanAll",
           "group": "5_stage",
-          "when": "scmProvider == git && !gitFreshRepository"
+          "when": "scmProvider == git"
         },
         {
           "command": "git.stashIncludeUntracked",
@@ -831,7 +831,7 @@
         },
         {
           "command": "git.cleanAll",
-          "when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",
+          "when": "scmProvider == git && scmResourceGroup == workingTree",
           "group": "1_modification"
         },
         {
@@ -841,7 +841,7 @@
         },
         {
           "command": "git.cleanAll",
-          "when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",
+          "when": "scmProvider == git && scmResourceGroup == workingTree",
           "group": "inline"
         },
         {
@@ -878,12 +878,12 @@
         },
         {
           "command": "git.clean",
-          "when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",
+          "when": "scmProvider == git && scmResourceGroup == workingTree",
           "group": "1_modification"
         },
         {
           "command": "git.clean",
-          "when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",
+          "when": "scmProvider == git && scmResourceGroup == workingTree",
           "group": "inline"
         },
         {
@@ -980,12 +980,12 @@
         },
         {
           "command": "git.clean",
-          "when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",
+          "when": "scmProvider == git && scmResourceGroup == workingTree",
           "group": "1_modification"
         },
         {
           "command": "git.clean",
-          "when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",
+          "when": "scmProvider == git && scmResourceGroup == workingTree",
           "group": "inline"
         },
         {
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { commands, Uri, Command, EventEmitter, Event, scm, SourceControl, SourceControlInputBox, SourceControlResourceGroup, SourceControlResourceState, SourceControlResourceDecorations, SourceControlInputBoxValidation, Disposable, ProgressLocation, window, workspace, WorkspaceEdit, ThemeColor, Decoration, Memento, SourceControlInputBoxValidationType, OutputChannel, LogLevel, env, ProgressOptions, CancellationToken } from 'vscode';
+import { Uri, Command, EventEmitter, Event, scm, SourceControl, SourceControlInputBox, SourceControlResourceGroup, SourceControlResourceState, SourceControlResourceDecorations, SourceControlInputBoxValidation, Disposable, ProgressLocation, window, workspace, WorkspaceEdit, ThemeColor, Decoration, Memento, SourceControlInputBoxValidationType, OutputChannel, LogLevel, env, ProgressOptions, CancellationToken } from 'vscode';
 import { Repository as BaseRepository, Commit, Stash, GitError, Submodule, CommitOptions, ForcePushMode } from './git';
 import { anyEvent, filterEvent, eventToPromise, dispose, find, isDescendant, IDisposable, onceEvent, EmptyDisposable, debounceEvent, combinedDisposable } from './util';
 import { memoize, throttle, debounce } from './decorators';
@@ -633,7 +633,6 @@ export class Repository implements Disposable {
 
 	private isRepositoryHuge = false;
 	private didWarnAboutLimit = false;
-	private isFreshRepository: boolean | undefined = undefined;
 
 	private disposables: Disposable[] = [];
 
@@ -1507,15 +1506,6 @@ export class Repository implements Disposable {
 		// set count badge
 		this.setCountBadge();
 
-		// Disable `Discard All Changes` for "fresh" repositories
-		// https://github.com/Microsoft/vscode/issues/43066
-		const isFreshRepository = !this._HEAD || !this._HEAD.commit;
-
-		if (this.isFreshRepository !== isFreshRepository) {
-			commands.executeCommand('setContext', 'gitFreshRepository', isFreshRepository);
-			this.isFreshRepository = isFreshRepository;
-		}
-
 		this._onDidChangeStatus.fire();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -469,11 +469,11 @@`
`469`	`469`	`},`
`470`	`470`	`{`
`471`	`471`	`"command": "git.clean",`
`472`		`- "when": "config.git.enabled && gitOpenRepositoryCount != 0 && !gitFreshRepository"`
	`472`	`+ "when": "config.git.enabled && gitOpenRepositoryCount != 0"`
`473`	`473`	`},`
`474`	`474`	`{`
`475`	`475`	`"command": "git.cleanAll",`
`476`		`- "when": "config.git.enabled && gitOpenRepositoryCount != 0 && !gitFreshRepository"`
	`476`	`+ "when": "config.git.enabled && gitOpenRepositoryCount != 0"`
`477`	`477`	`},`
`478`	`478`	`{`
`479`	`479`	`"command": "git.commit",`
`@@ -763,7 +763,7 @@`
`763`	`763`	`{`
`764`	`764`	`"command": "git.cleanAll",`
`765`	`765`	`"group": "5_stage",`
`766`		`- "when": "scmProvider == git && !gitFreshRepository"`
	`766`	`+ "when": "scmProvider == git"`
`767`	`767`	`},`
`768`	`768`	`{`
`769`	`769`	`"command": "git.stashIncludeUntracked",`
`@@ -831,7 +831,7 @@`
`831`	`831`	`},`
`832`	`832`	`{`
`833`	`833`	`"command": "git.cleanAll",`
`834`		`- "when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",`
	`834`	`+ "when": "scmProvider == git && scmResourceGroup == workingTree",`
`835`	`835`	`"group": "1_modification"`
`836`	`836`	`},`
`837`	`837`	`{`
`@@ -841,7 +841,7 @@`
`841`	`841`	`},`
`842`	`842`	`{`
`843`	`843`	`"command": "git.cleanAll",`
`844`		`- "when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",`
	`844`	`+ "when": "scmProvider == git && scmResourceGroup == workingTree",`
`845`	`845`	`"group": "inline"`
`846`	`846`	`},`
`847`	`847`	`{`
`@@ -878,12 +878,12 @@`
`878`	`878`	`},`
`879`	`879`	`{`
`880`	`880`	`"command": "git.clean",`
`881`		`- "when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",`
	`881`	`+ "when": "scmProvider == git && scmResourceGroup == workingTree",`
`882`	`882`	`"group": "1_modification"`
`883`	`883`	`},`
`884`	`884`	`{`
`885`	`885`	`"command": "git.clean",`
`886`		`- "when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",`
	`886`	`+ "when": "scmProvider == git && scmResourceGroup == workingTree",`
`887`	`887`	`"group": "inline"`
`888`	`888`	`},`
`889`	`889`	`{`
`@@ -980,12 +980,12 @@`
`980`	`980`	`},`
`981`	`981`	`{`
`982`	`982`	`"command": "git.clean",`
`983`		`- "when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",`
	`983`	`+ "when": "scmProvider == git && scmResourceGroup == workingTree",`
`984`	`984`	`"group": "1_modification"`
`985`	`985`	`},`
`986`	`986`	`{`
`987`	`987`	`"command": "git.clean",`
`988`		`- "when": "scmProvider == git && scmResourceGroup == workingTree && !gitFreshRepository",`
	`988`	`+ "when": "scmProvider == git && scmResourceGroup == workingTree",`
`989`	`989`	`"group": "inline"`
`990`	`990`	`},`
`991`	`991`	`{`