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

Changes quick pick item structure of the stash list

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/quickPicks/branchHistory.ts
View File

@@ -18,7 +18,7 @@ export class BranchHistoryQuickPick {
}
static async show(git: GitService, log: IGitLog, uri: GitUri, branch: string, progressCancellation: CancellationTokenSource, goBackCommand?: CommandQuickPickItem, nextPageCommand?: CommandQuickPickItem): Promise<CommitQuickPickItem | CommandQuickPickItem | undefined> {
const items = Array.from(Iterables.map(log.commits.values(), c => new CommitQuickPickItem(c, ` \u2014 ${c.fileNames}`))) as (CommitQuickPickItem | CommandQuickPickItem)[];
const items = Array.from(Iterables.map(log.commits.values(), c => new CommitQuickPickItem(c))) as (CommitQuickPickItem | CommandQuickPickItem)[];
const currentCommand = new CommandQuickPickItem({
label: `go back \u21A9`,

14
src/quickPicks/common.ts
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;
}
}

2
src/quickPicks/stashList.ts
View File

@@ -8,7 +8,7 @@ import { CommandQuickPickItem, CommitQuickPickItem, getQuickPickIgnoreFocusOut }
export class StashListQuickPick {
static async show(stash: IGitStash, placeHolder?: string, goBackCommand?: CommandQuickPickItem): Promise<CommitQuickPickItem | CommandQuickPickItem | undefined> {
const items = ((stash && Array.from(Iterables.map(stash.commits.values(), c => new CommitQuickPickItem(c, ` \u2014 ${c.fileNames}`)))) || []) as (CommitQuickPickItem | CommandQuickPickItem)[];
const items = ((stash && Array.from(Iterables.map(stash.commits.values(), c => new CommitQuickPickItem(c)))) || []) as (CommitQuickPickItem | CommandQuickPickItem)[];
if (goBackCommand) {
items.splice(0, 0, goBackCommand);