Skip to content

Commit 56cade2

Browse files
authored
Make the guided git.missing welcome view default (microsoft#149668)
1 parent ff744e8 commit 56cade2

File tree

2 files changed

+16
-42
lines changed

2 files changed

+16
-42
lines changed

extensions/git/package.json

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2438,19 +2438,6 @@
24382438
"default": 10000,
24392439
"description": "%config.statusLimit%"
24402440
},
2441-
"git.experimental.installGuide": {
2442-
"type": "string",
2443-
"enum": [
2444-
"default",
2445-
"download"
2446-
],
2447-
"tags": [
2448-
"experimental"
2449-
],
2450-
"scope": "machine",
2451-
"description": "%config.experimental.installGuide%",
2452-
"default": "default"
2453-
},
24542441
"git.repositoryScanIgnoredFolders": {
24552442
"type": "array",
24562443
"items": {
@@ -2629,54 +2616,49 @@
26292616
},
26302617
{
26312618
"view": "scm",
2632-
"contents": "%view.workbench.scm.missing.guide%",
2633-
"when": "config.git.enabled && git.missing && config.git.experimental.installGuide == download"
2634-
},
2635-
{
2636-
"view": "scm",
2637-
"contents": "%view.workbench.scm.missing.guide.mac%",
2638-
"when": "config.git.enabled && git.missing && config.git.experimental.installGuide == download && isMac"
2619+
"contents": "%view.workbench.scm.missing%",
2620+
"when": "config.git.enabled && git.missing"
26392621
},
26402622
{
26412623
"view": "scm",
2642-
"contents": "%view.workbench.scm.missing.guide.windows%",
2643-
"when": "config.git.enabled && git.missing && config.git.experimental.installGuide == download && isWindows"
2624+
"contents": "%view.workbench.scm.missing.mac%",
2625+
"when": "config.git.enabled && git.missing && isMac"
26442626
},
26452627
{
26462628
"view": "scm",
2647-
"contents": "%view.workbench.scm.missing.guide.linux%",
2648-
"when": "config.git.enabled && git.missing && config.git.experimental.installGuide == download && isLinux"
2629+
"contents": "%view.workbench.scm.missing.windows%",
2630+
"when": "config.git.enabled && git.missing && isWindows"
26492631
},
26502632
{
26512633
"view": "scm",
2652-
"contents": "%view.workbench.scm.missing%",
2653-
"when": "config.git.enabled && git.missing && config.git.experimental.installGuide == default"
2634+
"contents": "%view.workbench.scm.missing.linux%",
2635+
"when": "config.git.enabled && git.missing && isLinux"
26542636
},
26552637
{
26562638
"view": "scm",
26572639
"contents": "%view.workbench.scm.empty%",
2658-
"when": "config.git.enabled && workbenchState == empty",
2640+
"when": "config.git.enabled && !git.missing && workbenchState == empty",
26592641
"enablement": "git.state == initialized",
26602642
"group": "2_open@1"
26612643
},
26622644
{
26632645
"view": "scm",
26642646
"contents": "%view.workbench.scm.folder%",
2665-
"when": "config.git.enabled && workbenchState == folder",
2647+
"when": "config.git.enabled && !git.missing && workbenchState == folder",
26662648
"enablement": "git.state == initialized",
26672649
"group": "5_scm@1"
26682650
},
26692651
{
26702652
"view": "scm",
26712653
"contents": "%view.workbench.scm.workspace%",
2672-
"when": "config.git.enabled && workbenchState == workspace && workspaceFolderCount != 0",
2654+
"when": "config.git.enabled && !git.missing && workbenchState == workspace && workspaceFolderCount != 0",
26732655
"enablement": "git.state == initialized",
26742656
"group": "5_scm@1"
26752657
},
26762658
{
26772659
"view": "scm",
26782660
"contents": "%view.workbench.scm.emptyWorkspace%",
2679-
"when": "config.git.enabled && workbenchState == workspace && workspaceFolderCount == 0",
2661+
"when": "config.git.enabled && !git.missing && workbenchState == workspace && workspaceFolderCount == 0",
26802662
"enablement": "git.state == initialized",
26812663
"group": "2_open@1"
26822664
},

extensions/git/package.nls.json

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -264,39 +264,31 @@
264264
"colors.ignored": "Color for ignored resources.",
265265
"colors.conflict": "Color for resources with conflicts.",
266266
"colors.submodule": "Color for submodule resources.",
267-
"view.workbench.scm.missing": {
268-
"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.",
269-
"comment": [
270-
"{Locked='](command:git.showOutput'}",
271-
"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
272-
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
273-
]
274-
},
275-
"view.workbench.scm.missing.guide.windows": {
267+
"view.workbench.scm.missing.windows": {
276268
"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).",
277269
"comment": [
278270
"{Locked='](command:workbench.action.reloadWindow'}",
279271
"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
280272
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
281273
]
282274
},
283-
"view.workbench.scm.missing.guide.mac": {
275+
"view.workbench.scm.missing.mac": {
284276
"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).",
285277
"comment": [
286278
"{Locked='](command:workbench.action.reloadWindow'}",
287279
"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
288280
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
289281
]
290282
},
291-
"view.workbench.scm.missing.guide.linux": {
283+
"view.workbench.scm.missing.linux": {
292284
"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).",
293285
"comment": [
294286
"{Locked='](command:workbench.action.reloadWindow'}",
295287
"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
296288
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
297289
]
298290
},
299-
"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).",
291+
"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).",
300292
"view.workbench.scm.disabled": {
301293
"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).",
302294
"comment": [

0 commit comments

Comments
 (0)