microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-09 09:24:12 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

#10542 MergeItem class created, localized strings

Browse Source
This commit is contained in:
Rokas Gečas
2017-05-05 14:12:31 +03:00
parent 818fa5a50f
commit 89cd05f877
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
extensions/git/src/commands.ts
View File

@@ -17,21 +17,15 @@ import * as nls from 'vscode-nls';
const localize = nls.loadMessageBundle();
class CheckoutBasicItem implements QuickPickItem {
get label(): string { return this.ref.name || ''; }
get description(): string { return this.ref.name || ''; }
constructor(protected ref: Ref) { }
}
class CheckoutItem extends CheckoutBasicItem {
class CheckoutItem implements QuickPickItem {
protected get shortCommit(): string { return (this.ref.commit || '').substr(0, 8); }
protected get treeish(): string | undefined { return this.ref.name; }
get label(): string { return this.ref.name || this.shortCommit; }
get description(): string { return this.shortCommit; }
constructor(protected ref: Ref) { }
async run(model: Model): Promise<void> {
const ref = this.treeish;
@@ -66,6 +60,14 @@ class CheckoutRemoteHeadItem extends CheckoutItem {
}
}
class MergeItem implements QuickPickItem {
get label(): string { return this.ref.name || ''; }
get description(): string { return this.ref.name || ''; }
constructor(protected ref: Ref) { }
}
interface Command {
commandId: string;
key: string;
@@ -651,7 +653,7 @@ export class CommandCenter {
.map(ref => new CheckoutRemoteHeadItem(ref));
const picks = [...heads, ...tags, ...remoteHeads];
const placeHolder = 'Select a ref to checkout';
const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
const choice = await window.showQuickPick<CheckoutItem>(picks, { placeHolder });
if (!choice) {
@@ -684,14 +686,14 @@ export class CommandCenter {
const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';
const heads = this.model.refs.filter(ref => ref.type === RefType.Head)
.map(ref => new CheckoutItem(ref));
.map(ref => new MergeItem(ref));
const remoteHeads = (includeRemotes ? this.model.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
.map(ref => new CheckoutRemoteHeadItem(ref));
.map(ref => new MergeItem(ref));
const picks = [...heads, ...remoteHeads];
const placeHolder = 'Select a ref to checkout';
const choice = await window.showQuickPick<CheckoutBasicItem>(picks, { placeHolder });
const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
if (!choice) {
return;