Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pr/104312

Browse Source
This commit is contained in:
João Moreno
2020-11-09 16:03:36 +01:00
parent b4c528cbfd 7e5609afa9
commit 978d39324a
2056 changed files with 93430 additions and 70473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

438
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%",
@@ -216,6 +228,47 @@
"title": "%command.commitAllAmend%",
"category": "Git"
},
{
"command": "git.commitNoVerify",
"title": "%command.commitNoVerify%",
"category": "Git",
"icon": "$(check)"
},
{
"command": "git.commitStagedNoVerify",
"title": "%command.commitStagedNoVerify%",
"category": "Git"
},
{
"command": "git.commitEmptyNoVerify",
"title": "%command.commitEmptyNoVerify%",
"category": "Git"
},
{
"command": "git.commitStagedSignedNoVerify",
"title": "%command.commitStagedSignedNoVerify%",
"category": "Git"
},
{
"command": "git.commitStagedAmendNoVerify",
"title": "%command.commitStagedAmendNoVerify%",
"category": "Git"
},
{
"command": "git.commitAllNoVerify",
"title": "%command.commitAllNoVerify%",
"category": "Git"
},
{
"command": "git.commitAllSignedNoVerify",
"title": "%command.commitAllSignedNoVerify%",
"category": "Git"
},
{
"command": "git.commitAllAmendNoVerify",
"title": "%command.commitAllAmendNoVerify%",
"category": "Git"
},
{
"command": "git.restoreCommitTemplate",
"title": "%command.restoreCommitTemplate%",
@@ -231,6 +284,11 @@
"title": "%command.checkout%",
"category": "Git"
},
{
"command": "git.checkoutDetached",
"title": "%command.checkoutDetached%",
"category": "Git"
},
{
"command": "git.branch",
"title": "%command.branch%",
@@ -256,6 +314,11 @@
"title": "%command.merge%",
"category": "Git"
},
{
"command": "git.rebase",
"title": "%command.rebase%",
"category": "Git"
},
{
"command": "git.createTag",
"title": "%command.createTag%",
@@ -316,6 +379,11 @@
"title": "%command.pushToForce%",
"category": "Git"
},
{
"command": "git.pushTags",
"title": "%command.pushTags%",
"category": "Git"
},
{
"command": "git.pushWithTags",
"title": "%command.pushFollowTags%",
@@ -453,6 +521,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"
@@ -549,6 +621,10 @@
"command": "git.cleanAllUntracked",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
},
{
"command": "git.rename",
"when": "false"
},
{
"command": "git.commit",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
@@ -581,6 +657,42 @@
"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"
},
{
"command": "git.commitStagedNoVerify",
"when": "config.git.enabled && !git.missing && config.git.allowNoVerifyCommit && gitOpenRepositoryCount != 0"
},
{
"command": "git.commitEmptyNoVerify",
"when": "config.git.enabled && !git.missing && config.git.allowNoVerifyCommit && gitOpenRepositoryCount != 0"
},
{
"command": "git.commitStagedSignedNoVerify",
"when": "config.git.enabled && !git.missing && config.git.allowNoVerifyCommit && gitOpenRepositoryCount != 0"
},
{
"command": "git.commitStagedAmendNoVerify",
"when": "config.git.enabled && !git.missing && config.git.allowNoVerifyCommit && gitOpenRepositoryCount != 0"
},
{
"command": "git.commitAllNoVerify",
"when": "config.git.enabled && !git.missing && config.git.allowNoVerifyCommit && gitOpenRepositoryCount != 0"
},
{
"command": "git.commitAllSignedNoVerify",
"when": "config.git.enabled && !git.missing && config.git.allowNoVerifyCommit && gitOpenRepositoryCount != 0"
},
{
"command": "git.commitAllAmendNoVerify",
"when": "config.git.enabled && !git.missing && config.git.allowNoVerifyCommit && gitOpenRepositoryCount != 0"
},
{
"command": "git.restoreCommitTemplate",
"when": "false"
@@ -629,6 +741,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"
@@ -673,6 +789,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"
@@ -754,13 +874,23 @@
"when": "scmProvider == git"
},
{
"command": "git.checkout",
"group": "1_header",
"command": "git.pull",
"group": "1_header@1",
"when": "scmProvider == git"
},
{
"command": "git.push",
"group": "1_header@2",
"when": "scmProvider == git"
},
{
"command": "git.clone",
"group": "1_header",
"group": "1_header@3",
"when": "scmProvider == git"
},
{
"command": "git.checkout",
"group": "1_header@4",
"when": "scmProvider == git"
},
{
@@ -793,6 +923,11 @@
"group": "2_main@6",
"when": "scmProvider == git"
},
{
"submenu": "git.tags",
"group": "2_main@7",
"when": "scmProvider == git"
},
{
"command": "git.showOutput",
"group": "3_footer",
@@ -1208,6 +1343,18 @@
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/"
}
],
"explorer/context": [
{
"submenu": "git.explorer",
"group": "7_git",
"when": "config.git.enabled && !git.missing && !explorerResourceIsRoot"
}
],
"git.explorer": [
{
"command": "git.rename"
}
],
"git.commit": [
{
"command": "git.commit",
@@ -1229,13 +1376,38 @@
"command": "git.rebaseAbort",
"group": "1_commit@5"
},
{
"command": "git.commitNoVerify",
"group": "1_commit@6",
"when": "config.git.allowNoVerifyCommit"
},
{
"command": "git.commitStagedNoVerify",
"group": "1_commit@7",
"when": "config.git.allowNoVerifyCommit"
},
{
"command": "git.commitAllNoVerify",
"group": "1_commit@8",
"when": "config.git.allowNoVerifyCommit"
},
{
"command": "git.commitStagedAmend",
"group": "2_amend@1"
},
{
"command": "git.commitAllAmend",
"group": "2_amend@1"
"group": "2_amend@2"
},
{
"command": "git.commitStagedAmendNoVerify",
"group": "2_amend@3",
"when": "config.git.allowNoVerifyCommit"
},
{
"command": "git.commitAllAmendNoVerify",
"group": "2_amend@4",
"when": "config.git.allowNoVerifyCommit"
},
{
"command": "git.commitStagedSigned",
@@ -1244,122 +1416,167 @@
{
"command": "git.commitAllSigned",
"group": "3_signoff@2"
},
{
"command": "git.commitStagedSignedNoVerify",
"group": "3_signoff@3",
"when": "config.git.allowNoVerifyCommit"
},
{
"command": "git.commitAllSignedNoVerify",
"group": "3_signoff@4",
"when": "config.git.allowNoVerifyCommit"
}
],
"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"
}
]
},
"submenus": [
{
"id": "git.explorer",
"label": "%submenu.explorer%"
},
{
"id": "git.commit",
"label": "%submenu.commit%"
@@ -1383,6 +1600,10 @@
{
"id": "git.stash",
"label": "%submenu.stash%"
},
{
"id": "git.tags",
"label": "%submenu.tags%"
}
],
"configuration": {
@@ -1397,7 +1618,8 @@
"git.path": {
"type": [
"string",
"null"
"null",
"array"
],
"markdownDescription": "%config.path%",
"default": null,
@@ -1475,21 +1697,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",
@@ -1517,6 +1745,7 @@
"null"
],
"default": null,
"scope": "machine",
"description": "%config.defaultCloneDirectory%"
},
"git.enableSmartCommit": {
@@ -1574,6 +1803,22 @@
"default": false,
"description": "%config.pushTags%"
},
"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": [
@@ -1606,6 +1851,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,
@@ -1663,6 +1925,12 @@
"default": false,
"description": "%config.alwaysSignOff%"
},
"git.ignoreSubmodules": {
"type": "boolean",
"scope": "resource",
"default": false,
"description": "%config.ignoreSubmodules%"
},
"git.ignoredRepositories": {
"type": "array",
"items": {
@@ -1699,6 +1967,12 @@
"default": false,
"description": "%config.fetchOnPull%"
},
"git.pruneOnFetch": {
"type": "boolean",
"scope": "resource",
"default": false,
"description": "%config.pruneOnFetch%"
},
"git.pullTags": {
"type": "boolean",
"scope": "resource",
@@ -1726,6 +2000,16 @@
"default": true,
"description": "%config.confirmForcePush%"
},
"git.allowNoVerifyCommit": {
"type": "boolean",
"default": false,
"description": "%config.allowNoVerifyCommit%"
},
"git.confirmNoVerifyCommit": {
"type": "boolean",
"default": true,
"description": "%config.confirmNoVerifyCommit%"
},
"git.openDiffOnClick": {
"type": "boolean",
"scope": "resource",
@@ -1777,6 +2061,25 @@
},
"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"
}
}
},
@@ -1826,6 +2129,24 @@
"highContrast": "#A7A8A9"
}
},
{
"id": "gitDecoration.stageModifiedResourceForeground",
"description": "%colors.stageModified%",
"defaults": {
"light": "#895503",
"dark": "#E2C08D",
"highContrast": "#E2C08D"
}
},
{
"id": "gitDecoration.stageDeletedResourceForeground",
"description": "%colors.stageDeleted%",
"defaults": {
"light": "#ad0707",
"dark": "#c74e39",
"highContrast": "#c74e39"
}
},
{
"id": "gitDecoration.conflictingResourceForeground",
"description": "%colors.conflict%",
@@ -1921,7 +2242,11 @@
"[git-commit]": {
"editor.rulers": [
72
]
],
"workbench.editor.restoreViewState": false
},
"[git-rebase]": {
"workbench.editor.restoreViewState": false
}
},
"viewsWelcome": [
@@ -1938,27 +2263,32 @@
{
"view": "scm",
"contents": "%view.workbench.scm.empty%",
"when": "config.git.enabled && git.state == initialized && workbenchState == empty"
"when": "config.git.enabled && git.state == initialized && workbenchState == empty",
"group": "2_open@1"
},
{
"view": "scm",
"contents": "%view.workbench.scm.folder%",
"when": "config.git.enabled && git.state == initialized && workbenchState == folder"
"when": "config.git.enabled && git.state == initialized && workbenchState == folder",
"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 && git.state == initialized && workbenchState == workspace && workspaceFolderCount != 0",
"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 && git.state == initialized && workbenchState == workspace && workspaceFolderCount == 0",
"group": "2_open@1"
},
{
"view": "explorer",
"contents": "%view.workbench.cloneRepository%",
"when": "config.git.enabled && git.state == initialized"
"when": "config.git.enabled && git.state == initialized",
"group": "5_scm@1"
}
]
},