ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-27 17:23:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode merge-base (#22780)

Browse Source 
* Revert "Revert "Merge from vscode merge-base (#22769)" (#22779)"

This reverts commit 47a1745180.

* Fix notebook download task

* Remove done call from extensions-ci
This commit is contained in:
Karl Burtram
2023-04-19 21:48:46 -07:00
committed by GitHub
parent decbe8dded
commit e7d3d047ec
2389 changed files with 92155 additions and 42602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

394
extensions/git/package.json
View File

@@ -8,13 +8,15 @@
"engines": {
"vscode": "^1.5.0"
},
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
"aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
"enabledApiProposals": [
"diffCommand",
"contribMergeEditorToolbar",
"contribViewsWelcome",
"scmActionButton",
"scmSelectedProvider",
"scmValidation",
"tabInputTextMerge",
"timeline"
],
"categories": [
@@ -22,7 +24,8 @@
],
"activationEvents": [
"*",
"onFileSystem:git"
"onFileSystem:git",
"onFileSystem:git-show"
],
"extensionDependencies": [
"vscode.git-base"
@@ -211,82 +214,110 @@
"command": "git.commit",
"title": "%command.commit%",
"category": "Git",
"icon": "$(check)"
"icon": "$(check)",
"enablement": "!commitInProgress"
},
{
"command": "git.commitStaged",
"title": "%command.commitStaged%",
"category": "Git"
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.commitEmpty",
"title": "%command.commitEmpty%",
"category": "Git"
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.commitStagedSigned",
"title": "%command.commitStagedSigned%",
"category": "Git"
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.commitStagedAmend",
"title": "%command.commitStagedAmend%",
"category": "Git"
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.commitAll",
"title": "%command.commitAll%",
"category": "Git"
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.commitAllSigned",
"title": "%command.commitAllSigned%",
"category": "Git"
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.commitAllAmend",
"title": "%command.commitAllAmend%",
"category": "Git"
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.commitNoVerify",
"title": "%command.commitNoVerify%",
"category": "Git",
"icon": "$(check)"
"icon": "$(check)",
"enablement": "!commitInProgress"
},
{
"command": "git.commitStagedNoVerify",
"title": "%command.commitStagedNoVerify%",
"category": "Git"
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.commitEmptyNoVerify",
"title": "%command.commitEmptyNoVerify%",
"category": "Git"
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.commitStagedSignedNoVerify",
"title": "%command.commitStagedSignedNoVerify%",
"category": "Git"
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.commitStagedAmendNoVerify",
"title": "%command.commitStagedAmendNoVerify%",
"category": "Git"
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.commitAllNoVerify",
"title": "%command.commitAllNoVerify%",
"category": "Git"
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.commitAllSignedNoVerify",
"title": "%command.commitAllSignedNoVerify%",
"category": "Git"
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.commitAllAmendNoVerify",
"title": "%command.commitAllAmendNoVerify%",
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.commitMessageAccept",
"title": "%command.commitMessageAccept%",
"icon": "$(check)",
"category": "Git"
},
{
"command": "git.commitMessageDiscard",
"title": "%command.commitMessageDiscard%",
"icon": "$(discard)",
"category": "Git"
},
{
@@ -297,7 +328,8 @@
{
"command": "git.undoCommit",
"title": "%command.undoCommit%",
"category": "Git"
"category": "Git",
"enablement": "!commitInProgress"
},
{
"command": "git.checkout",
@@ -459,6 +491,21 @@
"title": "%command.revealInExplorer%",
"category": "Git"
},
{
"command": "git.revealFileInOS.linux",
"title": "%command.revealFileInOS.linux%",
"category": "Git"
},
{
"command": "git.revealFileInOS.mac",
"title": "%command.revealFileInOS.mac%",
"category": "Git"
},
{
"command": "git.revealFileInOS.windows",
"title": "%command.revealFileInOS.windows%",
"category": "Git"
},
{
"command": "git.stashIncludeUntracked",
"title": "%command.stashIncludeUntracked%",
@@ -549,6 +596,12 @@
"command": "git.api.getRemoteSources",
"title": "%command.api.getRemoteSources%",
"category": "Git API"
},
{
"command": "git.acceptMerge",
"title": "%command.git.acceptMerge%",
"category": "Git",
"enablement": "isMergeEditor && mergeEditorResultUri in git.mergeChanges"
}
],
"keybindings": [
@@ -757,10 +810,30 @@
"command": "git.restoreCommitTemplate",
"when": "false"
},
{
"command": "git.commitMessageAccept",
"when": "false"
},
{
"command": "git.commitMessageDiscard",
"when": "false"
},
{
"command": "git.revealInExplorer",
"when": "false"
},
{
"command": "git.revealFileInOS.linux",
"when": "false"
},
{
"command": "git.revealFileInOS.mac",
"when": "false"
},
{
"command": "git.revealFileInOS.windows",
"when": "false"
},
{
"command": "git.undoCommit",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
@@ -1211,7 +1284,22 @@
{
"command": "git.revealInExplorer",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "2_view"
"group": "2_view@1"
},
{
"command": "git.revealFileInOS.linux",
"when": "scmProvider == git && scmResourceGroup == merge && remoteName == '' && isLinux",
"group": "2_view@2"
},
{
"command": "git.revealFileInOS.mac",
"when": "scmProvider == git && scmResourceGroup == merge && remoteName == '' && isMac",
"group": "2_view@2"
},
{
"command": "git.revealFileInOS.windows",
"when": "scmProvider == git && scmResourceGroup == merge && remoteName == '' && isWindows",
"group": "2_view@2"
},
{
"command": "git.openFile2",
@@ -1251,7 +1339,22 @@
{
"command": "git.revealInExplorer",
"when": "scmProvider == git && scmResourceGroup == index",
"group": "2_view"
"group": "2_view@1"
},
{
"command": "git.revealFileInOS.linux",
"when": "scmProvider == git && scmResourceGroup == index && remoteName == '' && isLinux",
"group": "2_view@2"
},
{
"command": "git.revealFileInOS.mac",
"when": "scmProvider == git && scmResourceGroup == index && remoteName == '' && isMac",
"group": "2_view@2"
},
{
"command": "git.revealFileInOS.windows",
"when": "scmProvider == git && scmResourceGroup == index && remoteName == '' && isWindows",
"group": "2_view@2"
},
{
"command": "git.openFile2",
@@ -1316,7 +1419,22 @@
{
"command": "git.revealInExplorer",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "2_view"
"group": "2_view@1"
},
{
"command": "git.revealFileInOS.linux",
"when": "scmProvider == git && scmResourceGroup == workingTree && remoteName == '' && isLinux",
"group": "2_view@2"
},
{
"command": "git.revealFileInOS.mac",
"when": "scmProvider == git && scmResourceGroup == workingTree && remoteName == '' && isMac",
"group": "2_view@2"
},
{
"command": "git.revealFileInOS.windows",
"when": "scmProvider == git && scmResourceGroup == workingTree && remoteName == '' && isWindows",
"group": "2_view@2"
},
{
"command": "git.openChange",
@@ -1383,7 +1501,17 @@
{
"command": "git.openChange",
"group": "navigation",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && !isInDiffEditor && resourceScheme == file && scmActiveResourceHasChanges"
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && !isInDiffEditor && !isMergeEditor && resourceScheme == file && scmActiveResourceHasChanges"
},
{
"command": "git.commitMessageAccept",
"group": "navigation",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit && commitInProgress"
},
{
"command": "git.commitMessageDiscard",
"group": "navigation",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit && commitInProgress"
},
{
"command": "git.stageSelectedRanges",
@@ -1418,6 +1546,12 @@
"when": "isInDiffRightEditor && !isInEmbeddedDiffEditor && config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
}
],
"merge/toolbar": [
{
"command": "git.acceptMerge",
"when": "isMergeEditor && mergeEditorBaseUri =~ /^(git|file):/ && mergeEditorResultUri in git.mergeChanges"
}
],
"scm/change/title": [
{
"command": "git.stageChange",
@@ -1777,6 +1911,37 @@
"markdownDescription": "%config.autofetchPeriod%",
"default": 180
},
"git.branchPrefix": {
"type": "string",
"description": "%config.branchPrefix%",
"default": "",
"scope": "resource"
},
"git.branchProtection": {
"type": "array",
"markdownDescription": "%config.branchProtection%",
"items": {
"type": "string"
},
"default": [],
"scope": "resource"
},
"git.branchProtectionPrompt": {
"type": "string",
"description": "%config.branchProtectionPrompt%",
"enum": [
"alwaysCommit",
"alwaysCommitToNewBranch",
"alwaysPrompt"
],
"enumDescriptions": [
"%config.branchProtectionPrompt.alwaysCommit%",
"%config.branchProtectionPrompt.alwaysCommitToNewBranch%",
"%config.branchProtectionPrompt.alwaysPrompt%"
],
"default": "alwaysPrompt",
"scope": "resource"
},
"git.branchValidationRegex": {
"type": "string",
"description": "%config.branchValidationRegex%",
@@ -1787,6 +1952,38 @@
"description": "%config.branchWhitespaceChar%",
"default": "-"
},
"git.branchRandomName.enable": {
"type": "boolean",
"description": "%config.branchRandomNameEnable%",
"default": false,
"scope": "resource"
},
"git.branchRandomName.dictionary": {
"type": "array",
"markdownDescription": "%config.branchRandomNameDictionary%",
"items": {
"type": "string",
"enum": [
"adjectives",
"animals",
"colors",
"numbers"
],
"enumDescriptions": [
"%config.branchRandomNameDictionary.adjectives%",
"%config.branchRandomNameDictionary.animals%",
"%config.branchRandomNameDictionary.colors%",
"%config.branchRandomNameDictionary.numbers%"
]
},
"minItems": 1,
"maxItems": 5,
"default": [
"adjectives",
"animals"
],
"scope": "resource"
},
"git.confirmSync": {
"type": "boolean",
"description": "%config.confirmSync%",
@@ -1865,6 +2062,17 @@
"scope": "machine",
"description": "%config.defaultCloneDirectory%"
},
"git.useEditorAsCommitInput": {
"type": "boolean",
"description": "%config.useEditorAsCommitInput%",
"default": true
},
"git.verboseCommit": {
"type": "boolean",
"scope": "resource",
"markdownDescription": "%config.verboseCommit%",
"default": false
},
"git.enableSmartCommit": {
"type": "boolean",
"scope": "resource",
@@ -2173,7 +2381,8 @@
"git.requireGitUserConfig": {
"type": "boolean",
"description": "%config.requireGitUserConfig%",
"default": true
"default": true,
"scope": "resource"
},
"git.showCommitInput": {
"type": "boolean",
@@ -2183,10 +2392,14 @@
},
"git.terminalAuthentication": {
"type": "boolean",
"scope": "resource",
"default": true,
"description": "%config.terminalAuthentication%"
},
"git.terminalGitEditor": {
"type": "boolean",
"default": false,
"description": "%config.terminalGitEditor%"
},
"git.useCommitInputAsStashMessage": {
"type": "boolean",
"scope": "resource",
@@ -2227,20 +2440,29 @@
"description": "%config.timeline.showUncommitted%",
"scope": "window"
},
"git.showUnpublishedCommitsButton": {
"type": "string",
"enum": [
"always",
"whenEmpty",
"never"
],
"enumDescriptions": [
"%config.showUnpublishedCommitsButton.always%",
"%config.showUnpublishedCommitsButton.whenEmpty%",
"%config.showUnpublishedCommitsButton.never%"
],
"default": "whenEmpty",
"description": "%config.showUnpublishedCommitsButton%",
"git.showActionButton": {
"type": "object",
"additionalProperties": false,
"description": "%config.showActionButton%",
"properties": {
"commit": {
"type": "boolean",
"description": "%config.showActionButton.commit%"
},
"publish": {
"type": "boolean",
"description": "%config.showActionButton.publish%"
},
"sync": {
"type": "boolean",
"description": "%config.showActionButton.sync%"
}
},
"default": {
"commit": true,
"publish": true,
"sync": true
},
"scope": "resource"
},
"git.statusLimit": {
@@ -2249,19 +2471,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": {
@@ -2285,8 +2494,37 @@
"type": "string"
},
"default": [],
"scope": "resource",
"markdownDescription": "%config.commandsToLog%"
},
"git.logLevel": {
"type": "string",
"default": "Info",
"enum": [
"Trace",
"Debug",
"Info",
"Warning",
"Error",
"Critical",
"Off"
],
"enumDescriptions": [
"%config.logLevel.trace%",
"%config.logLevel.debug%",
"%config.logLevel.info%",
"%config.logLevel.warn%",
"%config.logLevel.error%",
"%config.logLevel.critical%",
"%config.logLevel.off%"
],
"markdownDescription": "%config.logLevel%",
"scope": "window"
},
"git.mergeEditor": {
"type": "boolean",
"default": true,
"markdownDescription": "%config.mergeEditor%",
"scope": "window"
}
}
},
@@ -2297,7 +2535,7 @@
"defaults": {
"light": "#587c0c",
"dark": "#81b88b",
"highContrast": "#1b5225",
"highContrast": "#a1e3ad",
"highContrastLight": "#374e06"
}
},
@@ -2409,56 +2647,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"
},
@@ -2479,11 +2712,13 @@
]
},
"dependencies": {
"@vscode/extension-telemetry": "0.4.10",
"@joaomoreno/unique-names-generator": "5.0.0",
"@vscode/extension-telemetry": "0.6.2",
"@vscode/iconv-lite-umd": "0.7.0",
"byline": "^5.0.0",
"file-type": "16.5.4",
"jschardet": "3.0.0",
"picomatch": "2.3.1",
"vscode-nls": "^4.0.0",
"vscode-uri": "^2.0.0",
"which": "^1.3.0"
@@ -2492,6 +2727,7 @@
"@types/byline": "4.2.31",
"@types/mocha": "^9.1.1",
"@types/node": "16.x",
"@types/picomatch": "2.3.0",
"@types/which": "^1.0.28"
},
"repository": {