Refactors commit quick pick commands

Splits showQuickCommitDetails into showQuickCommitDetails and showQuickCommitFileDetails Adds closeUnchangedFiles command Adds openChangedFiles command Adds diffDirectory command Adds contextual description to the `go back` commands Fixes #44 by adding a warning message about Git version requirements Fixes intermittent errors when adding active line annotations Fixes intermittent errors when opening multiple files via quick picks Updates dependencies Preps v2.11.0
2026-01-18 09:45:36 -05:00 · 2017-03-09 02:18:20 -05:00
parent 1c29fa3f33
commit eaea44872c
30 changed files with 765 additions and 354 deletions
--- a/src/commands/showQuickCommitFileDetails.ts
+++ b/src/commands/showQuickCommitFileDetails.ts
@@ -0,0 +1,89 @@
+'use strict';
+import { Iterables } from '../system';
+import { TextEditor, Uri, window } from 'vscode';
+import { ActiveEditorCommand, Commands } from './commands';
+import { GitCommit, GitLogCommit, GitProvider, GitUri } from '../gitProvider';
+import { Logger } from '../logger';
+import { CommandQuickPickItem, CommitFileDetailsQuickPick } from '../quickPicks';
+import * as path from 'path';
+
+export class ShowQuickCommitFileDetailsCommand extends ActiveEditorCommand {
+
+    constructor(private git: GitProvider) {
+        super(Commands.ShowQuickCommitFileDetails);
+    }
+
+    async execute(editor: TextEditor, uri?: Uri, sha?: string, commit?: GitCommit | GitLogCommit, goBackCommand?: CommandQuickPickItem, options: { showFileHistory?: boolean } = { showFileHistory: true }) {
+        if (!(uri instanceof Uri)) {
+            if (!editor || !editor.document) return undefined;
+            uri = editor.document.uri;
+        }
+
+        const gitUri = await GitUri.fromUri(uri, this.git);
+
+        let repoPath = gitUri.repoPath;
+
+        if (!sha) {
+            if (!editor) return undefined;
+
+            const blameline = editor.selection.active.line - gitUri.offset;
+            if (blameline < 0) return undefined;
+
+            try {
+                const blame = await this.git.getBlameForLine(gitUri.fsPath, blameline, gitUri.sha, gitUri.repoPath);
+                if (!blame) return window.showWarningMessage(`Unable to show commit file details. File is probably not under source control`);
+
+                sha = blame.commit.isUncommitted ? blame.commit.previousSha : blame.commit.sha;
+                repoPath = blame.commit.repoPath;
+
+                commit = blame.commit;
+            }
+            catch (ex) {
+                Logger.error('[GitLens.ShowQuickCommitFileDetailsCommand]', `getBlameForLine(${blameline})`, ex);
+                return window.showErrorMessage(`Unable to show commit file details. See output channel for more details`);
+            }
+        }
+
+        try {
+            if (!commit || ((commit instanceof GitLogCommit) && commit.type !== 'file')) {
+                let log = await this.git.getLogForFile(uri.fsPath, sha, undefined, undefined, 2);
+                if (!log) return window.showWarningMessage(`Unable to show commit file details`);
+
+                commit = Iterables.find(log.commits.values(), c => c.sha === sha);
+            }
+
+            // Attempt to the most recent commit -- so that we can find the real working filename if there was a rename
+            const workingCommit = await this.git.findMostRecentCommitForFile(commit.uri.fsPath, commit.sha);
+            // TODO: Leave this at undefined until findMostRecentCommitForFile actually works
+            const workingFileName = !workingCommit ? commit.fileName : undefined;
+
+            if (!goBackCommand) {
+                // Create a command to get back to the commit details
+                goBackCommand = new CommandQuickPickItem({
+                    label: `go back \u21A9`,
+                    description: `\u00a0 \u2014 \u00a0\u00a0 to details of \u00a0$(git-commit) ${sha}`
+                }, Commands.ShowQuickCommitDetails, [new GitUri(commit.uri, commit), sha, commit]);
+            }
+
+            const pick = await CommitFileDetailsQuickPick.show(this.git, commit, workingFileName, uri, goBackCommand,
+                // Create a command to get back to where we are right now
+                new CommandQuickPickItem({
+                    label: `go back \u21A9`,
+                    description: `\u00a0 \u2014 \u00a0\u00a0 to details of \u00a0$(file-text) ${path.basename(commit.fileName)} in \u00a0$(git-commit) ${sha}`
+                }, Commands.ShowQuickCommitFileDetails, [new GitUri(commit.uri, commit), sha, commit, goBackCommand, options]),
+                { showFileHistory: options.showFileHistory });
+
+            if (!pick) return undefined;
+
+            if (pick instanceof CommandQuickPickItem) {
+                return pick.execute();
+            }
+
+            return undefined;
+        }
+        catch (ex) {
+            Logger.error('[GitLens.ShowQuickCommitFileDetailsCommand]', ex);
+            return window.showErrorMessage(`Unable to show commit file details. See output channel for more details`);
+        }
+    }
+}