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

Merge VS Code 1.30.1 (#4092)

Browse Source
This commit is contained in:
Matt Irvine
2019-02-21 17:17:23 -08:00
committed by GitHub
parent a764a481f3
commit 826856c390
11465 changed files with 119542 additions and 255338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

222
extensions/git/package.json
View File

@@ -190,6 +190,11 @@
"title": "%command.commitStaged%",
"category": "Git"
},
{
"command": "git.commitEmpty",
"title": "%command.commitEmpty%",
"category": "Git"
},
{
"command": "git.commitStagedSigned",
"title": "%command.commitStagedSigned%",
@@ -215,6 +220,11 @@
"title": "%command.commitAllAmend%",
"category": "Git"
},
{
"command": "git.restoreCommitTemplate",
"title": "%command.restoreCommitTemplate%",
"category": "Git"
},
{
"command": "git.undoCommit",
"title": "%command.undoCommit%",
@@ -255,6 +265,16 @@
"title": "%command.fetch%",
"category": "Git"
},
{
"command": "git.fetchPrune",
"title": "%command.fetchPrune%",
"category": "Git"
},
{
"command": "git.fetchAll",
"title": "%command.fetchAll%",
"category": "Git"
},
{
"command": "git.pull",
"title": "%command.pull%",
@@ -275,16 +295,31 @@
"title": "%command.push%",
"category": "Git"
},
{
"command": "git.pushForce",
"title": "%command.pushForce%",
"category": "Git"
},
{
"command": "git.pushTo",
"title": "%command.pushTo%",
"category": "Git"
},
{
"command": "git.pushToForce",
"title": "%command.pushToForce%",
"category": "Git"
},
{
"command": "git.pushWithTags",
"title": "%command.pushWithTags%",
"category": "Git"
},
{
"command": "git.pushWithTagsForce",
"title": "%command.pushWithTagsForce%",
"category": "Git"
},
{
"command": "git.sync",
"title": "%command.sync%",
@@ -329,6 +364,16 @@
"command": "git.stashPopLatest",
"title": "%command.stashPopLatest%",
"category": "Git"
},
{
"command": "git.stashApply",
"title": "%command.stashApply%",
"category": "Git"
},
{
"command": "git.stashApplyLatest",
"title": "%command.stashApplyLatest%",
"category": "Git"
}
],
"menus": {
@@ -441,6 +486,10 @@
"command": "git.commitAllAmend",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.restoreCommitTemplate",
"when": "false"
},
{
"command": "git.undoCommit",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
@@ -489,18 +538,38 @@
"command": "git.fetch",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.fetchPrune",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.fetchAll",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.push",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.pushForce",
"when": "config.git.enabled && config.git.allowForcePush && gitOpenRepositoryCount != 0"
},
{
"command": "git.pushTo",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.pushToForce",
"when": "config.git.enabled && config.git.allowForcePush && gitOpenRepositoryCount != 0"
},
{
"command": "git.pushWithTags",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.pushWithTagsForce",
"when": "config.git.enabled && config.git.allowForcePush && gitOpenRepositoryCount != 0"
},
{
"command": "git.sync",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
@@ -536,6 +605,14 @@
{
"command": "git.stashPopLatest",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.stashApply",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.stashApplyLatest",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
}
],
"scm/title": [
@@ -664,6 +741,16 @@
"group": "5_stash",
"when": "scmProvider == git"
},
{
"command": "git.stashApply",
"group": "5_stash",
"when": "scmProvider == git"
},
{
"command": "git.stashApplyLatest",
"group": "5_stash",
"when": "scmProvider == git"
},
{
"command": "git.showOutput",
"group": "7_repository",
@@ -737,7 +824,12 @@
},
{
"command": "git.openFile2",
"when": "scmProvider == git && scmResourceGroup == merge && config.git.showInlineOpenFileAction",
"when": "scmProvider == git && scmResourceGroup == merge && config.git.showInlineOpenFileAction && config.git.openDiffOnClick",
"group": "inline0"
},
{
"command": "git.openChange",
"when": "scmProvider == git && scmResourceGroup == merge && config.git.showInlineOpenFileAction && !config.git.openDiffOnClick",
"group": "inline0"
},
{
@@ -767,7 +859,12 @@
},
{
"command": "git.openFile2",
"when": "scmProvider == git && scmResourceGroup == index && config.git.showInlineOpenFileAction",
"when": "scmProvider == git && scmResourceGroup == index && config.git.showInlineOpenFileAction && config.git.openDiffOnClick",
"group": "inline0"
},
{
"command": "git.openChange",
"when": "scmProvider == git && scmResourceGroup == index && config.git.showInlineOpenFileAction && !config.git.openDiffOnClick",
"group": "inline0"
},
{
@@ -807,7 +904,12 @@
},
{
"command": "git.openFile2",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.showInlineOpenFileAction",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.showInlineOpenFileAction && config.git.openDiffOnClick",
"group": "inline0"
},
{
"command": "git.openChange",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.showInlineOpenFileAction && !config.git.openDiffOnClick",
"group": "inline0"
},
{
@@ -885,7 +987,7 @@
"string",
"null"
],
"description": "%config.path%",
"markdownDescription": "%config.path%",
"default": null,
"scope": "application"
},
@@ -900,6 +1002,12 @@
"subFolders",
"openEditors"
],
"enumDescriptions": [
"%config.autoRepositoryDetection.true%",
"%config.autoRepositoryDetection.false%",
"%config.autoRepositoryDetection.subFolders%",
"%config.autoRepositoryDetection.openEditors%"
],
"description": "%config.autoRepositoryDetection%",
"default": true
},
@@ -912,7 +1020,19 @@
"type": "boolean",
"description": "%config.autofetch%",
"default": false,
"tags": ["usesOnlineServices"]
"tags": [
"usesOnlineServices"
]
},
"git.branchValidationRegex": {
"type": "string",
"description": "%config.branchValidationRegex%",
"default": ""
},
"git.branchWhitespaceChar": {
"type": "string",
"description": "%config.branchWhitespaceChar%",
"default": "-"
},
"git.confirmSync": {
"type": "boolean",
@@ -948,7 +1068,7 @@
"%config.checkoutType.tags%",
"%config.checkoutType.remote%"
],
"description": "%config.checkoutType%",
"markdownDescription": "%config.checkoutType%",
"default": "all"
},
"git.ignoreLegacyWarning": {
@@ -983,6 +1103,12 @@
"description": "%config.enableCommitSigning%",
"default": false
},
"git.confirmEmptyCommits": {
"type": "boolean",
"scope": "resource",
"description": "%config.confirmEmptyCommits%",
"default": true
},
"git.decorations.enabled": {
"type": "boolean",
"default": true,
@@ -991,9 +1117,24 @@
"git.promptToSaveFilesBeforeCommit": {
"type": "boolean",
"scope": "resource",
"default": false,
"default": true,
"description": "%config.promptToSaveFilesBeforeCommit%"
},
"git.postCommitCommand": {
"type": "string",
"enum": [
"none",
"push",
"sync"
],
"enumDescriptions": [
"%config.postCommitCommand.none%",
"%config.postCommitCommand.push%",
"%config.postCommitCommand.sync%"
],
"markdownDescription": "%config.postCommitCommand%",
"default": "none"
},
"git.showInlineOpenFileAction": {
"type": "boolean",
"default": true,
@@ -1014,6 +1155,11 @@
"default": "warn",
"description": "%config.inputValidation%"
},
"git.inputValidationLength": {
"type": "number",
"default": 72,
"description": "%config.inputValidationLength%"
},
"git.detectSubmodules": {
"type": "boolean",
"scope": "resource",
@@ -1026,6 +1172,12 @@
"default": 10,
"description": "%config.detectSubmodulesLimit%"
},
"git.alwaysShowStagedChangesResourceGroup": {
"type": "boolean",
"scope": "resource",
"default": false,
"description": "%config.alwaysShowStagedChangesResourceGroup%"
},
"git.alwaysSignOff": {
"type": "boolean",
"scope": "resource",
@@ -1037,6 +1189,50 @@
"default": [],
"scope": "window",
"description": "%config.ignoredRepositories%"
},
"git.scanRepositories": {
"type": "array",
"default": [],
"scope": "resource",
"description": "%config.scanRepositories%"
},
"git.showProgress": {
"type": "boolean",
"description": "%config.showProgress%",
"default": true,
"scope": "resource"
},
"git.rebaseWhenSync": {
"type": "boolean",
"scope": "resource",
"default": false,
"description": "%config.rebaseWhenSync%"
},
"git.fetchOnPull": {
"type": "boolean",
"scope": "resource",
"default": false,
"description": "%config.fetchOnPull%"
},
"git.allowForcePush": {
"type": "boolean",
"default": false,
"description": "%config.allowForcePush%"
},
"git.useForcePushWithLease": {
"type": "boolean",
"default": true,
"description": "%config.useForcePushWithLease%"
},
"git.confirmForcePush": {
"type": "boolean",
"default": true,
"description": "%config.confirmForcePush%"
},
"git.openDiffOnClick": {
"type": "boolean",
"default": true,
"description": "%config.openDiffOnClick%"
}
}
},
@@ -1072,7 +1268,7 @@
"id": "gitDecoration.untrackedResourceForeground",
"description": "%colors.untracked%",
"defaults": {
"light": "#018101",
"light": "#007100",
"dark": "#73C991",
"highContrast": "#73C991"
}
@@ -1082,7 +1278,7 @@
"description": "%colors.ignored%",
"defaults": {
"light": "#8E8E90",
"dark": "#A7A8A9",
"dark": "#8C8C8C",
"highContrast": "#A7A8A9"
}
},
@@ -1187,17 +1383,17 @@
"dependencies": {
"byline": "^5.0.0",
"file-type": "^7.2.0",
"iconv-lite": "0.4.19",
"iconv-lite": "^0.4.24",
"jschardet": "^1.6.0",
"vscode-extension-telemetry": "0.0.18",
"vscode-nls": "^3.2.4",
"vscode-extension-telemetry": "0.1.0",
"vscode-nls": "^4.0.0",
"which": "^1.3.0"
},
"devDependencies": {
"@types/byline": "4.2.31",
"@types/file-type": "^5.2.1",
"@types/mocha": "2.2.43",
"@types/node": "7.0.43",
"@types/node": "^8.10.25",
"@types/which": "^1.0.28",
"mocha": "^3.2.0"
}