Skip to content

Configurable message for status/popup #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Configurable message for status/popup #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4241b7b
Whitespace changes will be ignored
Dec 10, 2016
bc2a020
Configuration option
Dec 10, 2016
a2cda1a
Simple message formatting options
Dec 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"compile": "node ./node_modules/vscode/bin/compile -watch -p ./"
},
"dependencies": {
"git-blame": "^0.1.1",
"git-blame": "^1.1.0",
"moment": "^2.10.6",
"path": "^0.12.7",
"typescript": "^1.6.2",
Expand All @@ -46,6 +46,26 @@
"commands": [{
"command": "extension.blame",
"title": "Git Blame"
}]
}],
"configuration": {
"title": "Git Blame configuration",
"properties": {
"git-blame.ignore-whitespace-change":{
"type": "boolean",
"default": true,
"description" : "If set to true, git blame command will ignore any whitespace change applied to currently selected line"
},
"git-blame.status-message":{
"type": "string",
"default": "Blame %s ( %s )",
"description" : "Output message shown in status bar"
},
"git-blame.popup-message":{
"type": "string",
"default": "%s %s",
"description": "Output message shown in tooltip bar"
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import {Disposable, window, TextEditor, TextEditorSelectionChangeEvent} from 'vscode';
import {Disposable, window, TextEditor, TextEditorSelectionChangeEvent, workspace} from 'vscode';
import {GitBlame} from './gitblame';
import * as path from 'path';
import * as moment from 'moment';
Expand Down Expand Up @@ -75,7 +75,7 @@ export class TextDecorator {
const author = commit['author'];
const dateText = this.toDateText(dateNow, new Date(author['timestamp'] * 1000));

return 'Blame ' + author['name'] + ' ( ' + dateText + ' )';
return require('util').format(workspace.getConfiguration('git-blame').get<string>('status-message', 'Blame %s ( %s )'), author['name'], dateText);
}

toDateText(dateNow: Date, dateThen: Date) : string {
Expand Down
2 changes: 1 addition & 1 deletion src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function showMessage(context: ExtensionContext, repoDir: string) {
const hash = info['lines'][lineNumber]['hash'];
const commitInfo = info['commits'][hash];

window.showInformationMessage(hash + ' ' + commitInfo['summary']);
window.showInformationMessage(require('util').format(workspace.getConfiguration('git-blame').get<string>('popup-message', '%s %s'), hash, commitInfo['summary']));
}
});
}
Expand Down
5 changes: 3 additions & 2 deletions src/gitblame.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

import * as vscode from 'vscode';

export class GitBlame {

Expand Down Expand Up @@ -38,7 +38,8 @@ export class GitBlame {
};

self.gitBlameProcess(repo, {
file: fileName
file: fileName,
ignoreWhitespaces: vscode.workspace.getConfiguration('git-blame').get<boolean>("ignore-whitespace-change", true)
}).on('data', (type, data) => {
// outputs in Porcelain format.
if (type === 'line') {
Expand Down