ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-01-18 17:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Switches to porcelain blame format

Browse Source 
Provides more data (commit message, previous commit, etc)
This commit is contained in:
Eric Amodio
2016-09-04 03:43:35 -04:00
parent 47ce5c5132
commit ebb1085562
3 changed files with 159 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gitBlameController.ts
View File

@@ -76,14 +76,14 @@ export default class GitBlameController extends Disposable {
class GitBlameEditorController extends Disposable {
private _subscription: Disposable;
private _blame: Promise<IGitBlame>;
private _commits: Promise<Map<string, string>>;
//private _commits: Promise<Map<string, string>>;
constructor(private git: GitProvider, private blameDecoration: TextEditorDecorationType, private highlightDecoration: TextEditorDecorationType, public editor: TextEditor, public sha: string) {
super(() => this.dispose());
const fileName = this.editor.document.uri.path;
this._blame = this.git.getBlameForFile(fileName);
this._commits = this.git.getCommitMessages(fileName);
//this._commits = this.git.getCommitMessages(fileName);
this._subscription = Disposable.from(window.onDidChangeTextEditorSelection(e => {
const activeLine = e.selections[0].active.line;
@@ -106,22 +106,22 @@ class GitBlameEditorController extends Disposable {
return this._blame.then(blame => {
if (!blame.lines.length) return;
return this._commits.then(msgs => {
const commits = Array.from(blame.commits.values());
commits.forEach(c => c.message = msgs.get(c.sha.substring(0, c.sha.length - 1)));
// return this._commits.then(msgs => {
// const commits = Array.from(blame.commits.values());
// commits.forEach(c => c.message = msgs.get(c.sha.substring(0, c.sha.length - 1)));
const blameDecorationOptions: DecorationOptions[] = blame.lines.map(l => {
const c = blame.commits.get(l.sha);
return {
range: this.editor.document.validateRange(new Range(l.line, 0, l.line, 0)),
hoverMessage: `${c.message}\n${c.author}, ${moment(c.date).format('MMMM Do, YYYY hh:MM a')}`,
renderOptions: { before: { contentText: `${l.sha}`, } }
renderOptions: { before: { contentText: `${l.sha.substring(0, 8)}`, } }
};
});
this.editor.setDecorations(this.blameDecoration, blameDecorationOptions);
return this.applyHighlight(sha || commits[0].sha);
});
return this.applyHighlight(sha || blame.commits.values().next().value.sha);
// });
});
}