git: better error handling

joaomoreno · joaomoreno · commit c46b5c8a8bac · 2017-01-12T09:37:54.000+01:00
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { Uri, commands, scm, Disposable, SCMResourceGroup, SCMResource, window, workspace, QuickPickItem } from 'vscode';
+import { Uri, commands, scm, Disposable, SCMResourceGroup, SCMResource, window, workspace, QuickPickItem, OutputChannel } from 'vscode';
 import { IRef, RefType } from './git';
 import { Model, Resource } from './model';
 import { log } from './util';
@@ -15,7 +15,30 @@ import * as path from 'path';
 type Command = (...args: any[]) => any;
 
 function catchErrors(fn: (...args) => Promise<any>): (...args) => void {
-	return (...args) => fn.call(this, ...args).catch(err => console.log(err));
+	return (...args) => fn.call(this, ...args).catch(async err => {
+		if (err.gitErrorCode) {
+			let message: string;
+
+			switch (err.gitErrorCode) {
+				case 'DirtyWorkTree':
+					message = 'Please clean your repository working tree before checkout.';
+					break;
+				default:
+					message = (err.stderr || err.message).replace(/^error: /, '');
+					break;
+			}
+
+			const outputChannel = this.outputChannel as OutputChannel;
+			const openOutputChannelChoice = 'Open Git Log';
+			const choice = await window.showErrorMessage(message, openOutputChannelChoice);
+
+			if (choice === openOutputChannelChoice) {
+				outputChannel.show();
+			}
+		} else {
+			console.error(err);
+		}
+	});
 }
 
 function resolveGitURI(uri: Uri): SCMResource | SCMResourceGroup | undefined {
@@ -79,7 +102,7 @@ class CommandCenter {
 
 	private disposables: Disposable[] = [];
 
-	constructor(private model: Model) {
+	constructor(private model: Model, private outputChannel: OutputChannel) {
 		this.disposables.push(
 			commands.registerCommand('git.refresh', this.refresh, this),
 			commands.registerCommand('git.openChange', this.openChange, this),
@@ -229,6 +252,6 @@ class CommandCenter {
 	}
 }
 
-export function registerCommands(model: Model): Disposable {
-	return new CommandCenter(model);
+export function registerCommands(model: Model, outputChannel: OutputChannel): Disposable {
+	return new CommandCenter(model, outputChannel);
 }
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
@@ -331,7 +331,7 @@ export class Git {
 			}
 
 			if (options.log !== false) {
-				this.log(`ERROR: ${result.stderr}\n`);
+				this.log(`${result.stderr}\n`);
 			}
 
 			return Promise.reject<IExecutionResult>(new GitError({
@@ -363,7 +363,7 @@ export class Git {
 		options.env = _.assign({}, process.env, options.env || {});
 
 		if (options.log !== false) {
-			this.log(`SPAWN: git ${args.join(' ')}\n`);
+			this.log(`git ${args.join(' ')}\n`);
 		}
 
 		return cp.spawn(this.gitPath, args, options);
diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts
@@ -115,7 +115,7 @@ async function init(disposables: Disposable[]): Promise<void> {
 	const syncStatusBar = new SyncStatusBar(model);
 
 	disposables.push(
-		registerCommands(model),
+		registerCommands(model, outputChannel),
 		scm.registerSCMProvider('git', provider),
 		workspace.registerTextDocumentContentProvider('git-index', textDocumentContentProvider),
 		textDocumentContentProvider,
diff --git a/extensions/git/src/statusbar.ts b/extensions/git/src/statusbar.ts
@@ -70,7 +70,7 @@ export class SyncStatusBar {
 		}
 
 		const HEAD = this.model.HEAD;
-		let icon = '$(sync) ';
+		let icon = '$(sync)';
 		let text = '';
 
 		if (HEAD && HEAD.name && HEAD.commit) {
@@ -82,15 +82,15 @@ export class SyncStatusBar {
 				}
 				this.raw.command = 'git.sync';
 			} else {
-				icon = '$(cloud-upload) ';
+				icon = '$(cloud-upload)';
 				this.raw.command = 'git.publish';
 			}
 		} else {
 			this.raw.color = 'rgba(255,255,255,0.7)';
 			this.raw.command = '';
 		}
 
-		this.raw.text = `${icon}${text}`;
+		this.raw.text = [icon, text].join(' ').trim();
 		this.raw.show();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ export class Git {`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`if (options.log !== false) {`
`334`		- this.log(`ERROR: ${result.stderr}\n`);
	`334`	+ this.log(`${result.stderr}\n`);
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`return Promise.reject<IExecutionResult>(new GitError({`
`@@ -363,7 +363,7 @@ export class Git {`
`363`	`363`	`options.env = _.assign({}, process.env, options.env \|\| {});`
`364`	`364`
`365`	`365`	`if (options.log !== false) {`
`366`		- this.log(`SPAWN: git ${args.join(' ')}\n`);
	`366`	+ this.log(`git ${args.join(' ')}\n`);
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`return cp.spawn(this.gitPath, args, options);`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export class SyncStatusBar {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`const HEAD = this.model.HEAD;`
`73`		`- let icon = '$(sync) ';`
	`73`	`+ let icon = '$(sync)';`
`74`	`74`	`let text = '';`
`75`	`75`
`76`	`76`	`if (HEAD && HEAD.name && HEAD.commit) {`
`@@ -82,15 +82,15 @@ export class SyncStatusBar {`
`82`	`82`	`}`
`83`	`83`	`this.raw.command = 'git.sync';`
`84`	`84`	`} else {`
`85`		`- icon = '$(cloud-upload) ';`
	`85`	`+ icon = '$(cloud-upload)';`
`86`	`86`	`this.raw.command = 'git.publish';`
`87`	`87`	`}`
`88`	`88`	`} else {`
`89`	`89`	`this.raw.color = 'rgba(255,255,255,0.7)';`
`90`	`90`	`this.raw.command = '';`
`91`	`91`	`}`
`92`	`92`
`93`		- this.raw.text = `${icon}${text}`;
	`93`	`+ this.raw.text = [icon, text].join(' ').trim();`
`94`	`94`	`this.raw.show();`
`95`	`95`	`}`
`96`	`96`