diff --git a/extensions/git/package.json b/extensions/git/package.json index 7e4cc563f34..0bec01c30a5 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -2438,19 +2438,6 @@ "default": 10000, "description": "%config.statusLimit%" }, - "git.experimental.installGuide": { - "type": "string", - "enum": [ - "default", - "download" - ], - "tags": [ - "experimental" - ], - "scope": "machine", - "description": "%config.experimental.installGuide%", - "default": "default" - }, "git.repositoryScanIgnoredFolders": { "type": "array", "items": { @@ -2627,56 +2614,51 @@ "contents": "%view.workbench.scm.disabled%", "when": "!config.git.enabled" }, - { - "view": "scm", - "contents": "%view.workbench.scm.missing.guide%", - "when": "config.git.enabled && git.missing && config.git.experimental.installGuide == download" - }, - { - "view": "scm", - "contents": "%view.workbench.scm.missing.guide.mac%", - "when": "config.git.enabled && git.missing && config.git.experimental.installGuide == download && isMac" - }, - { - "view": "scm", - "contents": "%view.workbench.scm.missing.guide.windows%", - "when": "config.git.enabled && git.missing && config.git.experimental.installGuide == download && isWindows" - }, - { - "view": "scm", - "contents": "%view.workbench.scm.missing.guide.linux%", - "when": "config.git.enabled && git.missing && config.git.experimental.installGuide == download && isLinux" - }, { "view": "scm", "contents": "%view.workbench.scm.missing%", - "when": "config.git.enabled && git.missing && config.git.experimental.installGuide == default" + "when": "config.git.enabled && git.missing" + }, + { + "view": "scm", + "contents": "%view.workbench.scm.missing.mac%", + "when": "config.git.enabled && git.missing && isMac" + }, + { + "view": "scm", + "contents": "%view.workbench.scm.missing.windows%", + "when": "config.git.enabled && git.missing && isWindows" + }, + { + "view": "scm", + "contents": "%view.workbench.scm.missing.linux%", + "when": "config.git.enabled && git.missing && isLinux" }, { "view": "scm", "contents": "%view.workbench.scm.empty%", - "when": "config.git.enabled && workbenchState == empty", + "when": "config.git.enabled && !git.missing && workbenchState == empty", "enablement": "git.state == initialized", "group": "2_open@1" }, { "view": "scm", "contents": "%view.workbench.scm.folder%", - "when": "config.git.enabled && workbenchState == folder", + "when": "config.git.enabled && !git.missing && workbenchState == folder", "enablement": "git.state == initialized", "group": "5_scm@1" }, { "view": "scm", "contents": "%view.workbench.scm.workspace%", - "when": "config.git.enabled && workbenchState == workspace && workspaceFolderCount != 0", + "when": "config.git.enabled && !git.missing && workbenchState == workspace && workspaceFolderCount != 0", "enablement": "git.state == initialized", "group": "5_scm@1" }, { "view": "scm", "contents": "%view.workbench.scm.emptyWorkspace%", - "when": "config.git.enabled && workbenchState == workspace && workspaceFolderCount == 0", + "when": "config.git.enabled && !git.missing && workbenchState == workspace && workspaceFolderCount == 0", "enablement": "git.state == initialized", "group": "2_open@1" }, diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json index e632bb47202..2d6c88e59e1 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json @@ -264,15 +264,7 @@ "colors.ignored": "Color for ignored resources.", "colors.conflict": "Color for resources with conflicts.", "colors.submodule": "Color for submodule resources.", - "view.workbench.scm.missing": { - "message": "A valid git installation was not detected, more details can be found in the [git output](command:git.showOutput).\nPlease [install git](https://git-scm.com/), or learn more about how to use git and source control in VS Code in [our docs](https://aka.ms/vscode-scm).\nIf you're using a different version control system, you can [search the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22) for additional extensions.", - "comment": [ - "{Locked='](command:git.showOutput'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" - ] - }, - "view.workbench.scm.missing.guide.windows": { + "view.workbench.scm.missing.windows": { "message": "[Download Git for Windows](https://git-scm.com/download/win)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).", "comment": [ "{Locked='](command:workbench.action.reloadWindow'}", @@ -280,7 +272,7 @@ "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" ] }, - "view.workbench.scm.missing.guide.mac": { + "view.workbench.scm.missing.mac": { "message": "[Download Git for macOS](https://git-scm.com/download/mac)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).", "comment": [ "{Locked='](command:workbench.action.reloadWindow'}", @@ -288,7 +280,7 @@ "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" ] }, - "view.workbench.scm.missing.guide.linux": { + "view.workbench.scm.missing.linux": { "message": "Source control depends on Git being installed.\n[Download Git for Linux](https://git-scm.com/download/linux)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).", "comment": [ "{Locked='](command:workbench.action.reloadWindow'}", @@ -296,7 +288,7 @@ "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" ] }, - "view.workbench.scm.missing.guide": "Install Git, a popular source control system, to track code changes and collaborate with others. Learn more in our [Git guides](https://aka.ms/vscode-scm).", + "view.workbench.scm.missing": "Install Git, a popular source control system, to track code changes and collaborate with others. Learn more in our [Git guides](https://aka.ms/vscode-scm).", "view.workbench.scm.disabled": { "message": "If you would like to use git features, please enable git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", "comment": [