Adds shortcut for gitlens.showQuickFileHistory

Adds shortcut for gitlens.showQuickRepoHistory
Adds gitlens.advanced.maxQuickHistory to limit the number of quick history entries to show
Adds gitlens.diffLineWithPrevious as alt context menu item for gitlens.diffWithPrevious
Adds gitlens.diffLineWithWorking as alt context menu item for gitlens.diffWithWorking
Adds gitlens.showFileHistory as alt context menu item for gitlens.showQuickFileHistory
Removes context menu for gitlens.diffLineWithPrevious
Removes context menu for gitlens.diffLineWithWorking
Replaces gitlens.menus.fileDiff.enabled & gitlens.menus.lineDiff.enabled with gitlens.menus.diff.enabled
This commit is contained in:
Eric Amodio
2017-01-02 00:39:26 -05:00
parent 567533622c
commit 680d31d43d
11 changed files with 260 additions and 191 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "gitlens",
"version": "1.3.1",
"version": "1.4.0",
"author": {
"name": "Eric Amodio",
"email": "eamodio@gmail.com"
@@ -201,15 +201,10 @@
],
"description": "Specifies the command executed when the blame status bar item is clicked. `gitlens.toggleBlame` - toggles blame annotations. `gitlens.showBlameHistory` - opens the blame history explorer. `gitlens.showFileHistory` - opens the file history explorer. `gitlens.diffWithPrevious` - compares the current checked-in file with the previous commit. `gitlens.showQuickFileHistory` - shows a file history picker"
},
"gitlens.menus.fileDiff.enabled": {
"gitlens.menus.diff.enabled": {
"type": "boolean",
"default": true,
"description": "Specifies whether file-based diff commands will be added to the context menus"
},
"gitlens.menus.lineDiff.enabled": {
"type": "boolean",
"default": false,
"description": "Specifies whether line-based diff commands will be added to the context menus"
"description": "Specifies whether diff commands will be added to the context menus"
},
"gitlens.advanced.caching.enabled": {
"type": "boolean",
@@ -231,6 +226,11 @@
"default": null,
"description": "Specifies a git path to use"
},
"gitlens.advanced.maxQuickHistory": {
"type": "number",
"default": 200,
"description": "Specifies the maximum number of QuickPick history entries to show"
},
"gitlens.advanced.output.level": {
"type": "string",
"default": "silent",
@@ -304,12 +304,12 @@
"explorer/context": [
{
"command": "gitlens.diffWithWorking",
"when": "config.gitlens.menus.fileDiff.enabled && config.git.enabled",
"when": "config.gitlens.menus.diff.enabled && config.git.enabled",
"group": "2_gitlens-file"
},
{
"command": "gitlens.diffWithPrevious",
"when": "config.gitlens.menus.fileDiff.enabled && config.git.enabled",
"when": "config.gitlens.menus.diff.enabled && config.git.enabled",
"group": "2_gitlens-file"
},
{
@@ -321,12 +321,12 @@
"editor/title": [
{
"command": "gitlens.diffWithWorking",
"when": "config.gitlens.menus.fileDiff.enabled && config.git.enabled",
"when": "config.gitlens.menus.diff.enabled && config.git.enabled",
"group": "2_gitlens"
},
{
"command": "gitlens.diffWithPrevious",
"when": "config.gitlens.menus.fileDiff.enabled && config.git.enabled",
"when": "config.gitlens.menus.diff.enabled && config.git.enabled",
"group": "2_gitlens"
},
{
@@ -344,27 +344,18 @@
{
"command": "gitlens.diffWithWorking",
"alt": "gitlens.diffLineWithWorking",
"when": "editorTextFocus && config.gitlens.menus.fileDiff.enabled && config.git.enabled",
"when": "editorTextFocus && config.gitlens.menus.diff.enabled && config.git.enabled",
"group": "2_gitlens@1.0"
},
{
"command": "gitlens.diffLineWithWorking",
"when": "editorTextFocus && config.gitlens.menus.lineDiff.enabled && config.git.enabled",
"group": "2_gitlens@1.1"
},
{
"command": "gitlens.diffWithPrevious",
"alt": "gitlens.diffLineWithPrevious",
"when": "editorTextFocus && config.gitlens.menus.fileDiff.enabled && config.git.enabled",
"group": "2_gitlens@1.2"
},
{
"command": "gitlens.diffLineWithPrevious",
"when": "editorTextFocus && config.gitlens.menus.lineDiff.enabled && config.git.enabled",
"group": "2_gitlens@1.3"
"when": "editorTextFocus && config.gitlens.menus.diff.enabled && config.git.enabled",
"group": "2_gitlens@1.1"
},
{
"command": "gitlens.showQuickFileHistory",
"alt": "gitlens.showFileHistory",
"when": "config.git.enabled",
"group": "3_gitlens"
},
@@ -382,6 +373,17 @@
"mac": "alt+b",
"when": "editorTextFocus"
},
{
"command": "gitlens.showQuickFileHistory",
"key": "alt+h",
"mac": "alt+h",
"when": "editorTextFocus"
},
{
"command": "gitlens.showQuickRepoHistory",
"key": "shift+alt+h",
"mac": "shift+alt+h"
},
{
"command": "gitlens.toggleCodeLens",
"key": "alt+shift+b",
@@ -407,17 +409,17 @@
"lodash.escaperegexp": "^4.1.2",
"lodash.isequal": "^4.4.0",
"lodash.once": "^4.1.1",
"moment": "^2.17.0",
"spawn-rx": "^2.0.6",
"moment": "^2.17.1",
"spawn-rx": "^2.0.7",
"tmp": "^0.0.31"
},
"devDependencies": {
"@types/node": "^0.0.2",
"@types/mocha": "^2.2.33",
"@types/node": "^6.0.55",
"@types/mocha": "^2.2.35",
"@types/tmp": "^0.0.32",
"mocha": "^3.2.0",
"tslint": "^4.0.2",
"typescript": "^2.0.10",
"tslint": "^4.2.0",
"typescript": "^2.1.4",
"vscode": "^1.0.3"
}
}