ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-25 09:35:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

Browse Source 
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
extensions/git/package.json
View File

@@ -26,6 +26,12 @@
"update-grammar": "node ./build/update-grammars.js",
"test": "node ../../node_modules/mocha/bin/mocha"
},
"capabilities": {
"virtualWorkspaces": true,
"untrustedWorkspaces": {
"supported": true
}
},
"contributes": {
"commands": [
{
@@ -495,6 +501,16 @@
"title": "%command.timelineCopyCommitMessage%",
"category": "Git"
},
{
"command": "git.timeline.selectForCompare",
"title": "%command.timelineSelectForCompare%",
"category": "Git"
},
{
"command": "git.timeline.compareWithSelected",
"title": "%command.timelineCompareWithSelected%",
"category": "Git"
},
{
"command": "git.rebaseAbort",
"title": "%command.rebaseAbort%",
@@ -874,6 +890,14 @@
{
"command": "git.timeline.copyCommitMessage",
"when": "false"
},
{
"command": "git.timeline.selectForCompare",
"when": "false"
},
{
"command": "git.timeline.compareWithSelected",
"when": "false"
}
],
"scm/title": [
@@ -964,7 +988,7 @@
{
"command": "git.stageAllMerge",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.unstageAll",
@@ -974,7 +998,7 @@
{
"command": "git.unstageAll",
"when": "scmProvider == git && scmResourceGroup == index",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.cleanAll",
@@ -989,12 +1013,12 @@
{
"command": "git.cleanAll",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.untrackedChanges == mixed",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.stageAll",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.untrackedChanges == mixed",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.cleanAllTracked",
@@ -1009,12 +1033,12 @@
{
"command": "git.cleanAllTracked",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.untrackedChanges != mixed",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.stageAllTracked",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.untrackedChanges != mixed",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.cleanAllUntracked",
@@ -1029,12 +1053,12 @@
{
"command": "git.cleanAllUntracked",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.stageAllUntracked",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline"
"group": "inline@2"
}
],
"scm/resourceFolder/context": [
@@ -1046,7 +1070,7 @@
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.unstage",
@@ -1056,7 +1080,7 @@
{
"command": "git.unstage",
"when": "scmProvider == git && scmResourceGroup == index",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.stage",
@@ -1071,12 +1095,12 @@
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.ignore",
@@ -1091,7 +1115,7 @@
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.clean",
@@ -1101,7 +1125,7 @@
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.ignore",
@@ -1123,7 +1147,7 @@
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.revealInExplorer",
@@ -1133,12 +1157,12 @@
{
"command": "git.openFile2",
"when": "scmProvider == git && scmResourceGroup == merge && config.git.showInlineOpenFileAction && config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.openChange",
"when": "scmProvider == git && scmResourceGroup == merge && config.git.showInlineOpenFileAction && !config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.openChange",
@@ -1163,7 +1187,7 @@
{
"command": "git.unstage",
"when": "scmProvider == git && scmResourceGroup == index",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.revealInExplorer",
@@ -1173,12 +1197,12 @@
{
"command": "git.openFile2",
"when": "scmProvider == git && scmResourceGroup == index && config.git.showInlineOpenFileAction && config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.openChange",
"when": "scmProvider == git && scmResourceGroup == index && config.git.showInlineOpenFileAction && !config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.openChange",
@@ -1208,22 +1232,22 @@
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.openFile2",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.showInlineOpenFileAction && config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.openChange",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.showInlineOpenFileAction && !config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.ignore",
@@ -1263,22 +1287,22 @@
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == untracked && !gitFreshRepository",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.openFile2",
"when": "scmProvider == git && scmResourceGroup == untracked && config.git.showInlineOpenFileAction && config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.openChange",
"when": "scmProvider == git && scmResourceGroup == untracked && config.git.showInlineOpenFileAction && !config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.ignore",
@@ -1349,17 +1373,27 @@
{
"command": "git.timeline.openDiff",
"group": "1_actions",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file\\b/"
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file\\b/ && !listMultiSelection"
},
{
"command": "git.timeline.compareWithSelected",
"group": "3_compare@1",
"when": "config.git.enabled && !git.missing && git.timeline.selectedForCompare && timelineItem =~ /git:file\\b/ && !listMultiSelection"
},
{
"command": "git.timeline.selectForCompare",
"group": "3_compare@2",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file\\b/ && !listMultiSelection"
},
{
"command": "git.timeline.copyCommitId",
"group": "5_copy@1",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/"
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection"
},
{
"command": "git.timeline.copyCommitMessage",
"group": "5_copy@2",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/"
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection"
}
],
"git.commit": [
@@ -1519,13 +1553,17 @@
"command": "git.branchFrom",
"group": "branch@4"
},
{
"command": "git.renameBranch",
"group": "branch@5"
},
{
"command": "git.renameBranch",
"group": "branch@5"
"command": "git.deleteBranch",
"group": "branch@6"
},
{
"command": "git.publish",
"group": "branch@6"
"group": "branch@7"
}
],
"git.remotes": [
@@ -1654,19 +1692,10 @@
"default": true
},
"git.autofetch": {
"anyOf": [
{
"type": "boolean"
},
{
"type": "string",
"enum": [
"all"
]
}
],
"type": ["boolean", "string"],
"enum": [true, false, "all"],
"scope": "resource",
"description": "%config.autofetch%",
"markdownDescription": "%config.autofetch%",
"default": false,
"tags": [
"usesOnlineServices"
@@ -1675,7 +1704,7 @@
"git.autofetchPeriod": {
"type": "number",
"scope": "resource",
"description": "%config.autofetchPeriod%",
"markdownDescription": "%config.autofetchPeriod%",
"default": 180
},
"git.branchValidationRegex": {
@@ -2140,6 +2169,15 @@
"highContrast": "#c74e39"
}
},
{
"id": "gitDecoration.renamedResourceForeground",
"description": "%colors.renamed%",
"defaults": {
"light": "#007100",
"dark": "#73C991",
"highContrast": "#73C991"
}
},
{
"id": "gitDecoration.untrackedResourceForeground",
"description": "%colors.untracked%",
@@ -2162,9 +2200,9 @@
"id": "gitDecoration.conflictingResourceForeground",
"description": "%colors.conflict%",
"defaults": {
"light": "#6c6cc4",
"dark": "#6c6cc4",
"highContrast": "#6c6cc4"
"light": "#ad0707",
"dark": "#e4676b",
"highContrast": "#c74e39"
}
},
{
@@ -2305,6 +2343,13 @@
"when": "config.git.enabled",
"enablement": "git.state == initialized",
"group": "5_scm@1"
},
{
"view": "explorer",
"contents": "%view.workbench.learnMore%",
"when": "config.git.enabled",
"enablement": "git.state == initialized",
"group": "5_scm@10"
}
]
},
@@ -2312,8 +2357,8 @@
"byline": "^5.0.0",
"file-type": "^7.2.0",
"iconv-lite-umd": "0.6.8",
"jschardet": "2.2.1",
"vscode-extension-telemetry": "0.1.1",
"jschardet": "2.3.0",
"vscode-extension-telemetry": "0.1.7",
"vscode-nls": "^4.0.0",
"vscode-uri": "^2.0.0",
"which": "^1.3.0"