Adds error message for #318

Author: eamodio

CHANGELOG.md

@@ -4,6 +4,10 @@ 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]
+### Added
+- Adds a visible error message for when Git is disabled (`"git.enabled": false`) — for [#318](https://github.com/eamodio/vscode-gitlens/issues/318)
+
 ## [8.2.3] - 2018-04-21
 ### Fixed
 - Fixes [#313](https://github.com/eamodio/vscode-gitlens/issues/313) - Unable to show branch history for branch that matches file or folder name

package.json

@@ -1019,6 +1019,7 @@
                         "suppressCommitHasNoPreviousCommitWarning": false,
                         "suppressCommitNotFoundWarning": false,
                         "suppressFileNotUnderSourceControlWarning": false,
+                        "suppressGitDisabledWarning": false,
                         "suppressGitVersionWarning": false,
                         "suppressLineUncommittedWarning": false,
                         "suppressNoRepositoryWarning": false,
@@ -1038,6 +1039,10 @@
                             "type": "boolean",
                             "default": false
                         },
+                        "suppressGitDisabledWarning": {
+                            "type": "boolean",
+                            "default": false
+                        },
                         "suppressGitVersionWarning": {
                             "type": "boolean",
                             "default": false

src/extension.ts

@@ -9,6 +9,7 @@ export enum SuppressedMessages {
     CommitHasNoPreviousCommitWarning = 'suppressCommitHasNoPreviousCommitWarning',
     CommitNotFoundWarning = 'suppressCommitNotFoundWarning',
     FileNotUnderSourceControlWarning = 'suppressFileNotUnderSourceControlWarning',
+    GitDisabledWarning = 'suppressGitDisabledWarning',
     GitVersionWarning = 'suppressGitVersionWarning',
     LineUncommittedWarning = 'suppressLineUncommittedWarning',
     NoRepositoryWarning = 'suppressNoRepositoryWarning',
@@ -31,6 +32,14 @@ export class Messages {
         return Messages.showMessage('warn', `${message}. The file is probably not under source control.`, SuppressedMessages.FileNotUnderSourceControlWarning);
     }
 
+    static showGitDisabledErrorMessage() {
+        return Messages.showMessage('error', `GitLens requires Git to be enabled. Please re-enable Git \u2014 set \`git.enabled\` to true and reload`, SuppressedMessages.GitDisabledWarning);
+    }
+
+    static showGitVersionUnsupportedErrorMessage(version: string): Promise<MessageItem | undefined> {
+        return Messages.showMessage('error', `GitLens requires a newer version of Git (>= 2.2.0) than is currently installed (${version}). Please install a more recent version of Git.`, SuppressedMessages.GitVersionWarning);
+    }
+
     static async showKeyBindingsInfoMessage(): Promise<MessageItem | undefined> {
         if (Container.config.advanced.messages.suppressShowKeyBindingsNotice) return undefined;
 
@@ -78,10 +87,6 @@ export class Messages {
         return Messages.showMessage('info', `If you can't find your results, click on "GITLENS RESULTS" at the bottom of the Explorer view.`, SuppressedMessages.ResultsExplorerNotice, null);
     }
 
-    static showUnsupportedGitVersionErrorMessage(version: string): Promise<MessageItem | undefined> {
-        return Messages.showMessage('error', `GitLens requires a newer version of Git (>= 2.2.0) than is currently installed (${version}). Please install a more recent version of Git.`, SuppressedMessages.GitVersionWarning);
-    }
-
     private static async showMessage<T extends MessageItem>(type: 'info' | 'warn' | 'error', message: string, suppressionKey: SuppressedMessages, dontShowAgain: T | null = { title: 'Don\'t Show Again' } as T, ...actions: T[]): Promise<T | undefined> {
         Logger.log(`ShowMessage(${type}, '${message}', ${suppressionKey}, ${dontShowAgain})`);