Просмотр исходного кода
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.showQuickFileHistorymain
Eric Amodio
8 лет назад
15 измененных файлов: 313 добавлений и 77 удалений
-
+12 -0CHANGELOG.md
-
+3 -7README.md
-
+51 -26package.json
-
+2 -8src/blameStatusBarController.ts
-
+2 -2src/commands/showFileHistory.ts
-
+54 -0src/commands/showQuickFileHistory.ts
-
+84 -0src/commands/showQuickRepoHistory.ts
-
+4 -4src/configuration.ts
-
+4 -3src/constants.ts
-
+5 -2src/extension.ts
-
+47 -14src/git/enrichers/logParserEnricher.ts
-
+10 -0src/git/git.ts
-
+5 -9src/gitCodeLensProvider.ts
-
+30 -1src/gitProvider.ts
-
+0 -1tslint.json
+ 12
- 0
CHANGELOG.md
Просмотреть файл
+ 3
- 7
README.md
Просмотреть файл
+ 51
- 26
package.json
Просмотреть файл
+ 2
- 8
src/blameStatusBarController.ts
Просмотреть файл
+ 2
- 2
src/commands/showFileHistory.ts
Просмотреть файл
+ 54
- 0
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`); | |||
| } | |||
| } | |||
| } | |||
+ 84
- 0
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`); | |||
| } | |||
| } | |||
| } | |||