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

Closes #63 - Switch commit message and author in commit pick list

Browse Source
This commit is contained in:
Eric Amodio
2017-04-10 12:50:23 -04:00
parent e5653d1c66
commit a5be6f0533
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/git/models/logCommit.ts
View File

@@ -51,4 +51,11 @@ export class GitLogCommit extends GitCommit {
get nextUri(): Uri {
return this.nextFileName ? Uri.file(path.resolve(this.repoPath, this.nextFileName)) : this.uri;
}
getDiffStatus(): string {
const added = this.fileStatuses.filter(_ => _.status === 'A' || _.status === '?').length;
const deleted = this.fileStatuses.filter(_ => _.status === 'D').length;
const changed = this.fileStatuses.filter(_ => _.status !== 'A' && _.status !== '?' && _.status !== 'D').length;
return `+${added} ~${changed} -${deleted}`;
}
}

6
src/quickPicks/commitDetails.ts
View File

@@ -117,13 +117,9 @@ export class CommitDetailsQuickPick {
description: `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.shortSha} \u00a0 $(git-compare) \u00a0 $(file-directory) Working Tree`
}, Commands.DiffDirectory, [uri, commit.sha]));
const added = commit.fileStatuses.filter(_ => _.status === 'A' || _.status === '?').length;
const deleted = commit.fileStatuses.filter(_ => _.status === 'D').length;
const changed = commit.fileStatuses.filter(_ => _.status !== 'A' && _.status !== '?' && _.status !== 'D').length;
items.splice(index++, 0, new CommandQuickPickItem({
label: `Changed Files`,
description: `+${added} ~${changed} -${deleted}`
description: commit.getDiffStatus()
}, Commands.ShowQuickCommitDetails, [uri, commit.sha, commit, goBackCommand, repoLog]));
items.push(new OpenCommitFilesCommandQuickPickItem(commit));

12
src/quickPicks/common.ts
View File

@@ -118,14 +118,14 @@ export class CommitQuickPickItem implements QuickPickItem {
constructor(public commit: GitCommit) {
if (commit instanceof GitStashCommit) {
this.label = `${commit.stashName}, ${moment(commit.date).fromNow()}`;
this.description = `\u00a0\u00a0\u2014\u00a0\u00a0 ${commit.fileNames}`; //\u00a0\u00a0 $(git-commit) ${commit.shortSha}
this.label = `${commit.stashName}\u00a0\u2022\u00a0${commit.message}`;
this.description = null;
this.detail = `\u00a0 ${moment(commit.date).fromNow()}\u00a0\u00a0\u2022\u00a0 ${commit.getDiffStatus()}`;
}
else {
this.label = `${commit.author}, ${moment(commit.date).fromNow()}`;
const suffix = commit.type === 'branch' ? ` \u2014 ${(commit as GitLogCommit).fileNames}` : '';
this.description = `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.shortSha}${suffix}`;
this.label = commit.message;
this.description = `\u00a0$(git-commit)\u00a0 ${commit.shortSha}`;
this.detail = `\u00a0 ${commit.author}, ${moment(commit.date).fromNow()}${(commit.type === 'branch') ? `\u00a0\u00a0\u2022\u00a0 ${(commit as GitLogCommit).getDiffStatus()}` : ''}`;
}
this.detail = commit.message;
}
}