Quellcode durchsuchen
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.0main
Eric Amodio
vor 8 Jahren
30 geänderte Dateien mit 764 neuen und 353 gelöschten Zeilen
-
+24 -1CHANGELOG.md
-
+3 -3README.md
-
+50 -11package.json
-
+59 -0src/activeEditorTracker.ts
-
+10 -1src/blameActiveLineController.ts
-
+5 -1src/commands.ts
-
+70 -0src/commands/closeUnchangedFiles.ts
-
+19 -2src/commands/commands.ts
-
+35 -0src/commands/diffDirectory.ts
-
+41 -0src/commands/openChangedFiles.ts
-
+20 -49src/commands/showQuickCommitDetails.ts
-
+89 -0src/commands/showQuickCommitFileDetails.ts
-
+12 -17src/commands/showQuickFileHistory.ts
-
+12 -30src/commands/showQuickRepoHistory.ts
-
+2 -14src/commands/showQuickRepoStatus.ts
-
+9 -1src/comparers.ts
-
+4 -2src/configuration.ts
-
+15 -3src/extension.ts
-
+3 -3src/git/enrichers/logParserEnricher.ts
-
+47 -34src/git/git.ts
-
+4 -1src/git/gitEnrichment.ts
-
+13 -2src/gitCodeLensProvider.ts
-
+24 -10src/gitProvider.ts
-
+2 -1src/quickPicks.ts
-
+27 -119src/quickPicks/commitDetails.ts
-
+111 -0src/quickPicks/commitFileDetails.ts
-
+13 -9src/quickPicks/fileHistory.ts
-
+3 -16src/quickPicks/quickPicks.ts
-
+1 -3src/quickPicks/repoHistory.ts
-
+37 -20src/quickPicks/repoStatus.ts
+ 24
- 1
CHANGELOG.md
Datei anzeigen
+ 3
- 3
README.md
Datei anzeigen
+ 50
- 11
package.json
Datei anzeigen
+ 59
- 0
src/activeEditorTracker.ts
Datei anzeigen
| @ -0,0 +1,59 @@ | |||||
| 'use strict'; | |||||
| import { commands, Disposable, TextEditor, window } from 'vscode'; | |||||
| export class ActiveEditorTracker extends Disposable { | |||||
| private _disposable: Disposable; | |||||
| private _resolver: (value?: TextEditor | PromiseLike<TextEditor>) => void; | |||||
| constructor() { | |||||
| super(() => this.dispose()); | |||||
| this._disposable = window.onDidChangeActiveTextEditor(e => this._resolver && this._resolver(e)); | |||||
| } | |||||
| dispose() { | |||||
| this._disposable && this._disposable.dispose(); | |||||
| } | |||||
| async awaitClose(timeout: number = 500): Promise<TextEditor> { | |||||
| this.close(); | |||||
| return this.wait(timeout); | |||||
| } | |||||
| async awaitNext(timeout: number = 500): Promise<TextEditor> { | |||||
| this.next(); | |||||
| return this.wait(timeout); | |||||
| } | |||||
| async close(): Promise<{}> { | |||||
| return commands.executeCommand('workbench.action.closeActiveEditor'); | |||||
| } | |||||
| async next(): Promise<{}> { | |||||
| return commands.executeCommand('workbench.action.nextEditor'); | |||||
| } | |||||
| async wait(timeout: number = 500): Promise<TextEditor> { | |||||
| const editor = await new Promise<TextEditor>((resolve, reject) => { | |||||
| let timer: any; | |||||
| this._resolver = (editor: TextEditor) => { | |||||
| if (timer) { | |||||
| clearTimeout(timer as any); | |||||
| timer = 0; | |||||
| resolve(editor); | |||||
| } | |||||
| }; | |||||
| timer = setTimeout(() => { | |||||
| resolve(window.activeTextEditor); | |||||
| timer = 0; | |||||
| }, timeout) as any; | |||||
| }); | |||||
| this._resolver = undefined; | |||||
| return editor; | |||||
| } | |||||
| } | |||||
+ 10
- 1
src/blameActiveLineController.ts
Datei anzeigen
+ 5
- 1
src/commands.ts
Datei anzeigen
| @ -1,17 +1,21 @@ | |||||
| 'use strict'; | 'use strict'; | ||||
| export { Keyboard } from './commands/keyboard'; | export { Keyboard } from './commands/keyboard'; | ||||
| export { ActiveEditorCommand, Command, Commands, EditorCommand } from './commands/commands'; | |||||
| export { ActiveEditorCommand, Command, Commands, EditorCommand, openEditor } from './commands/commands'; | |||||
| export { CloseUnchangedFilesCommand } from './commands/closeUnchangedFiles'; | |||||
| export { CopyMessageToClipboardCommand } from './commands/copyMessageToClipboard'; | export { CopyMessageToClipboardCommand } from './commands/copyMessageToClipboard'; | ||||
| export { CopyShaToClipboardCommand } from './commands/copyShaToClipboard'; | export { CopyShaToClipboardCommand } from './commands/copyShaToClipboard'; | ||||
| export { DiffDirectoryCommand } from './commands/diffDirectory'; | |||||
| export { DiffLineWithPreviousCommand } from './commands/diffLineWithPrevious'; | export { DiffLineWithPreviousCommand } from './commands/diffLineWithPrevious'; | ||||
| export { DiffLineWithWorkingCommand } from './commands/diffLineWithWorking'; | export { DiffLineWithWorkingCommand } from './commands/diffLineWithWorking'; | ||||
| export { DiffWithPreviousCommand } from './commands/diffWithPrevious'; | export { DiffWithPreviousCommand } from './commands/diffWithPrevious'; | ||||
| export { DiffWithWorkingCommand } from './commands/diffWithWorking'; | export { DiffWithWorkingCommand } from './commands/diffWithWorking'; | ||||
| export { OpenChangedFilesCommand } from './commands/openChangedFiles'; | |||||
| export { ShowBlameCommand } from './commands/showBlame'; | export { ShowBlameCommand } from './commands/showBlame'; | ||||
| export { ShowBlameHistoryCommand } from './commands/showBlameHistory'; | export { ShowBlameHistoryCommand } from './commands/showBlameHistory'; | ||||
| export { ShowFileHistoryCommand } from './commands/showFileHistory'; | export { ShowFileHistoryCommand } from './commands/showFileHistory'; | ||||
| export { ShowQuickCommitDetailsCommand } from './commands/showQuickCommitDetails'; | export { ShowQuickCommitDetailsCommand } from './commands/showQuickCommitDetails'; | ||||
| export { ShowQuickCommitFileDetailsCommand } from './commands/showQuickCommitFileDetails'; | |||||
| export { ShowQuickFileHistoryCommand } from './commands/showQuickFileHistory'; | export { ShowQuickFileHistoryCommand } from './commands/showQuickFileHistory'; | ||||
| export { ShowQuickRepoHistoryCommand } from './commands/showQuickRepoHistory'; | export { ShowQuickRepoHistoryCommand } from './commands/showQuickRepoHistory'; | ||||
| export { ShowQuickRepoStatusCommand } from './commands/showQuickRepoStatus'; | export { ShowQuickRepoStatusCommand } from './commands/showQuickRepoStatus'; | ||||
+ 70
- 0
src/commands/closeUnchangedFiles.ts
Datei anzeigen
| @ -0,0 +1,70 @@ | |||||
| 'use strict'; | |||||
| import { TextEditor, Uri, window } from 'vscode'; | |||||
| import { ActiveEditorTracker } from '../activeEditorTracker'; | |||||
| import { ActiveEditorCommand, Commands } from './commands'; | |||||
| import { TextEditorComparer, UriComparer } from '../comparers'; | |||||
| import { GitProvider } from '../gitProvider'; | |||||
| import { Logger } from '../logger'; | |||||
| import * as path from 'path'; | |||||
| export class CloseUnchangedFilesCommand extends ActiveEditorCommand { | |||||
| constructor(private git: GitProvider, public repoPath: string) { | |||||
| super(Commands.CloseUnchangedFiles); | |||||
| } | |||||
| async execute(editor: TextEditor, uri?: Uri, uris?: Uri[]) { | |||||
| if (!(uri instanceof Uri)) { | |||||
| uri = editor && editor.document && editor.document.uri; | |||||
| } | |||||
| try { | |||||
| if (!uris) { | |||||
| const repoPath = await this.git.getRepoPathFromUri(uri, this.repoPath); | |||||
| if (!repoPath) return window.showWarningMessage(`Unable to close unchanged files`); | |||||
| const statuses = await this.git.getStatusesForRepo(repoPath); | |||||
| if (!statuses) return window.showWarningMessage(`Unable to close unchanged files`); | |||||
| uris = statuses.map(_ => Uri.file(path.resolve(repoPath, _.fileName))); | |||||
| } | |||||
| const editorTracker = new ActiveEditorTracker(); | |||||
| let active = window.activeTextEditor; | |||||
| let editor = active; | |||||
| do { | |||||
| if (editor) { | |||||
| if ((editor.document && editor.document.isDirty) || | |||||
| uris.some(_ => UriComparer.equals(_, editor.document && editor.document.uri))) { | |||||
| // If we didn't start with a valid editor, set one once we find it | |||||
| if (!active) { | |||||
| active = editor; | |||||
| } | |||||
| editor = await editorTracker.awaitNext(500); | |||||
| } | |||||
| else { | |||||
| if (active === editor) { | |||||
| active = undefined; | |||||
| } | |||||
| editor = await editorTracker.awaitClose(500); | |||||
| } | |||||
| } | |||||
| else { | |||||
| if (active === editor) { | |||||
| active = undefined; | |||||
| } | |||||
| editor = await editorTracker.awaitClose(500); | |||||
| } | |||||
| } while ((!active && !editor) || !TextEditorComparer.equals(active, editor, { useId: true, usePosition: true })); | |||||
| editorTracker.dispose(); | |||||
| return undefined; | |||||
| } | |||||
| catch (ex) { | |||||
| Logger.error('[GitLens.CloseUnchangedFilesCommand]', ex); | |||||
| return window.showErrorMessage(`Unable to close unchanged files. See output channel for more details`); | |||||
| } | |||||
| } | |||||
| } | |||||
+ 19
- 2
src/commands/commands.ts
Datei anzeigen
+ 35
- 0
src/commands/diffDirectory.ts
Datei anzeigen
| @ -0,0 +1,35 @@ | |||||
| 'use strict'; | |||||
| import { TextEditor, Uri, window } from 'vscode'; | |||||
| import { ActiveEditorCommand, Commands } from './commands'; | |||||
| import { GitProvider } from '../gitProvider'; | |||||
| import { Logger } from '../logger'; | |||||
| export class DiffDirectoryCommand extends ActiveEditorCommand { | |||||
| constructor(private git: GitProvider, public repoPath: string) { | |||||
| super(Commands.DiffDirectory); | |||||
| } | |||||
| async execute(editor: TextEditor, uri?: Uri, shaOrBranch1?: string, shaOrBranch2?: string): Promise<any> { | |||||
| if (!(uri instanceof Uri)) { | |||||
| uri = editor && editor.document && editor.document.uri; | |||||
| } | |||||
| try { | |||||
| const repoPath = await this.git.getRepoPathFromUri(uri, this.repoPath); | |||||
| if (!repoPath) return window.showWarningMessage(`Unable to open directory diff`); | |||||
| if (!shaOrBranch1) { | |||||
| //window.showQuickPick() | |||||
| return undefined; | |||||
| } | |||||
| this.git.openDirectoryDiff(repoPath, shaOrBranch1, shaOrBranch2); | |||||
| return undefined; | |||||
| } | |||||
| catch (ex) { | |||||
| Logger.error('GitLens.DiffDirectoryCommand', ex); | |||||
| return window.showErrorMessage(`Unable to open directory diff. See output channel for more details`); | |||||
| } | |||||
| } | |||||
| } | |||||
+ 41
- 0
src/commands/openChangedFiles.ts
Datei anzeigen
| @ -0,0 +1,41 @@ | |||||
| 'use strict'; | |||||
| import { TextEditor, Uri, window } from 'vscode'; | |||||
| import { ActiveEditorCommand, Commands, openEditor } from './commands'; | |||||
| import { GitProvider } from '../gitProvider'; | |||||
| import { Logger } from '../logger'; | |||||
| import * as path from 'path'; | |||||
| export class OpenChangedFilesCommand extends ActiveEditorCommand { | |||||
| constructor(private git: GitProvider, public repoPath: string) { | |||||
| super(Commands.OpenChangedFiles); | |||||
| } | |||||
| async execute(editor: TextEditor, uri?: Uri, uris?: Uri[]) { | |||||
| if (!(uri instanceof Uri)) { | |||||
| uri = editor && editor.document && editor.document.uri; | |||||
| } | |||||
| try { | |||||
| if (!uris) { | |||||
| const repoPath = await this.git.getRepoPathFromUri(uri, this.repoPath); | |||||
| if (!repoPath) return window.showWarningMessage(`Unable to open changed files`); | |||||
| const statuses = await this.git.getStatusesForRepo(repoPath); | |||||
| if (!statuses) return window.showWarningMessage(`Unable to open changed files`); | |||||
| uris = statuses.filter(_ => _.status !== 'D').map(_ => Uri.file(path.resolve(repoPath, _.fileName))); | |||||
| } | |||||
| for (const uri of uris) { | |||||
| await openEditor(uri, true); | |||||
| } | |||||
| return undefined; | |||||
| } | |||||
| catch (ex) { | |||||
| Logger.error('[GitLens.OpenChangedFilesCommand]', ex); | |||||
| return window.showErrorMessage(`Unable to open changed files. See output channel for more details`); | |||||
| } | |||||
| } | |||||
| } | |||||
+ 20
- 49
src/commands/showQuickCommitDetails.ts
Datei anzeigen
+ 89
- 0
src/commands/showQuickCommitFileDetails.ts
Datei anzeigen
| @ -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`); | |||||
| } | |||||
| } | |||||
| } | |||||
+ 12
- 17
src/commands/showQuickFileHistory.ts
Datei anzeigen
+ 12
- 30
src/commands/showQuickRepoHistory.ts
Datei anzeigen
+ 2
- 14
src/commands/showQuickRepoStatus.ts
Datei anzeigen
+ 9
- 1
src/comparers.ts
Datei anzeigen
+ 4
- 2
src/configuration.ts
Datei anzeigen
+ 15
- 3
src/extension.ts
Datei anzeigen
+ 3
- 3
src/git/enrichers/logParserEnricher.ts
Datei anzeigen
+ 47
- 34
src/git/git.ts
Datei anzeigen
+ 4
- 1
src/git/gitEnrichment.ts
Datei anzeigen
+ 13
- 2
src/gitCodeLensProvider.ts
Datei anzeigen
+ 24
- 10
src/gitProvider.ts
Datei anzeigen
+ 2
- 1
src/quickPicks.ts
Datei anzeigen
| @ -1,7 +1,8 @@ | |||||
| 'use strict'; | 'use strict'; | ||||
| export { CommandQuickPickItem, OpenFileCommandQuickPickItem, OpenFilesCommandQuickPickItem } from './quickPicks/quickPicks'; | export { CommandQuickPickItem, OpenFileCommandQuickPickItem, OpenFilesCommandQuickPickItem } from './quickPicks/quickPicks'; | ||||
| export { CommitQuickPickItem, CommitWithFileStatusQuickPickItem } from './quickPicks/gitQuickPicks'; | export { CommitQuickPickItem, CommitWithFileStatusQuickPickItem } from './quickPicks/gitQuickPicks'; | ||||
| export { OpenCommitFileCommandQuickPickItem, OpenCommitWorkingTreeFileCommandQuickPickItem, OpenCommitFilesCommandQuickPickItem, OpenCommitWorkingTreeFilesCommandQuickPickItem, CommitDetailsQuickPick, CommitFileDetailsQuickPick } from './quickPicks/commitDetails'; | |||||
| export { OpenCommitFilesCommandQuickPickItem, OpenCommitWorkingTreeFilesCommandQuickPickItem, CommitDetailsQuickPick } from './quickPicks/commitDetails'; | |||||
| export { OpenCommitFileCommandQuickPickItem, OpenCommitWorkingTreeFileCommandQuickPickItem, CommitFileDetailsQuickPick } from './quickPicks/commitFileDetails'; | |||||
| export { FileHistoryQuickPick } from './quickPicks/fileHistory'; | export { FileHistoryQuickPick } from './quickPicks/fileHistory'; | ||||
| export { RepoHistoryQuickPick } from './quickPicks/repoHistory'; | export { RepoHistoryQuickPick } from './quickPicks/repoHistory'; | ||||
| export { OpenStatusFileCommandQuickPickItem, OpenStatusFilesCommandQuickPickItem, RepoStatusQuickPick } from './quickPicks/repoStatus'; | export { OpenStatusFileCommandQuickPickItem, OpenStatusFilesCommandQuickPickItem, RepoStatusQuickPick } from './quickPicks/repoStatus'; | ||||
+ 27
- 119
src/quickPicks/commitDetails.ts
Datei anzeigen
+ 111
- 0
src/quickPicks/commitFileDetails.ts
Datei anzeigen
| @ -0,0 +1,111 @@ | |||||
| 'use strict'; | |||||
| import { Iterables } from '../system'; | |||||
| import { QuickPickItem, QuickPickOptions, Uri, window } from 'vscode'; | |||||
| import { Commands, Keyboard } from '../commands'; | |||||
| import { GitCommit, GitLogCommit, GitProvider, GitUri } from '../gitProvider'; | |||||
| import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, OpenFileCommandQuickPickItem } from './quickPicks'; | |||||
| import * as moment from 'moment'; | |||||
| import * as path from 'path'; | |||||
| export class OpenCommitFileCommandQuickPickItem extends OpenFileCommandQuickPickItem { | |||||
| constructor(commit: GitCommit, item?: QuickPickItem) { | |||||
| const uri = GitProvider.toGitContentUri(commit); | |||||
| super(uri, item || { | |||||
| label: `$(file-symlink-file) Open File`, | |||||
| description: `\u00a0 \u2014 \u00a0\u00a0 ${path.basename(commit.fileName)} in \u00a0$(git-commit) ${commit.sha}` | |||||
| }); | |||||
| } | |||||
| } | |||||
| export class OpenCommitWorkingTreeFileCommandQuickPickItem extends OpenFileCommandQuickPickItem { | |||||
| constructor(commit: GitCommit, item?: QuickPickItem) { | |||||
| const uri = Uri.file(path.resolve(commit.repoPath, commit.fileName)); | |||||
| super(uri, item || { | |||||
| label: `$(file-symlink-file) Open Working File`, | |||||
| description: `\u00a0 \u2014 \u00a0\u00a0 ${path.basename(commit.fileName)}` | |||||
| }); | |||||
| } | |||||
| } | |||||
| export class CommitFileDetailsQuickPick { | |||||
| static async show(git: GitProvider, commit: GitCommit | GitLogCommit, workingFileName: string, uri: Uri, goBackCommand?: CommandQuickPickItem, currentCommand?: CommandQuickPickItem, options: { showFileHistory?: boolean } = {}): Promise<CommandQuickPickItem | undefined> { | |||||
| const items: CommandQuickPickItem[] = []; | |||||
| const workingName = (workingFileName && path.basename(workingFileName)) || path.basename(commit.fileName); | |||||
| const isUncommitted = commit.isUncommitted; | |||||
| if (isUncommitted) { | |||||
| // Since we can't trust the previous sha on an uncommitted commit, find the last commit for this file | |||||
| const log = await git.getLogForFile(commit.uri.fsPath, undefined, undefined, undefined, 2); | |||||
| if (!log) return undefined; | |||||
| commit = Iterables.first(log.commits.values()); | |||||
| } | |||||
| if (!options.showFileHistory) { | |||||
| items.push(new CommandQuickPickItem({ | |||||
| label: `$(git-commit) Show Commit Details`, | |||||
| description: `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.sha}` | |||||
| }, Commands.ShowQuickCommitDetails, [new GitUri(commit.uri, commit), commit.sha, commit, currentCommand])); | |||||
| } | |||||
| if (commit.previousSha) { | |||||
| items.push(new CommandQuickPickItem({ | |||||
| label: `$(git-compare) Compare with Previous Commit`, | |||||
| description: `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.previousSha} \u00a0 $(git-compare) \u00a0 $(git-commit) ${commit.sha}` | |||||
| }, Commands.DiffWithPrevious, [commit.uri, commit])); | |||||
| } | |||||
| items.push(new CommandQuickPickItem({ | |||||
| label: `$(git-compare) Compare with Working Tree`, | |||||
| description: `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.sha} \u00a0 $(git-compare) \u00a0 $(file-text) ${workingName}` | |||||
| }, Commands.DiffWithWorking, [uri, commit])); | |||||
| items.push(new CommandQuickPickItem({ | |||||
| label: `$(clippy) Copy Commit Sha to Clipboard`, | |||||
| description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.sha}` | |||||
| }, Commands.CopyShaToClipboard, [uri, commit.sha])); | |||||
| items.push(new CommandQuickPickItem({ | |||||
| label: `$(clippy) Copy Commit Message to Clipboard`, | |||||
| description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.message}` | |||||
| }, Commands.CopyMessageToClipboard, [uri, commit.sha, commit.message])); | |||||
| items.push(new OpenCommitFileCommandQuickPickItem(commit)); | |||||
| items.push(new OpenCommitWorkingTreeFileCommandQuickPickItem(commit)); | |||||
| if (workingFileName && options.showFileHistory) { | |||||
| items.push(new CommandQuickPickItem({ | |||||
| label: `$(history) Show File History`, | |||||
| description: `\u00a0 \u2014 \u00a0\u00a0 of ${path.basename(commit.fileName)}` | |||||
| }, Commands.ShowQuickFileHistory, [commit.uri, undefined, currentCommand])); | |||||
| } | |||||
| items.push(new CommandQuickPickItem({ | |||||
| label: `$(history) Show ${workingFileName && options.showFileHistory ? 'Previous ' : ''}File History`, | |||||
| description: `\u00a0 \u2014 \u00a0\u00a0 of ${path.basename(commit.fileName)} \u00a0\u2022\u00a0 starting from \u00a0$(git-commit) ${commit.sha}` | |||||
| }, Commands.ShowQuickFileHistory, [new GitUri(commit.uri, commit), undefined, currentCommand])); | |||||
| if (goBackCommand) { | |||||
| items.splice(0, 0, goBackCommand); | |||||
| } | |||||
| await Keyboard.instance.enterScope(['left', goBackCommand]); | |||||
| const pick = await window.showQuickPick(items, { | |||||
| matchOnDescription: true, | |||||
| placeHolder: `${commit.getFormattedPath()} \u2022 ${isUncommitted ? 'Uncommitted \u21E8 ' : '' }${commit.sha} \u2022 ${commit.author}, ${moment(commit.date).fromNow()} \u2022 ${commit.message}`, | |||||
| ignoreFocusOut: getQuickPickIgnoreFocusOut(), | |||||
| onDidSelectItem: (item: QuickPickItem) => { | |||||
| Keyboard.instance.setKeyCommand('right', item); | |||||
| } | |||||
| } as QuickPickOptions); | |||||
| await Keyboard.instance.exitScope(); | |||||
| return pick; | |||||
| } | |||||
| } | |||||