git: publish command, statusbar

joaomoreno · joaomoreno · commit 01e466ee6ee6 · 2017-01-11T18:56:15.000+01:00
diff --git a/extensions/git/package.json b/extensions/git/package.json
@@ -93,6 +93,11 @@
           "light": "resources/icons/light/clean.svg",
           "dark": "resources/icons/dark/clean.svg"
         }
+      },
+      {
+        "command": "git.publish",
+        "title": "Publish",
+        "category": "Git"
       }
     ],
     "menus": {
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
@@ -90,7 +90,8 @@ class CommandCenter {
 			commands.registerCommand('git.unstageAll', this.unstageAll, this),
 			commands.registerCommand('git.clean', this.clean, this),
 			commands.registerCommand('git.cleanAll', this.cleanAll, this),
-			commands.registerCommand('git.checkout', this.checkout, this)
+			commands.registerCommand('git.checkout', this.checkout, this),
+			commands.registerCommand('git.publish', this.publish, this),
 		);
 	}
 
@@ -192,9 +193,9 @@ class CommandCenter {
 		const remoteHeads = (includeRemotes ? this.model.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
 			.map(ref => new CheckoutRemoteHeadItem(ref));
 
-		const choice = await window.showQuickPick<CheckoutItem>([...heads, ...tags, ...remoteHeads], {
-			placeHolder: 'Select a ref to checkout'
-		});
+		const picks = [...heads, ...tags, ...remoteHeads];
+		const placeHolder = 'Select a ref to checkout';
+		const choice = await window.showQuickPick<CheckoutItem>(picks, { placeHolder });
 
 		if (!choice) {
 			return;
@@ -203,6 +204,20 @@ class CommandCenter {
 		await choice.run(this.model);
 	}
 
+	@decorate(catchErrors)
+	async publish(): Promise<void> {
+		const branchName = this.model.HEAD && this.model.HEAD.name || '';
+		const picks = this.model.remotes.map(r => r.name);
+		const placeHolder = `Pick a remote to publish the branch '${branchName}' to:`;
+		const choice = await window.showQuickPick(picks, { placeHolder });
+
+		if (!choice) {
+			return;
+		}
+
+		await this.model.push(choice, branchName, { setUpstream: true });
+	}
+
 	dispose(): void {
 		this.disposables.forEach(d => d.dispose());
 	}
diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { Uri, EventEmitter, Event, SCMResource, SCMResourceDecorations, SCMResourceGroup } from 'vscode';
-import { Repository, IRef, IBranch, IRemote } from './git';
+import { Repository, IRef, IBranch, IRemote, IPushOptions } from './git';
 import { throttle } from './util';
 import { decorate } from 'core-decorators';
 import * as path from 'path';
@@ -193,12 +193,12 @@ export class Model {
 		return this._HEAD;
 	}
 
-	private _refs: IRef[];
+	private _refs: IRef[] = [];
 	get refs(): IRef[] {
 		return this._refs;
 	}
 
-	private _remotes: IRemote[];
+	private _remotes: IRemote[] = [];
 	get remotes(): IRemote[] {
 		return this._remotes;
 	}
@@ -326,4 +326,9 @@ export class Model {
 		await this.repository.checkout(treeish, []);
 		await this.update();
 	}
+
+	async push(remote?: string, name?: string, options?: IPushOptions): Promise<void> {
+		await this.repository.push(remote, name, options);
+		await this.update();
+	}
 }
diff --git a/extensions/git/src/statusbar.ts b/extensions/git/src/statusbar.ts
@@ -58,8 +58,6 @@ export class SyncStatusBar {
 
 	constructor(private model: Model) {
 		this.raw = window.createStatusBarItem(StatusBarAlignment.Left);
-
-
 		this.disposables.push(this.raw);
 		model.onDidChange(this.update, this, this.disposables);
 		this.update();

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,11 @@`
`93`	`93`	`"light": "resources/icons/light/clean.svg",`
`94`	`94`	`"dark": "resources/icons/dark/clean.svg"`
`95`	`95`	`}`
	`96`	`+ },`
	`97`	`+ {`
	`98`	`+ "command": "git.publish",`
	`99`	`+ "title": "Publish",`
	`100`	`+ "category": "Git"`
`96`	`101`	`}`
`97`	`102`	`],`
`98`	`103`	`"menus": {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`'use strict';`
`7`	`7`
`8`	`8`	`import { Uri, EventEmitter, Event, SCMResource, SCMResourceDecorations, SCMResourceGroup } from 'vscode';`
`9`		`-import { Repository, IRef, IBranch, IRemote } from './git';`
	`9`	`+import { Repository, IRef, IBranch, IRemote, IPushOptions } from './git';`
`10`	`10`	`import { throttle } from './util';`
`11`	`11`	`import { decorate } from 'core-decorators';`
`12`	`12`	`import * as path from 'path';`
`@@ -193,12 +193,12 @@ export class Model {`
`193`	`193`	`return this._HEAD;`
`194`	`194`	`}`
`195`	`195`
`196`		`- private _refs: IRef[];`
	`196`	`+ private _refs: IRef[] = [];`
`197`	`197`	`get refs(): IRef[] {`
`198`	`198`	`return this._refs;`
`199`	`199`	`}`
`200`	`200`
`201`		`- private _remotes: IRemote[];`
	`201`	`+ private _remotes: IRemote[] = [];`
`202`	`202`	`get remotes(): IRemote[] {`
`203`	`203`	`return this._remotes;`
`204`	`204`	`}`
`@@ -326,4 +326,9 @@ export class Model {`
`326`	`326`	`await this.repository.checkout(treeish, []);`
`327`	`327`	`await this.update();`
`328`	`328`	`}`
	`329`	`+`
	`330`	`+ async push(remote?: string, name?: string, options?: IPushOptions): Promise<void> {`
	`331`	`+ await this.repository.push(remote, name, options);`
	`332`	`+ await this.update();`
	`333`	`+ }`
`329`	`334`	`}`