ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-09 01:32:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issue showing repo history w/ no active editor

Browse Source
This commit is contained in:
Eric Amodio
2017-03-15 12:00:33 -04:00
parent 564a0b8f64
commit 2ef6c37c89
7 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/showQuickFileHistory.ts
View File

@@ -25,7 +25,7 @@ export class ShowQuickFileHistoryCommand extends ActiveEditorCommand {
maxCount = this.git.config.advanced.maxQuickHistory;
}
const progressCancellation = FileHistoryQuickPick.showProgress(maxCount);
const progressCancellation = FileHistoryQuickPick.showProgress(gitUri);
try {
if (!log) {
log = await this.git.getLogForFile(gitUri.fsPath, gitUri.sha, gitUri.repoPath, undefined, maxCount);

9
src/commands/showQuickRepoHistory.ts
View File

@@ -16,22 +16,21 @@ export class ShowQuickRepoHistoryCommand extends ActiveEditorCommand {
uri = editor && editor.document && editor.document.uri;
}
const gitUri = await GitUri.fromUri(uri, this.git);
Logger.log(`ShowQuickRepoHistoryCommand.execute`, gitUri.shortSha);
const gitUri = uri && await GitUri.fromUri(uri, this.git);
if (maxCount == null) {
maxCount = this.git.config.advanced.maxQuickHistory;
}
const progressCancellation = RepoHistoryQuickPick.showProgress(maxCount);
const progressCancellation = RepoHistoryQuickPick.showProgress();
try {
if (!log) {
const repoPath = gitUri.repoPath || await this.git.getRepoPathFromUri(uri, this.repoPath);
const repoPath = (gitUri && gitUri.repoPath) || await this.git.getRepoPathFromUri(uri, this.repoPath);
if (!repoPath) return window.showWarningMessage(`Unable to show repository history`);
if (progressCancellation.token.isCancellationRequested) return undefined;
log = await this.git.getLogForRepo(repoPath, gitUri.sha, maxCount);
log = await this.git.getLogForRepo(repoPath, (gitUri && gitUri.sha), maxCount);
if (!log) return window.showWarningMessage(`Unable to show repository history`);
}