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

Implements first iteration of multi diff editors.

Browse Source 
Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
This commit is contained in:
Henning Dieterichs
2023-11-07 16:49:15 +01:00
parent 93351c7436
commit 090fd2c772
35 changed files with 914 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
extensions/git/package.json
View File

@@ -694,6 +694,12 @@
"title": "%command.timelineCompareWithSelected%",
"category": "Git"
},
{
"command": "git.timeline.openCommit",
"title": "%command.timelineOpenCommit%",
"icon": "$(wand)",
"category": "Git"
},
{
"command": "git.rebaseAbort",
"title": "%command.rebaseAbort%",
@@ -753,6 +759,18 @@
"command": "git.openRepositoriesInParentFolders",
"title": "%command.openRepositoriesInParentFolders%",
"category": "Git"
},
{
"command": "git.viewChanges",
"title": "View Changes",
"icon": "$(search)",
"category": "Git"
},
{
"command": "git.viewStagedChanges",
"title": "View Staged Changes",
"icon": "$(search)",
"category": "Git"
}
],
"continueEditSession": [
@@ -1197,6 +1215,10 @@
"command": "git.timeline.compareWithSelected",
"when": "false"
},
{
"command": "git.timeline.openCommit",
"when": "false"
},
{
"command": "git.closeAllDiffEditors",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
@@ -1224,6 +1246,14 @@
{
"command": "git.openRepositoriesInParentFolders",
"when": "config.git.enabled && !git.missing && git.parentRepositoryCount != 0"
},
{
"command": "git.viewChanges",
"when": "false"
},
{
"command": "git.viewStagedChanges",
"when": "false"
}
],
"scm/title": [
@@ -1390,6 +1420,16 @@
"command": "git.stageAllUntracked",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline@2"
},
{
"command": "git.viewStagedChanges",
"when": "scmProvider == git && scmResourceGroup == index",
"group": "inline@1"
},
{
"command": "git.viewChanges",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "inline@1"
}
],
"scm/resourceFolder/context": [
@@ -1767,11 +1807,21 @@
}
],
"timeline/item/context": [
{
"command": "git.timeline.openCommit",
"group": "inline",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection"
},
{
"command": "git.timeline.openDiff",
"group": "1_actions",
"group": "1_actions@1",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file\\b/ && !listMultiSelection"
},
{
"command": "git.timeline.openCommit",
"group": "1_actions@2",
"when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection"
},
{
"command": "git.timeline.compareWithSelected",
"group": "3_compare@1",