Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-12 11:39:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

git: checkout & branch commands

Browse Source
This commit is contained in:
Joao Moreno
2017-01-13 11:52:07 +01:00
parent 79b37a7f17
commit c7fca1c18f
3 changed files with 59 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/git/src/commands.ts
+44 -28
View File
@@ -295,34 +295,6 @@ export class CommandCenter {
return await this.model.clean(...this.model.workingTreeGroup.resources);
}
@CommandCenter.Command('git.checkout')
@CommandCenter.CatchErrors
async checkout(): Promise<void> {
const config = workspace.getConfiguration('git');
const checkoutType = config.get<string>('checkoutType');
const includeTags = checkoutType === 'all' || checkoutType === 'tags';
const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';
const heads = this.model.refs.filter(ref => ref.type === RefType.Head)
.map(ref => new CheckoutItem(ref));
const tags = (includeTags ? this.model.refs.filter(ref => ref.type === RefType.Tag) : [])
.map(ref => new CheckoutTagItem(ref));
const remoteHeads = (includeRemotes ? this.model.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
.map(ref => new CheckoutRemoteHeadItem(ref));
const picks = [...heads, ...tags, ...remoteHeads];
const placeHolder = 'Select a ref to checkout';
const choice = await window.showQuickPick<CheckoutItem>(picks, { placeHolder });
if (!choice) {
return;
}
await choice.run(this.model);
}
@CommandCenter.Command('git.commitStaged')
@CommandCenter.CatchErrors
async commitStaged(): Promise<void> {
@@ -353,6 +325,50 @@ export class CommandCenter {
await Promise.reject('not implemented');
}
@CommandCenter.Command('git.checkout')
@CommandCenter.CatchErrors
async checkout(): Promise<void> {
const config = workspace.getConfiguration('git');
const checkoutType = config.get<string>('checkoutType');
const includeTags = checkoutType === 'all' || checkoutType === 'tags';
const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';
const heads = this.model.refs.filter(ref => ref.type === RefType.Head)
.map(ref => new CheckoutItem(ref));
const tags = (includeTags ? this.model.refs.filter(ref => ref.type === RefType.Tag) : [])
.map(ref => new CheckoutTagItem(ref));
const remoteHeads = (includeRemotes ? this.model.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
.map(ref => new CheckoutRemoteHeadItem(ref));
const picks = [...heads, ...tags, ...remoteHeads];
const placeHolder = 'Select a ref to checkout';
const choice = await window.showQuickPick<CheckoutItem>(picks, { placeHolder });
if (!choice) {
return;
}
await choice.run(this.model);
}
@CommandCenter.Command('git.branch')
@CommandCenter.CatchErrors
async branch(): Promise<void> {
const result = await window.showInputBox({
placeHolder: 'Branch name',
prompt: 'Please provide a branch name'
});
if (!result) {
return;
}
const name = result.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
await this.model.branch(name);
}
@CommandCenter.Command('git.pull')
@CommandCenter.CatchErrors
async pull(): Promise<void> {
extensions/git/src/model.ts
+5
View File
@@ -322,6 +322,11 @@ export class Model {
await this.update();
}
async branch(name: string): Promise<void> {
await this.repository.branch(name, true);
await this.update();
}
async checkout(treeish: string): Promise<void> {
await this.repository.checkout(treeish, []);
await this.update();