Disables missed commands when GitLens is disabled

Adds repository creation detection when there are no repositories

Author: eamodio

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+### Fixed
+- Fixes issue where GitLens wouldn't detect the creation of a Git repository if there were no other repositories open
+- Fixes issue where some GitLens commands would show in the palette even though there was no repository
+
 ## [7.5.5] - 2018-01-18
 ### Fixed
 - Fixes [#247](https://github.com/eamodio/vscode-gitlens/issues/247) - File annotations button or ESC key does not turn off file annotations

package.json

@@ -1716,6 +1716,10 @@
                     "command": "gitlens.diffLineWithWorking",
                     "when": "gitlens:activeIsBlameable"
                 },
+                {
+                    "command": "gitlens.externalDiff",
+                    "when": "gitlens:enabled"
+                },
                 {
                     "command": "gitlens.externalDiffAll",
                     "when": "gitlens:enabled"
@@ -1760,6 +1764,10 @@
                     "command": "gitlens.showLastQuickPick",
                     "when": "gitlens:enabled"
                 },
+                {
+                    "command": "gitlens.showCommitSearch",
+                    "when": "gitlens:enabled"
+                },
                 {
                     "command": "gitlens.showQuickCommitDetails",
                     "when": "gitlens:activeIsBlameable"
@@ -1836,6 +1844,10 @@
                     "command": "gitlens.stashApply",
                     "when": "gitlens:enabled"
                 },
+                {
+                    "command": "gitlens.stashDelete",
+                    "when": "false"
+                },
                 {
                     "command": "gitlens.stashSave",
                     "when": "gitlens:enabled"
@@ -2002,11 +2014,11 @@
                 },
                 {
                     "command": "gitlens.gitExplorer.switchToHistoryView",
-                    "when": "gitlens:gitExplorer:view == repository"
+                    "when": "gitlens:enabled && gitlens:gitExplorer:view == repository"
                 },
                 {
                     "command": "gitlens.gitExplorer.switchToRepositoryView",
-                    "when": "gitlens:gitExplorer:view == history"
+                    "when": "gitlens:enabled &&  gitlens:gitExplorer:view == history"
                 },
                 {
                     "command": "gitlens.resultsExplorer.clearResultsNode",
@@ -3278,7 +3290,7 @@
                 {
                     "id": "gitlens.gitExplorer",
                     "name": "GitLens",
-                    "when": "gitlens:enabled && gitlens:gitExplorer && gitlens:hasRepository && config.gitlens.gitExplorer.enabled"
+                    "when": "gitlens:enabled && gitlens:gitExplorer && config.gitlens.gitExplorer.enabled"
                 },
                 {
                     "id": "gitlens.resultsExplorer",

src/constants.ts

@@ -40,7 +40,6 @@ export enum CommandContext {
     GitExplorerAutoRefresh = 'gitlens:gitExplorer:autoRefresh',
     GitExplorerView = 'gitlens:gitExplorer:view',
     HasRemotes = 'gitlens:hasRemotes',
-    HasRepository = 'gitlens:hasRepository',
     Key = 'gitlens:key',
     KeyMap = 'gitlens:keymap',
     ResultsExplorer = 'gitlens:resultsExplorer',

src/extension.ts

@@ -22,10 +22,9 @@ export async function activate(context: ExtensionContext) {
     const gitlensVersion = gitlens.packageJSON.version;
 
     const enabled = workspace.getConfiguration('git', null!).get<boolean>('enabled', true);
-    setCommandContext(CommandContext.Enabled, enabled);
-
     if (!enabled) {
         Logger.log(`GitLens(v${gitlensVersion}) was NOT activated -- "git.enabled": false`);
+        setCommandContext(CommandContext.Enabled, enabled);
 
         return;
     }

src/gitService.ts

@@ -257,7 +257,7 @@ export class GitService extends Disposable {
 
     private async updateContext(repositoryTree: TernarySearchTree<Repository>) {
         const hasRepository = repositoryTree.any();
-        await setCommandContext(CommandContext.HasRepository, hasRepository);
+        await setCommandContext(CommandContext.Enabled, hasRepository);
 
         let hasRemotes = false;
         if (hasRepository) {
@@ -268,6 +268,33 @@ export class GitService extends Disposable {
         }
 
         await setCommandContext(CommandContext.HasRemotes, hasRemotes);
+
+        // If we have no repositories setup a watcher in case one is initialized
+        if (!hasRepository) {
+            const watcher = workspace.createFileSystemWatcher('**/.git', false, true, true);
+            const disposable = Disposable.from(
+                watcher,
+                watcher.onDidCreate(async uri => {
+                    const f = workspace.getWorkspaceFolder(uri);
+                    if (f === undefined) return;
+
+                    // Search for and add all repositories (nested and/or submodules)
+                    const repositories = await this.repositorySearch(f);
+                    if (repositories.length === 0) return;
+
+                    disposable.dispose();
+
+                    for (const r of repositories) {
+                        this._repositoryTree.set(r.path, r);
+                    }
+
+                    await this.updateContext(this._repositoryTree);
+
+                    // Defer the event trigger enough to let everything unwind
+                    setImmediate(() => this.fireRepositoriesChanged());
+                }, this)
+            );
+        }
     }
 
     private fireRepositoriesChanged() {

src/system/searchTree.ts

@@ -50,8 +50,8 @@ export class StringIterator implements IKeyIterator {
 
 export class PathIterator implements IKeyIterator {
 
-    private static _fwd = '/'.charCodeAt(0);
-    private static _bwd = '\\'.charCodeAt(0);
+    private static readonly _fwd = '/'.charCodeAt(0);
+    private static readonly _bwd = '\\'.charCodeAt(0);
 
     private _value: string;
     private _from: number;
@@ -153,7 +153,7 @@ export class TernarySearchTree<E> {
         this._root = undefined;
     }
 
-    set(key: string, element: E): void {
+    set(key: string, element: E): E | undefined {
         const iter = this._iter.reset(key);
         let node: TernarySearchTreeNode<E>;
 
@@ -193,7 +193,9 @@ export class TernarySearchTree<E> {
                 break;
             }
         }
+        const oldElement = node.element;
         node.element = element;
+        return oldElement;
     }
 
     get(key: string): E | undefined {