ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79 (#14050)

Browse Source 
* Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79

* Fix breaks

* Extension management fixes

* Fix breaks in windows bundling

* Fix/skip failing tests

* Update distro

* Add clear to nuget.config

* Add hygiene task

* Bump distro

* Fix hygiene issue

* Add build to hygiene exclusion

* Update distro

* Update hygiene

* Hygiene exclusions

* Update tsconfig

* Bump distro for server breaks

* Update build config

* Update darwin path

* Add done calls to notebook tests

* Skip failing tests

* Disable smoke tests
This commit is contained in:
Karl Burtram
2021-02-09 16:15:05 -08:00
committed by GitHub
parent 6f192f9af5
commit ce612a3d96
1929 changed files with 68012 additions and 34564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

291
extensions/git/package.json
View File

@@ -22,6 +22,7 @@
"scripts": {
"compile": "gulp compile-extension:git",
"watch": "gulp watch-extension:git",
"update-emoji": "node ./build/update-emoji.js",
"update-grammar": "node ./build/update-grammars.js",
"test": "mocha"
},
@@ -37,6 +38,11 @@
"title": "%command.clone%",
"category": "Git"
},
{
"command": "git.cloneRecursive",
"title": "%command.cloneRecursive%",
"category": "Git"
},
{
"command": "git.init",
"title": "%command.init%",
@@ -175,6 +181,12 @@
"category": "Git",
"icon": "$(discard)"
},
{
"command": "git.rename",
"title": "%command.rename%",
"category": "Git",
"icon": "$(discard)"
},
{
"command": "git.commit",
"title": "%command.commit%",
@@ -272,6 +284,11 @@
"title": "%command.checkout%",
"category": "Git"
},
{
"command": "git.checkoutDetached",
"title": "%command.checkoutDetached%",
"category": "Git"
},
{
"command": "git.branch",
"title": "%command.branch%",
@@ -297,6 +314,11 @@
"title": "%command.merge%",
"category": "Git"
},
{
"command": "git.rebase",
"title": "%command.rebase%",
"category": "Git"
},
{
"command": "git.createTag",
"title": "%command.createTag%",
@@ -357,6 +379,11 @@
"title": "%command.pushToForce%",
"category": "Git"
},
{
"command": "git.pushTags",
"title": "%command.pushTags%",
"category": "Git"
},
{
"command": "git.pushWithTags",
"title": "%command.pushFollowTags%",
@@ -367,6 +394,11 @@
"title": "%command.pushFollowTagsForce%",
"category": "Git"
},
{
"command": "git.cherryPick",
"title": "%command.cherryPick%",
"category": "Git"
},
{
"command": "git.addRemote",
"title": "%command.addRemote%",
@@ -494,6 +526,10 @@
"command": "git.clone",
"when": "config.git.enabled && !git.missing"
},
{
"command": "git.cloneRecursive",
"when": "config.git.enabled && !git.missing"
},
{
"command": "git.init",
"when": "config.git.enabled && !git.missing"
@@ -590,6 +626,10 @@
"command": "git.cleanAllUntracked",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
},
{
"command": "git.rename",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && resourceScheme == file"
},
{
"command": "git.commit",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
@@ -622,6 +662,10 @@
"command": "git.commitAllAmend",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
},
{
"command": "git.rebaseAbort",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && gitRebaseInProgress"
},
{
"command": "git.commitNoVerify",
"when": "config.git.enabled && !git.missing && config.git.allowNoVerifyCommit && gitOpenRepositoryCount != 0"
@@ -686,6 +730,10 @@
"command": "git.renameBranch",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
},
{
"command": "git.cherryPick",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
},
{
"command": "git.pull",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
@@ -702,6 +750,10 @@
"command": "git.merge",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
},
{
"command": "git.rebase",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
},
{
"command": "git.createTag",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
@@ -746,6 +798,10 @@
"command": "git.pushWithTagsForce",
"when": "config.git.enabled && !git.missing && config.git.allowForcePush && gitOpenRepositoryCount != 0"
},
{
"command": "git.pushTags",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
},
{
"command": "git.addRemote",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
@@ -876,6 +932,11 @@
"group": "2_main@6",
"when": "scmProvider == git"
},
{
"submenu": "git.tags",
"group": "2_main@7",
"when": "scmProvider == git"
},
{
"command": "git.showOutput",
"group": "3_footer",
@@ -1251,17 +1312,17 @@
{
"command": "git.stageSelectedRanges",
"group": "2_git@1",
"when": "isInDiffRightEditor && config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
"when": "isInDiffRightEditor && !isInEmbeddedDiffEditor && config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
},
{
"command": "git.unstageSelectedRanges",
"group": "2_git@2",
"when": "isInDiffRightEditor && config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
"when": "isInDiffRightEditor && !isInEmbeddedDiffEditor && config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
},
{
"command": "git.revertSelectedRanges",
"group": "2_git@3",
"when": "isInDiffRightEditor && config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
"when": "isInDiffRightEditor && !isInEmbeddedDiffEditor && config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
}
],
"scm/change/title": [
@@ -1366,114 +1427,145 @@
],
"git.changes": [
{
"command": "git.stageAll"
"command": "git.stageAll",
"group": "changes@1"
},
{
"command": "git.unstageAll"
"command": "git.unstageAll",
"group": "changes@2"
},
{
"command": "git.cleanAll"
"command": "git.cleanAll",
"group": "changes@3"
}
],
"git.pullpush": [
{
"command": "git.sync",
"group": "1_sync"
"group": "1_sync@1"
},
{
"command": "git.syncRebase",
"when": "gitState == idle",
"group": "1_sync"
"group": "1_sync@2"
},
{
"command": "git.pull",
"group": "2_pull"
"group": "2_pull@1"
},
{
"command": "git.pullRebase",
"group": "2_pull"
"group": "2_pull@2"
},
{
"command": "git.pullFrom",
"group": "2_pull"
"group": "2_pull@3"
},
{
"command": "git.push",
"group": "3_push"
"group": "3_push@1"
},
{
"command": "git.pushForce",
"when": "config.git.allowForcePush",
"group": "3_push"
"group": "3_push@2"
},
{
"command": "git.pushTo",
"group": "3_push"
"group": "3_push@3"
},
{
"command": "git.pushToForce",
"when": "config.git.allowForcePush",
"group": "3_push"
"group": "3_push@4"
},
{
"command": "git.fetch",
"group": "4_fetch"
"group": "4_fetch@1"
},
{
"command": "git.fetchPrune",
"group": "4_fetch"
"group": "4_fetch@2"
},
{
"command": "git.fetchAll",
"group": "4_fetch"
"group": "4_fetch@3"
}
],
"git.branch": [
{
"command": "git.merge"
"command": "git.merge",
"group": "branch@1"
},
{
"command": "git.branch"
"command": "git.rebase",
"group": "branch@2"
},
{
"command": "git.branchFrom"
"command": "git.branch",
"group": "branch@3"
},
{
"command": "git.renameBranch"
"command": "git.branchFrom",
"group": "branch@4"
},
{
"command": "git.publish"
"command": "git.renameBranch",
"group": "branch@5"
},
{
"command": "git.publish",
"group": "branch@6"
}
],
"git.remotes": [
{
"command": "git.addRemote"
"command": "git.addRemote",
"group": "remote@1"
},
{
"command": "git.removeRemote"
"command": "git.removeRemote",
"group": "remote@2"
}
],
"git.stash": [
{
"command": "git.stash"
"command": "git.stash",
"group": "stash@1"
},
{
"command": "git.stashIncludeUntracked"
"command": "git.stashIncludeUntracked",
"group": "stash@2"
},
{
"command": "git.stashApplyLatest"
"command": "git.stashApplyLatest",
"group": "stash@3"
},
{
"command": "git.stashApply"
"command": "git.stashApply",
"group": "stash@4"
},
{
"command": "git.stashPopLatest"
"command": "git.stashPopLatest",
"group": "stash@5"
},
{
"command": "git.stashPop"
"command": "git.stashPop",
"group": "stash@6"
},
{
"command": "git.stashDrop"
"command": "git.stashDrop",
"group": "stash@7"
}
],
"git.tags": [
{
"command": "git.createTag",
"group": "tags@1"
},
{
"command": "git.deleteTag",
"group": "tags@2"
}
]
},
@@ -1501,6 +1593,10 @@
{
"id": "git.stash",
"label": "%submenu.stash%"
},
{
"id": "git.tags",
"label": "%submenu.tags%"
}
],
"configuration": {
@@ -1594,21 +1690,27 @@
"scope": "resource"
},
"git.checkoutType": {
"type": "string",
"enum": [
"all",
"local",
"tags",
"remote"
],
"enumDescriptions": [
"%config.checkoutType.all%",
"%config.checkoutType.local%",
"%config.checkoutType.tags%",
"%config.checkoutType.remote%"
],
"type": "array",
"items": {
"type": "string",
"enum": [
"local",
"tags",
"remote"
],
"enumDescriptions": [
"%config.checkoutType.local%",
"%config.checkoutType.tags%",
"%config.checkoutType.remote%"
]
},
"uniqueItems": true,
"markdownDescription": "%config.checkoutType%",
"default": "all"
"default": [
"local",
"remote",
"tags"
]
},
"git.ignoreLegacyWarning": {
"type": "boolean",
@@ -1636,6 +1738,7 @@
"null"
],
"default": null,
"scope": "machine",
"description": "%config.defaultCloneDirectory%"
},
"git.enableSmartCommit": {
@@ -1687,6 +1790,28 @@
"description": "%config.enableStatusBarSync%",
"scope": "resource"
},
"git.followTagsWhenSync": {
"type": "boolean",
"scope": "resource",
"default": false,
"description": "%config.followTagsWhenSync%"
},
"git.promptToSaveFilesBeforeStash": {
"type": "string",
"enum": [
"always",
"staged",
"never"
],
"enumDescriptions": [
"%config.promptToSaveFilesBeforeStash.always%",
"%config.promptToSaveFilesBeforeStash.staged%",
"%config.promptToSaveFilesBeforeStash.never%"
],
"scope": "resource",
"default": "always",
"description": "%config.promptToSaveFilesBeforeStash%"
},
"git.promptToSaveFilesBeforeCommit": {
"type": "string",
"enum": [
@@ -1719,6 +1844,23 @@
"scope": "resource",
"default": "none"
},
"git.openAfterClone": {
"type": "string",
"enum": [
"always",
"alwaysNewWindow",
"whenNoFolderOpen",
"prompt"
],
"enumDescriptions": [
"%config.openAfterClone.always%",
"%config.openAfterClone.alwaysNewWindow%",
"%config.openAfterClone.whenNoFolderOpen%",
"%config.openAfterClone.prompt%"
],
"default": "prompt",
"description": "%config.openAfterClone%"
},
"git.showInlineOpenFileAction": {
"type": "boolean",
"default": true,
@@ -1776,6 +1918,12 @@
"default": false,
"description": "%config.alwaysSignOff%"
},
"git.ignoreSubmodules": {
"type": "boolean",
"scope": "resource",
"default": false,
"description": "%config.ignoreSubmodules%"
},
"git.ignoredRepositories": {
"type": "array",
"items": {
@@ -1812,6 +1960,12 @@
"default": false,
"description": "%config.fetchOnPull%"
},
"git.pruneOnFetch": {
"type": "boolean",
"scope": "resource",
"default": false,
"description": "%config.pruneOnFetch%"
},
"git.pullTags": {
"type": "boolean",
"scope": "resource",
@@ -1898,8 +2052,33 @@
"default": true,
"description": "%config.terminalAuthentication%"
},
"git.useCommitInputAsStashMessage": {
"type": "boolean",
"scope": "resource",
"default": false,
"description": "%config.useCommitInputAsStashMessage%"
},
"git.githubAuthentication": {
"deprecationMessage": "This setting is now deprecated, please use `github.gitAuthentication` instead."
},
"git.timeline.date": {
"enum": [
"committed",
"authored"
],
"enumDescriptions": [
"%config.timeline.date.committed%",
"%config.timeline.date.authored%"
],
"default": "committed",
"description": "%config.timeline.date%",
"scope": "window"
},
"git.timeline.showAuthor": {
"type": "boolean",
"default": true,
"description": "%config.timeline.showAuthor%",
"scope": "window"
}
}
},
@@ -2065,27 +2244,37 @@
{
"view": "scm",
"contents": "%view.workbench.scm.empty%",
"when": "config.git.enabled && git.state == initialized && workbenchState == empty"
"when": "config.git.enabled && workbenchState == empty",
"enablement": "git.state == initialized",
"group": "2_open@1"
},
{
"view": "scm",
"contents": "%view.workbench.scm.folder%",
"when": "config.git.enabled && git.state == initialized && workbenchState == folder"
"when": "config.git.enabled && workbenchState == folder",
"enablement": "git.state == initialized",
"group": "5_scm@1"
},
{
"view": "scm",
"contents": "%view.workbench.scm.workspace%",
"when": "config.git.enabled && git.state == initialized && workbenchState == workspace && workspaceFolderCount != 0"
"when": "config.git.enabled && workbenchState == workspace && workspaceFolderCount != 0",
"enablement": "git.state == initialized",
"group": "5_scm@1"
},
{
"view": "scm",
"contents": "%view.workbench.scm.emptyWorkspace%",
"when": "config.git.enabled && git.state == initialized && workbenchState == workspace && workspaceFolderCount == 0"
"when": "config.git.enabled && workbenchState == workspace && workspaceFolderCount == 0",
"enablement": "git.state == initialized",
"group": "2_open@1"
},
{
"view": "explorer",
"contents": "%view.workbench.cloneRepository%",
"when": "config.git.enabled && git.state == initialized"
"when": "config.git.enabled",
"enablement": "git.state == initialized",
"group": "5_scm@1"
}
]
},