Merge branch 'master' of https://github.com/ryapapap/vscode into ryapapap-master

joaomoreno · joaomoreno · commit eeb38577f78f · 2016-12-13T09:35:43.000+01:00
diff --git a/src/vs/workbench/parts/git/browser/gitQuickOpen.ts b/src/vs/workbench/parts/git/browser/gitQuickOpen.ts
@@ -137,12 +137,16 @@ class CheckoutCommand implements ICommand {
 	getResults(input: string): TPromise<QuickOpenEntry[]> {
 		input = input.trim();
 
+		const checkoutType = this.gitService.checkoutType;
+		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
+		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';
+
 		const gitModel = this.gitService.getModel();
 		const currentHead = gitModel.getHEAD();
 		const refs = gitModel.getRefs();
 		const heads = refs.filter(ref => ref.type === RefType.Head);
-		const tags = refs.filter(ref => ref.type === RefType.Tag);
-		const remoteHeads = refs.filter(ref => ref.type === RefType.RemoteHead);
+		const tags = includeTags ? refs.filter(ref => ref.type === RefType.Tag) : [];
+		const remoteHeads = includeRemotes ? refs.filter(ref => ref.type === RefType.RemoteHead) : [];
 
 		const headMatches = heads
 			.map(head => ({ head, highlights: matchesContiguousSubString(input, head.name) }))
diff --git a/src/vs/workbench/parts/git/browser/gitServices.ts b/src/vs/workbench/parts/git/browser/gitServices.ts
@@ -418,6 +418,10 @@ export class GitService extends EventEmitter
 			this.transition(ServiceState.OK);
 		}
 	}
+	get checkoutType(): string {
+		const { checkoutType } = this.configurationService.getConfiguration<IGitConfiguration>('git');
+		return checkoutType;
+	}
 
 	get onOutput(): Event<string> { return this.raw.onOutput; }
 
diff --git a/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts b/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts
@@ -221,6 +221,12 @@ export function registerContributions(): void {
 				enum: ['all', 'tracked', 'off'],
 				default: 'all',
 				description: nls.localize('countBadge', "Controls the git badge counter."),
+			},
+			'git.checkoutType': {
+				type: 'string',
+				enum: ['all', 'local', 'tags', 'remote'],
+				default: 'all',
+				description: nls.localize('checkoutType', "Controls what type of branches are listed."),
 			}
 		}
 	});
diff --git a/src/vs/workbench/parts/git/common/git.ts b/src/vs/workbench/parts/git/common/git.ts
@@ -242,6 +242,7 @@ export interface IGitConfiguration {
 	allowLargeRepositories: boolean;
 	confirmSync: boolean;
 	countBadge: string;
+	checkoutType: string;
 }
 
 // Service interfaces
@@ -305,6 +306,7 @@ export const IGitService = createDecorator<IGitService>(GIT_SERVICE_ID);
 export interface IGitService extends IEventEmitter {
 	_serviceBrand: any;
 	allowHugeRepositories: boolean;
+	checkoutType: string;
 	onOutput: Event<string>;
 	status(): TPromise<IModel>;
 	init(): TPromise<IModel>;

Original file line number	Diff line number	Diff line change
`@@ -418,6 +418,10 @@ export class GitService extends EventEmitter`
`418`	`418`	`this.transition(ServiceState.OK);`
`419`	`419`	`}`
`420`	`420`	`}`
	`421`	`+ get checkoutType(): string {`
	`422`	`+ const { checkoutType } = this.configurationService.getConfiguration<IGitConfiguration>('git');`
	`423`	`+ return checkoutType;`
	`424`	`+ }`
`421`	`425`
`422`	`426`	`get onOutput(): Event<string> { return this.raw.onOutput; }`
`423`	`427`
Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,12 @@ export function registerContributions(): void {`
`221`	`221`	`enum: ['all', 'tracked', 'off'],`
`222`	`222`	`default: 'all',`
`223`	`223`	`description: nls.localize('countBadge', "Controls the git badge counter."),`
	`224`	`+ },`
	`225`	`+ 'git.checkoutType': {`
	`226`	`+ type: 'string',`
	`227`	`+ enum: ['all', 'local', 'tags', 'remote'],`
	`228`	`+ default: 'all',`
	`229`	`+ description: nls.localize('checkoutType', "Controls what type of branches are listed."),`
`224`	`230`	`}`
`225`	`231`	`}`
`226`	`232`	`});`