Option to exclude items from Git branch checkout list #13506

microsoft · Dec 7, 2016 · d55c1df · d55c1df
1 parent 0d65ced
commit d55c1df
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
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 inclueRemotes = 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 = inclueRemotes ? 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>;