Browse Source

Fixes log --all not supported in line history

main
Eric Amodio 4 years ago
parent
commit
e499be9a78
3 changed files with 6 additions and 5 deletions
  1. +2
    -2
      README.md
  2. +2
    -2
      package.json
  3. +2
    -1
      src/views/nodes/lineHistoryNode.ts

+ 2
- 2
README.md View File

@ -278,8 +278,8 @@ The file history view lists all of the commits that changed the current file on
- a toggle to pin (pause) the automatic tracking of the current editor - a toggle to pin (pause) the automatic tracking of the current editor
- a toggle to switch between file and line history, i.e. show all commits of the current file, or just the selected lines of the current file - a toggle to switch between file and line history, i.e. show all commits of the current file, or just the selected lines of the current file
- the ability to change the current base branch (reference) for the file or line history - the ability to change the current base branch (reference) for the file or line history
- a toggle to follow renames across the current file
- a toggle to show commits from all branches rather than just from the current base branch (reference)
- (file history only) a toggle to follow renames across the current file
- (file history only) a toggle to show commits from all branches rather than just from the current base branch or reference
--- ---

+ 2
- 2
package.json View File

@ -6227,12 +6227,12 @@
}, },
{ {
"command": "gitlens.views.fileHistory.setShowAllBranchesOn", "command": "gitlens.views.fileHistory.setShowAllBranchesOn",
"when": "view =~ /^gitlens\\.views\\.fileHistory/ && !config.gitlens.advanced.fileHistoryShowAllBranches",
"when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && !config.gitlens.advanced.fileHistoryShowAllBranches",
"group": "3_gitlens@2" "group": "3_gitlens@2"
}, },
{ {
"command": "gitlens.views.fileHistory.setShowAllBranchesOff", "command": "gitlens.views.fileHistory.setShowAllBranchesOff",
"when": "view =~ /^gitlens\\.views\\.fileHistory/ && config.gitlens.advanced.fileHistoryShowAllBranches",
"when": "view =~ /^gitlens\\.views\\.fileHistory/ && !gitlens:views:fileHistory:cursorFollowing && config.gitlens.advanced.fileHistoryShowAllBranches",
"group": "3_gitlens@2" "group": "3_gitlens@2"
}, },
{ {

+ 2
- 1
src/views/nodes/lineHistoryNode.ts View File

@ -307,9 +307,10 @@ export class LineHistoryNode extends SubscribeableViewNode implements PageableVi
private async getLog(selection?: Selection) { private async getLog(selection?: Selection) {
if (this._log == null) { if (this._log == null) {
this._log = await Container.git.getLogForFile(this.uri.repoPath, this.uri.fsPath, { this._log = await Container.git.getLogForFile(this.uri.repoPath, this.uri.fsPath, {
all: false,
limit: this.limit ?? this.view.config.pageItemLimit, limit: this.limit ?? this.view.config.pageItemLimit,
ref: this.uri.sha,
range: selection ?? this.selection, range: selection ?? this.selection,
ref: this.uri.sha,
renames: false, renames: false,
}); });
} }

Loading…
Cancel
Save