Changes quick pick item structure of the stash list

This commit is contained in:
Eric Amodio
2017-03-29 00:44:02 -04:00
parent 640a11b3cb
commit e3c9fd53ca
3 changed files with 10 additions and 8 deletions

View File

@@ -2,7 +2,7 @@
import { CancellationTokenSource, commands, Disposable, QuickPickItem, QuickPickOptions, TextEditor, Uri, window, workspace } from 'vscode';
import { Commands, Keyboard, KeyboardScope, KeyMapping, openEditor } from '../commands';
import { IAdvancedConfig } from '../configuration';
import { GitCommit } from '../gitService';
import { GitCommit, GitLogCommit, GitStashCommit } from '../gitService';
// import { Logger } from '../logger';
import * as moment from 'moment';
@@ -116,14 +116,16 @@ export class CommitQuickPickItem implements QuickPickItem {
description: string;
detail: string;
constructor(public commit: GitCommit, descriptionSuffix: string = '') {
if (commit.author) {
this.label = `${commit.author}, ${moment(commit.date).fromNow()}`;
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}
}
else {
this.label = `${moment(commit.date).fromNow()}`;
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.description = `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.shortSha}${descriptionSuffix}`;
this.detail = commit.message;
}
}