Adds new gitlens.showQuickFileHistory command

Adds new gitlens.showQuickRepoHistory command
Adds gitlens.showQuickFileHistory option to the settings
Removes git.viewFileHistory option
Changes the gitlens.statusBar.command settings default to gitlens.showQuickFileHistory

src/commands/showFileHistory.ts

@@ -23,13 +23,13 @@ export default class ShowFileHistoryCommand extends EditorCommand {
 
         try {
             const locations = await this.git.getLogLocations(gitUri.fsPath, gitUri.sha, gitUri.repoPath, sha, line);
-            if (!locations) return window.showWarningMessage(`Unable to show history. File is probably not under source control`);
+            if (!locations) return window.showWarningMessage(`Unable to show file history. File is probably not under source control`);
 
             return commands.executeCommand(BuiltInCommands.ShowReferences, uri, position, locations);
         }
         catch (ex) {
             Logger.error('[GitLens.ShowFileHistoryCommand]', 'getLogLocations', ex);
-            return window.showErrorMessage(`Unable to show history. See output channel for more details`);
+            return window.showErrorMessage(`Unable to show file history. See output channel for more details`);
         }
     }
 }

src/commands/showQuickFileHistory.ts

@@ -0,0 +1,54 @@
+'use strict';
+import { Iterables } from '../system';
+import { commands, QuickPickItem, QuickPickOptions, TextEditor, TextEditorEdit, Uri, window } from 'vscode';
+import { EditorCommand } from './commands';
+import { Commands } from '../constants';
+import GitProvider, { GitCommit, GitUri } from '../gitProvider';
+import { Logger } from '../logger';
+import * as moment from 'moment';
+
+class CommitQuickPickItem implements QuickPickItem {
+    label: string;
+    description: string;
+    detail: string;
+
+    constructor(public commit: GitCommit) {
+        this.label = `${commit.author}, ${moment(commit.date).fromNow()}`;
+        this.description = `\u2022 ${commit.sha}`;
+        this.detail = commit.message;
+    }
+}
+
+export default class ShowQuickFileHistoryCommand extends EditorCommand {
+    constructor(private git: GitProvider) {
+        super(Commands.ShowQuickFileHistory);
+    }
+
+    async execute(editor: TextEditor, edit: TextEditorEdit, uri?: Uri) {
+        if (!(uri instanceof Uri)) {
+            if (!editor.document) return undefined;
+            uri = editor.document.uri;
+        }
+
+        const gitUri = GitUri.fromUri(uri);
+
+        try {
+            const log = await this.git.getLogForFile(gitUri.fsPath, gitUri.sha, gitUri.repoPath);
+            if (!log) return window.showWarningMessage(`Unable to show file history. File is probably not under source control`);
+
+            const items = Iterables.map(log.commits.values(), c => new CommitQuickPickItem(c));
+            const commitPick = await window.showQuickPick(Array.from(items), <QuickPickOptions>{
+                matchOnDescription: true,
+                matchOnDetail: true
+            });
+
+            if (commitPick) {
+                return commands.executeCommand(Commands.DiffWithWorking, commitPick.commit.uri, commitPick.commit);
+            }
+        }
+        catch (ex) {
+            Logger.error('[GitLens.ShowQuickFileHistoryCommand]', 'getLogLocations', ex);
+            return window.showErrorMessage(`Unable to show file history. See output channel for more details`);
+        }
+    }
+}

src/commands/showQuickRepoHistory.ts

@@ -0,0 +1,84 @@
+'use strict';
+import { Iterables } from '../system';
+import { commands, QuickPickItem, QuickPickOptions, TextEditor, TextEditorEdit, Uri, window } from 'vscode';
+import { EditorCommand } from './commands';
+import { Commands } from '../constants';
+import GitProvider, { GitCommit, GitUri } from '../gitProvider';
+import { Logger } from '../logger';
+import * as moment from 'moment';
+import * as path from 'path';
+
+class CommitQuickPickItem implements QuickPickItem {
+    label: string;
+    description: string;
+    detail: string;
+
+    constructor(public commit: GitCommit) {
+        this.label = `${commit.author}, ${moment(commit.date).fromNow()}`;
+        this.description = `\u2022 ${commit.sha} \u2014 ${commit.fileName}`;
+        this.detail = commit.message;
+    }
+}
+
+class FileQuickPickItem implements QuickPickItem {
+    label: string;
+    description: string;
+    detail: string;
+    uri: GitUri;
+
+    constructor(commit: GitCommit, public fileName: string) {
+        this.label = fileName;
+        this.uri = GitUri.fromUri(Uri.file(path.resolve(commit.repoPath, fileName)));
+    }
+}
+
+export default class ShowQuickRepoHistoryCommand extends EditorCommand {
+    constructor(private git: GitProvider) {
+        super(Commands.ShowQuickRepoHistory);
+    }
+
+    async execute(editor: TextEditor, edit: TextEditorEdit, uri?: Uri) {
+        if (!(uri instanceof Uri)) {
+            if (!editor.document) return undefined;
+            uri = editor.document.uri;
+        }
+
+        const gitUri = GitUri.fromUri(uri);
+
+        let repoPath = gitUri.repoPath;
+        try {
+            if (!repoPath) {
+                repoPath = await this.git.getRepoPathFromFile(gitUri.fsPath);
+            }
+
+            if (!repoPath) return window.showWarningMessage(`Unable to show repository history`);
+
+            const log = await this.git.getLogForRepo(repoPath);
+            if (!log) return window.showWarningMessage(`Unable to show repository history`);
+
+            const items = Iterables.map(log.commits.values(), c => new CommitQuickPickItem(c));
+            const commitPick = await window.showQuickPick(Array.from(items), <QuickPickOptions>{
+                matchOnDescription: true,
+                matchOnDetail: true
+            });
+
+            if (commitPick) {
+                const items = commitPick.commit.fileName.split(', ').map(f => new FileQuickPickItem(commitPick.commit, f));
+                const filePick = await window.showQuickPick(items, <QuickPickOptions>{
+                    matchOnDescription: true,
+                    matchOnDetail: true,
+                    placeHolder: `${commitPick.commit.author}, ${moment(commitPick.commit.date).fromNow()} \u2022 ${commitPick.commit.sha}`
+                });
+
+                if (filePick) {
+                    const commit = new GitCommit(commitPick.commit.repoPath, commitPick.commit.sha, filePick.fileName, commitPick.commit.author, commitPick.commit.date, commitPick.commit.message, undefined, undefined, commitPick.commit.previousSha);
+                    commands.executeCommand(Commands.DiffWithWorking, filePick.uri, commit);
+                }
+            }
+        }
+        catch (ex) {
+            Logger.error('[GitLens.ShowQuickRepoHistoryCommand]', 'getLogLocations', ex);
+            return window.showErrorMessage(`Unable to show repository history. See output channel for more details`);
+        }
+    }
+}