git.ts 26.2 KB
Newer Older
J
Joao Moreno 已提交
1 2 3 4 5 6 7 8 9
/*---------------------------------------------------------------------------------------------
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

'use strict';

import * as fs from 'fs';
import * as path from 'path';
J
Joao Moreno 已提交
10
import * as os from 'os';
J
Joao Moreno 已提交
11
import * as cp from 'child_process';
12
import { EventEmitter } from 'events';
13
import iconv = require('iconv-lite');
J
Joao Moreno 已提交
14
import { assign, uniqBy, groupBy, denodeify, IDisposable, toDisposable, dispose, mkdirp } from './util';
J
Joao Moreno 已提交
15

J
Joao Moreno 已提交
16 17
const readdir = denodeify<string[]>(fs.readdir);
const readfile = denodeify<string>(fs.readFile);
J
Joao Moreno 已提交
18 19 20 21 22 23

export interface IGit {
	path: string;
	version: string;
}

J
Joao Moreno 已提交
24 25 26 27 28 29 30
export interface IFileStatus {
	x: string;
	y: string;
	path: string;
	rename?: string;
}

J
Joao Moreno 已提交
31
export interface Remote {
J
Joao Moreno 已提交
32 33 34 35
	name: string;
	url: string;
}

36
export interface Stash {
J
Joao Moreno 已提交
37
	index: number;
38 39 40
	description: string;
}

J
Joao Moreno 已提交
41 42 43 44 45 46
export enum RefType {
	Head,
	RemoteHead,
	Tag
}

J
Joao Moreno 已提交
47
export interface Ref {
J
Joao Moreno 已提交
48 49 50 51 52 53
	type: RefType;
	name?: string;
	commit?: string;
	remote?: string;
}

J
Joao Moreno 已提交
54
export interface Branch extends Ref {
J
Joao Moreno 已提交
55 56 57 58 59
	upstream?: string;
	ahead?: number;
	behind?: number;
}

J
Joao Moreno 已提交
60 61 62 63 64 65 66 67
function parseVersion(raw: string): string {
	return raw.replace(/^git version /, '');
}

function findSpecificGit(path: string): Promise<IGit> {
	return new Promise<IGit>((c, e) => {
		const buffers: Buffer[] = [];
		const child = cp.spawn(path, ['--version']);
68
		child.stdout.on('data', (b: Buffer) => buffers.push(b));
J
Joao Moreno 已提交
69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84
		child.on('error', e);
		child.on('exit', code => code ? e(new Error('Not found')) : c({ path, version: parseVersion(Buffer.concat(buffers).toString('utf8').trim()) }));
	});
}

function findGitDarwin(): Promise<IGit> {
	return new Promise<IGit>((c, e) => {
		cp.exec('which git', (err, gitPathBuffer) => {
			if (err) {
				return e('git not found');
			}

			const path = gitPathBuffer.toString().replace(/^\s+|\s+$/g, '');

			function getVersion(path: string) {
				// make sure git executes
J
Joao 已提交
85
				cp.exec('git --version', (err, stdout) => {
J
Joao Moreno 已提交
86 87 88 89
					if (err) {
						return e('git not found');
					}

J
Joao 已提交
90
					return c({ path, version: parseVersion(stdout.trim()) });
J
Joao Moreno 已提交
91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136
				});
			}

			if (path !== '/usr/bin/git') {
				return getVersion(path);
			}

			// must check if XCode is installed
			cp.exec('xcode-select -p', (err: any) => {
				if (err && err.code === 2) {
					// git is not installed, and launching /usr/bin/git
					// will prompt the user to install it

					return e('git not found');
				}

				getVersion(path);
			});
		});
	});
}

function findSystemGitWin32(base: string): Promise<IGit> {
	if (!base) {
		return Promise.reject<IGit>('Not found');
	}

	return findSpecificGit(path.join(base, 'Git', 'cmd', 'git.exe'));
}

function findGitHubGitWin32(): Promise<IGit> {
	const github = path.join(process.env['LOCALAPPDATA'], 'GitHub');

	return readdir(github).then(children => {
		const git = children.filter(child => /^PortableGit/.test(child))[0];

		if (!git) {
			return Promise.reject<IGit>('Not found');
		}

		return findSpecificGit(path.join(github, git, 'cmd', 'git.exe'));
	});
}

function findGitWin32(): Promise<IGit> {
	return findSystemGitWin32(process.env['ProgramW6432'])
J
Joao Moreno 已提交
137 138 139 140
		.then(void 0, () => findSystemGitWin32(process.env['ProgramFiles(x86)']))
		.then(void 0, () => findSystemGitWin32(process.env['ProgramFiles']))
		.then(void 0, () => findSpecificGit('git'))
		.then(void 0, () => findGitHubGitWin32());
J
Joao Moreno 已提交
141 142
}

J
Joao Moreno 已提交
143
export function findGit(hint: string | undefined): Promise<IGit> {
J
Joao Moreno 已提交
144 145
	var first = hint ? findSpecificGit(hint) : Promise.reject<IGit>(null);

J
Joao Moreno 已提交
146
	return first.then(void 0, () => {
J
Joao Moreno 已提交
147 148 149 150 151 152 153 154 155 156 157 158 159 160 161
		switch (process.platform) {
			case 'darwin': return findGitDarwin();
			case 'win32': return findGitWin32();
			default: return findSpecificGit('git');
		}
	});
}


export interface IExecutionResult {
	exitCode: number;
	stdout: string;
	stderr: string;
}

J
Joao Moreno 已提交
162
async function exec(child: cp.ChildProcess, options: any = {}): Promise<IExecutionResult> {
J
Joao Moreno 已提交
163 164 165 166 167 168
	if (!child.stdout || !child.stderr) {
		throw new GitError({
			message: 'Failed to get stdout or stderr from git process.'
		});
	}

J
Joao Moreno 已提交
169 170 171 172 173 174 175 176 177 178 179 180
	const disposables: IDisposable[] = [];

	const once = (ee: NodeJS.EventEmitter, name: string, fn: Function) => {
		ee.once(name, fn);
		disposables.push(toDisposable(() => ee.removeListener(name, fn)));
	};

	const on = (ee: NodeJS.EventEmitter, name: string, fn: Function) => {
		ee.on(name, fn);
		disposables.push(toDisposable(() => ee.removeListener(name, fn)));
	};

181 182 183
	let encoding = options.encoding || 'utf8';
	encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';

J
Joao Moreno 已提交
184
	const [exitCode, stdout, stderr] = await Promise.all<any>([
J
Joao Moreno 已提交
185 186 187 188 189
		new Promise<number>((c, e) => {
			once(child, 'error', e);
			once(child, 'exit', c);
		}),
		new Promise<string>(c => {
190
			const buffers: Buffer[] = [];
J
Joao Moreno 已提交
191
			on(child.stdout, 'data', b => buffers.push(b));
192
			once(child.stdout, 'close', () => c(iconv.decode(Buffer.concat(buffers), encoding)));
J
Joao Moreno 已提交
193 194
		}),
		new Promise<string>(c => {
195
			const buffers: Buffer[] = [];
J
Joao Moreno 已提交
196
			on(child.stderr, 'data', b => buffers.push(b));
J
Joao Moreno 已提交
197
			once(child.stderr, 'close', () => c(Buffer.concat(buffers).toString('utf8')));
J
Joao Moreno 已提交
198
		})
J
Joao Moreno 已提交
199
	]);
J
Joao Moreno 已提交
200

J
Joao Moreno 已提交
201 202 203
	dispose(disposables);

	return { exitCode, stdout, stderr };
J
Joao Moreno 已提交
204 205 206 207 208 209 210 211 212 213 214 215 216 217
}

export interface IGitErrorData {
	error?: Error;
	message?: string;
	stdout?: string;
	stderr?: string;
	exitCode?: number;
	gitErrorCode?: string;
	gitCommand?: string;
}

export class GitError {

J
Joao Moreno 已提交
218
	error?: Error;
J
Joao Moreno 已提交
219
	message: string;
J
Joao Moreno 已提交
220 221 222 223 224
	stdout?: string;
	stderr?: string;
	exitCode?: number;
	gitErrorCode?: string;
	gitCommand?: string;
J
Joao Moreno 已提交
225 226 227 228 229 230

	constructor(data: IGitErrorData) {
		if (data.error) {
			this.error = data.error;
			this.message = data.error.message;
		} else {
J
Joao Moreno 已提交
231
			this.error = void 0;
J
Joao Moreno 已提交
232 233 234
		}

		this.message = this.message || data.message || 'Git error';
J
Joao Moreno 已提交
235 236 237 238 239
		this.stdout = data.stdout;
		this.stderr = data.stderr;
		this.exitCode = data.exitCode;
		this.gitErrorCode = data.gitErrorCode;
		this.gitCommand = data.gitCommand;
J
Joao Moreno 已提交
240 241 242 243 244 245 246 247 248
	}

	toString(): string {
		let result = this.message + ' ' + JSON.stringify({
			exitCode: this.exitCode,
			gitErrorCode: this.gitErrorCode,
			gitCommand: this.gitCommand,
			stdout: this.stdout,
			stderr: this.stderr
J
Joao Moreno 已提交
249
		}, [], 2);
J
Joao Moreno 已提交
250 251 252 253 254 255 256 257 258 259 260 261

		if (this.error) {
			result += (<any>this.error).stack;
		}

		return result;
	}
}

export interface IGitOptions {
	gitPath: string;
	version: string;
262
	env?: any;
J
Joao Moreno 已提交
263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281
}

export const GitErrorCodes = {
	BadConfigFile: 'BadConfigFile',
	AuthenticationFailed: 'AuthenticationFailed',
	NoUserNameConfigured: 'NoUserNameConfigured',
	NoUserEmailConfigured: 'NoUserEmailConfigured',
	NoRemoteRepositorySpecified: 'NoRemoteRepositorySpecified',
	NotAGitRepository: 'NotAGitRepository',
	NotAtRepositoryRoot: 'NotAtRepositoryRoot',
	Conflict: 'Conflict',
	UnmergedChanges: 'UnmergedChanges',
	PushRejected: 'PushRejected',
	RemoteConnectionError: 'RemoteConnectionError',
	DirtyWorkTree: 'DirtyWorkTree',
	CantOpenResource: 'CantOpenResource',
	GitNotFound: 'GitNotFound',
	CantCreatePipe: 'CantCreatePipe',
	CantAccessRemote: 'CantAccessRemote',
282
	RepositoryNotFound: 'RepositoryNotFound',
283
	RepositoryIsLocked: 'RepositoryIsLocked',
284
	BranchNotFullyMerged: 'BranchNotFullyMerged',
285 286 287 288
	NoRemoteReference: 'NoRemoteReference',
	NoLocalChanges: 'NoLocalChanges',
	NoStashFound: 'NoStashFound',
	LocalChangesOverwritten: 'LocalChangesOverwritten'
J
Joao Moreno 已提交
289 290
};

291 292 293 294 295 296 297 298 299 300 301 302 303 304 305
function getGitErrorCode(stderr: string): string | undefined {
	if (/Another git process seems to be running in this repository|If no other git process is currently running/.test(stderr)) {
		return GitErrorCodes.RepositoryIsLocked;
	} else if (/Authentication failed/.test(stderr)) {
		return GitErrorCodes.AuthenticationFailed;
	} else if (/Not a git repository/.test(stderr)) {
		return GitErrorCodes.NotAGitRepository;
	} else if (/bad config file/.test(stderr)) {
		return GitErrorCodes.BadConfigFile;
	} else if (/cannot make pipe for command substitution|cannot create standard input pipe/.test(stderr)) {
		return GitErrorCodes.CantCreatePipe;
	} else if (/Repository not found/.test(stderr)) {
		return GitErrorCodes.RepositoryNotFound;
	} else if (/unable to access/.test(stderr)) {
		return GitErrorCodes.CantAccessRemote;
306 307
	} else if (/branch '.+' is not fully merged/.test(stderr)) {
		return GitErrorCodes.BranchNotFullyMerged;
308 309
	} else if (/Couldn\'t find remote ref/.test(stderr)) {
		return GitErrorCodes.NoRemoteReference;
310 311 312 313 314
	}

	return void 0;
}

J
Joao Moreno 已提交
315 316
export class Git {

J
Joao Moreno 已提交
317 318
	private gitPath: string;
	private version: string;
319
	private env: any;
J
Joao Moreno 已提交
320

321 322
	private _onOutput = new EventEmitter();
	get onOutput(): EventEmitter { return this._onOutput; }
J
Joao Moreno 已提交
323

J
Joao Moreno 已提交
324 325 326
	constructor(options: IGitOptions) {
		this.gitPath = options.gitPath;
		this.version = options.version;
327
		this.env = options.env || {};
J
Joao Moreno 已提交
328 329
	}

330 331
	open(repository: string): Repository {
		return new Repository(this, repository);
J
Joao Moreno 已提交
332 333
	}

J
Joao Moreno 已提交
334 335 336 337 338
	async init(repository: string): Promise<void> {
		await this.exec(repository, ['init']);
		return;
	}

J
Joao Moreno 已提交
339
	async clone(url: string, parentPath: string): Promise<string> {
J
Joao Moreno 已提交
340
		const folderName = decodeURI(url).replace(/^.*\//, '').replace(/\.git$/, '') || 'repository';
J
Joao Moreno 已提交
341 342
		const folderPath = path.join(parentPath, folderName);

J
Joao Moreno 已提交
343
		await mkdirp(parentPath);
J
Joao Moreno 已提交
344 345 346 347
		await this.exec(parentPath, ['clone', url, folderPath]);
		return folderPath;
	}

J
Joao Moreno 已提交
348 349 350 351 352
	async getRepositoryRoot(path: string): Promise<string> {
		const result = await this.exec(path, ['rev-parse', '--show-toplevel']);
		return result.stdout.trim();
	}

J
Joao Moreno 已提交
353
	async exec(cwd: string, args: string[], options: any = {}): Promise<IExecutionResult> {
J
Joao Moreno 已提交
354
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
355
		return await this._exec(args, options);
J
Joao Moreno 已提交
356 357 358
	}

	stream(cwd: string, args: string[], options: any = {}): cp.ChildProcess {
J
Joao Moreno 已提交
359
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
360
		return this.spawn(args, options);
J
Joao Moreno 已提交
361 362
	}

J
Joao Moreno 已提交
363 364
	private async _exec(args: string[], options: any = {}): Promise<IExecutionResult> {
		const child = this.spawn(args, options);
J
Joao Moreno 已提交
365 366 367 368 369

		if (options.input) {
			child.stdin.end(options.input, 'utf8');
		}

J
Joao Moreno 已提交
370
		const result = await exec(child, options);
J
Joao Moreno 已提交
371

J
Joao Moreno 已提交
372 373 374 375
		if (options.log !== false && result.stderr.length > 0) {
			this.log(`${result.stderr}\n`);
		}

J
Joao Moreno 已提交
376 377 378 379 380 381
		if (result.exitCode) {
			return Promise.reject<IExecutionResult>(new GitError({
				message: 'Failed to execute git',
				stdout: result.stdout,
				stderr: result.stderr,
				exitCode: result.exitCode,
382
				gitErrorCode: getGitErrorCode(result.stderr),
J
Joao Moreno 已提交
383 384 385 386 387
				gitCommand: args[0]
			}));
		}

		return result;
J
Joao Moreno 已提交
388 389
	}

J
Joao Moreno 已提交
390
	spawn(args: string[], options: any = {}): cp.ChildProcess {
J
Joao Moreno 已提交
391 392 393 394 395 396 397 398 399 400 401 402
		if (!this.gitPath) {
			throw new Error('git could not be found in the system.');
		}

		if (!options) {
			options = {};
		}

		if (!options.stdio && !options.input) {
			options.stdio = ['ignore', null, null]; // Unless provided, ignore stdin and leave default streams for stdout and stderr
		}

403
		options.env = assign({}, process.env, this.env, options.env || {}, {
J
Joao Moreno 已提交
404
			VSCODE_GIT_COMMAND: args[0],
405
			LC_ALL: 'en_US.UTF-8',
J
Joao Moreno 已提交
406 407
			LANG: 'en_US.UTF-8'
		});
J
Joao Moreno 已提交
408 409

		if (options.log !== false) {
J
Joao Moreno 已提交
410
			this.log(`git ${args.join(' ')}\n`);
J
Joao Moreno 已提交
411 412 413 414 415 416
		}

		return cp.spawn(this.gitPath, args, options);
	}

	private log(output: string): void {
417
		this._onOutput.emit('log', output);
J
Joao Moreno 已提交
418
	}
J
Joao Moreno 已提交
419 420
}

J
Joao Moreno 已提交
421
export interface Commit {
J
Joao Moreno 已提交
422 423 424 425
	hash: string;
	message: string;
}

426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463
export class GitStatusParser {

	private lastRaw = '';
	private result: IFileStatus[] = [];

	get status(): IFileStatus[] {
		return this.result;
	}

	update(raw: string): void {
		let i = 0;
		let nextI: number | undefined;

		raw = this.lastRaw + raw;

		while ((nextI = this.parseEntry(raw, i)) !== undefined) {
			i = nextI;
		}

		this.lastRaw = raw.substr(i);
	}

	private parseEntry(raw: string, i: number): number | undefined {
		if (i + 4 >= raw.length) {
			return;
		}

		let lastIndex: number;
		const entry: IFileStatus = {
			x: raw.charAt(i++),
			y: raw.charAt(i++),
			rename: undefined,
			path: ''
		};

		// space
		i++;

J
Joao Moreno 已提交
464
		if (entry.x === 'R' || entry.x === 'C') {
465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491
			lastIndex = raw.indexOf('\0', i);

			if (lastIndex === -1) {
				return;
			}

			entry.rename = raw.substring(i, lastIndex);
			i = lastIndex + 1;
		}

		lastIndex = raw.indexOf('\0', i);

		if (lastIndex === -1) {
			return;
		}

		entry.path = raw.substring(i, lastIndex);

		// If path ends with slash, it must be a nested git repo
		if (entry.path[entry.path.length - 1] !== '/') {
			this.result.push(entry);
		}

		return lastIndex + 1;
	}
}

J
Joao Moreno 已提交
492 493 494 495
export class Repository {

	constructor(
		private _git: Git,
496
		private repositoryRoot: string
J
Joao Moreno 已提交
497 498 499 500 501 502
	) { }

	get git(): Git {
		return this._git;
	}

J
Joao Moreno 已提交
503 504
	get root(): string {
		return this.repositoryRoot;
J
Joao Moreno 已提交
505 506 507 508
	}

	// TODO@Joao: rename to exec
	async run(args: string[], options: any = {}): Promise<IExecutionResult> {
J
Joao Moreno 已提交
509
		return await this.git.exec(this.repositoryRoot, args, options);
J
Joao Moreno 已提交
510 511 512
	}

	stream(args: string[], options: any = {}): cp.ChildProcess {
J
Joao Moreno 已提交
513
		return this.git.stream(this.repositoryRoot, args, options);
J
Joao Moreno 已提交
514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536
	}

	spawn(args: string[], options: any = {}): cp.ChildProcess {
		return this.git.spawn(args, options);
	}

	async config(scope: string, key: string, value: any, options: any): Promise<string> {
		const args = ['config'];

		if (scope) {
			args.push('--' + scope);
		}

		args.push(key);

		if (value) {
			args.push(value);
		}

		const result = await this.run(args, options);
		return result.stdout;
	}

J
Joao Moreno 已提交
537
	async buffer(object: string, encoding: string = 'utf8'): Promise<string> {
J
Joao Moreno 已提交
538 539 540
		const child = this.stream(['show', object]);

		if (!child.stdout) {
541
			return Promise.reject<string>('Can\'t open file from git');
J
Joao Moreno 已提交
542 543
		}

J
Joao Moreno 已提交
544 545 546 547 548 549 550 551 552 553
		const { exitCode, stdout } = await exec(child, { encoding });

		if (exitCode) {
			return Promise.reject<string>(new GitError({
				message: 'Could not show object.',
				exitCode
			}));
		}

		return stdout;
J
Joao Moreno 已提交
554

J
Joao Moreno 已提交
555
		// TODO@joao
J
Joao Moreno 已提交
556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584
		// return new Promise((c, e) => {
		// detectMimesFromStream(child.stdout, null, (err, result) => {
		// 	if (err) {
		// 		e(err);
		// 	} else if (isBinaryMime(result.mimes)) {
		// 		e(<IFileOperationResult>{
		// 			message: localize('fileBinaryError', "File seems to be binary and cannot be opened as text"),
		// 			fileOperationResult: FileOperationResult.FILE_IS_BINARY
		// 		});
		// 	} else {
		// c(this.doBuffer(object));
		// 	}
		// });
		// });
	}

	async add(paths: string[]): Promise<void> {
		const args = ['add', '-A', '--'];

		if (paths && paths.length) {
			args.push.apply(args, paths);
		} else {
			args.push('.');
		}

		await this.run(args);
	}

	async stage(path: string, data: string): Promise<void> {
585
		const child = this.stream(['hash-object', '--stdin', '-w', '--path', path], { stdio: [null, null, null] });
J
Joao Moreno 已提交
586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622
		child.stdin.end(data, 'utf8');

		const { exitCode, stdout } = await exec(child);

		if (exitCode) {
			throw new GitError({
				message: 'Could not hash object.',
				exitCode: exitCode
			});
		}

		await this.run(['update-index', '--cacheinfo', '100644', stdout, path]);
	}

	async checkout(treeish: string, paths: string[]): Promise<void> {
		const args = ['checkout', '-q'];

		if (treeish) {
			args.push(treeish);
		}

		if (paths && paths.length) {
			args.push('--');
			args.push.apply(args, paths);
		}

		try {
			await this.run(args);
		} catch (err) {
			if (/Please, commit your changes or stash them/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
			}

			throw err;
		}
	}

D
Daniel Portella 已提交
623
	async commit(message: string, opts: { all?: boolean, amend?: boolean, signoff?: boolean, signCommit?: boolean } = Object.create(null)): Promise<void> {
J
Joao Moreno 已提交
624 625
		const args = ['commit', '--quiet', '--allow-empty-message', '--file', '-'];

J
Joao Moreno 已提交
626
		if (opts.all) {
J
Joao Moreno 已提交
627 628 629
			args.push('--all');
		}

J
Joao Moreno 已提交
630
		if (opts.amend) {
J
Joao Moreno 已提交
631 632 633
			args.push('--amend');
		}

J
Joao Moreno 已提交
634
		if (opts.signoff) {
J
Joao Moreno 已提交
635 636 637
			args.push('--signoff');
		}

638 639 640 641
		if (opts.signCommit) {
			args.push('-S');
		}

J
Joao Moreno 已提交
642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672
		try {
			await this.run(args, { input: message || '' });
		} catch (commitErr) {
			if (/not possible because you have unmerged files/.test(commitErr.stderr || '')) {
				commitErr.gitErrorCode = GitErrorCodes.UnmergedChanges;
				throw commitErr;
			}

			try {
				await this.run(['config', '--get-all', 'user.name']);
			} catch (err) {
				err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
				throw err;
			}

			try {
				await this.run(['config', '--get-all', 'user.email']);
			} catch (err) {
				err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
				throw err;
			}

			throw commitErr;
		}
	}

	async branch(name: string, checkout: boolean): Promise<void> {
		const args = checkout ? ['checkout', '-q', '-b', name] : ['branch', '-q', name];
		await this.run(args);
	}

673 674
	async deleteBranch(name: string, force?: boolean): Promise<void> {
		const args = ['branch', force ? '-D' : '-d', name];
M
Maik Riechert 已提交
675 676 677
		await this.run(args);
	}

J
Joao Moreno 已提交
678 679 680 681 682 683 684 685 686 687 688 689
	async merge(ref: string): Promise<void> {
		const args = ['merge', ref];

		try {
			await this.run(args);
		} catch (err) {
			if (/^CONFLICT /m.test(err.stdout || '')) {
				err.gitErrorCode = GitErrorCodes.Conflict;
			}

			throw err;
		}
690 691
	}

J
Joao Moreno 已提交
692
	async tag(name: string, message?: string): Promise<void> {
693 694
		let args = ['tag'];

J
Joao Moreno 已提交
695 696
		if (message) {
			args = [...args, '-a', name, '-m', message];
697
		} else {
J
Joao Moreno 已提交
698
			args = [...args, name];
699 700 701 702 703
		}

		await this.run(args);
	}

J
Joao Moreno 已提交
704
	async clean(paths: string[]): Promise<void> {
J
Joao Moreno 已提交
705 706 707
		const pathsByGroup = groupBy(paths, p => path.dirname(p));
		const groups = Object.keys(pathsByGroup).map(k => pathsByGroup[k]);
		const tasks = groups.map(paths => () => this.run(['clean', '-f', '-q', '--'].concat(paths)));
J
Joao Moreno 已提交
708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739

		for (let task of tasks) {
			await task();
		}
	}

	async undo(): Promise<void> {
		await this.run(['clean', '-fd']);

		try {
			await this.run(['checkout', '--', '.']);
		} catch (err) {
			if (/did not match any file\(s\) known to git\./.test(err.stderr || '')) {
				return;
			}

			throw err;
		}
	}

	async reset(treeish: string, hard: boolean = false): Promise<void> {
		const args = ['reset'];

		if (hard) {
			args.push('--hard');
		}

		args.push(treeish);

		await this.run(args);
	}

J
Joao Moreno 已提交
740
	async revert(treeish: string, paths: string[]): Promise<void> {
J
Joao Moreno 已提交
741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783
		const result = await this.run(['branch']);
		let args: string[];

		// In case there are no branches, we must use rm --cached
		if (!result.stdout) {
			args = ['rm', '--cached', '-r', '--'];
		} else {
			args = ['reset', '-q', treeish, '--'];
		}

		if (paths && paths.length) {
			args.push.apply(args, paths);
		} else {
			args.push('.');
		}

		try {
			await this.run(args);
		} catch (err) {
			// In case there are merge conflicts to be resolved, git reset will output
			// some "needs merge" data. We try to get around that.
			if (/([^:]+: needs merge\n)+/m.test(err.stdout || '')) {
				return;
			}

			throw err;
		}
	}

	async fetch(): Promise<void> {
		try {
			await this.run(['fetch']);
		} catch (err) {
			if (/No remote repository specified\./.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoRemoteRepositorySpecified;
			} else if (/Could not read from remote repository/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.RemoteConnectionError;
			}

			throw err;
		}
	}

M
Matt Shirley 已提交
784
	async pull(rebase?: boolean, remote?: string, branch?: string): Promise<void> {
J
Joao Moreno 已提交
785 786 787 788 789 790
		const args = ['pull'];

		if (rebase) {
			args.push('-r');
		}

M
Matt Shirley 已提交
791
		if (remote && branch) {
792
			args.push(remote);
M
Matt Shirley 已提交
793
			args.push(branch);
794 795
		}

J
Joao Moreno 已提交
796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812
		try {
			await this.run(args);
		} catch (err) {
			if (/^CONFLICT \([^)]+\): \b/m.test(err.stdout || '')) {
				err.gitErrorCode = GitErrorCodes.Conflict;
			} else if (/Please tell me who you are\./.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
			} else if (/Could not read from remote repository/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.RemoteConnectionError;
			} else if (/Pull is not possible because you have unmerged files|Cannot pull with rebase: You have unstaged changes|Your local changes to the following files would be overwritten|Please, commit your changes before you can merge/.test(err.stderr)) {
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
			}

			throw err;
		}
	}

813
	async push(remote?: string, name?: string, setUpstream: boolean = false, tags = false): Promise<void> {
J
Joao Moreno 已提交
814 815
		const args = ['push'];

J
Joao Moreno 已提交
816
		if (setUpstream) {
J
Joao Moreno 已提交
817 818 819
			args.push('-u');
		}

820 821
		if (tags) {
			args.push('--tags');
J
Joao Moreno 已提交
822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844
		}

		if (remote) {
			args.push(remote);
		}

		if (name) {
			args.push(name);
		}

		try {
			await this.run(args);
		} catch (err) {
			if (/^error: failed to push some refs to\b/m.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.PushRejected;
			} else if (/Could not read from remote repository/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.RemoteConnectionError;
			}

			throw err;
		}
	}

J
Joao Moreno 已提交
845
	async createStash(message?: string): Promise<void> {
846
		try {
J
Joao Moreno 已提交
847
			const args = ['stash', 'save'];
848

J
Joao Moreno 已提交
849 850
			if (message) {
				args.push('--', message);
851 852 853 854 855 856 857
			}

			await this.run(args);
		} catch (err) {
			if (/No local changes to save/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoLocalChanges;
			}
J
Joao Moreno 已提交
858 859 860 861 862 863 864 865 866 867 868

			throw err;
		}
	}

	async popStash(index?: number): Promise<void> {
		try {
			const args = ['stash', 'pop'];

			if (typeof index === 'string') {
				args.push(`stash@{${index}}`);
869
			}
J
Joao Moreno 已提交
870 871 872 873 874 875

			await this.run(args);
		} catch (err) {
			if (/No stash found/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoStashFound;
			} else if (/error: Your local changes to the following files would be overwritten/.test(err.stderr || '')) {
876 877
				err.gitErrorCode = GitErrorCodes.LocalChangesOverwritten;
			}
J
Joao Moreno 已提交
878

879 880 881 882
			throw err;
		}
	}

883 884
	getStatus(limit = 5000): Promise<{ status: IFileStatus[]; didHitLimit: boolean; }> {
		return new Promise<{ status: IFileStatus[]; didHitLimit: boolean; }>((c, e) => {
885 886
			const parser = new GitStatusParser();
			const child = this.stream(['status', '-z', '-u']);
887 888

			const onExit = exitCode => {
889
				if (exitCode !== 0) {
890 891 892 893 894 895 896 897
					const stderr = stderrData.join('');
					return e(new GitError({
						message: 'Failed to execute git',
						stderr,
						exitCode,
						gitErrorCode: getGitErrorCode(stderr),
						gitCommand: 'status'
					}));
898
				}
J
Joao Moreno 已提交
899

900 901 902
				c({ status: parser.status, didHitLimit: false });
			};

903
			const onStdoutData = (raw: string) => {
904 905 906 907
				parser.update(raw);

				if (parser.status.length > 5000) {
					child.removeListener('exit', onExit);
908
					child.stdout.removeListener('data', onStdoutData);
909 910 911 912 913 914 915
					child.kill();

					c({ status: parser.status.slice(0, 5000), didHitLimit: true });
				}
			};

			child.stdout.setEncoding('utf8');
916 917 918 919 920 921
			child.stdout.on('data', onStdoutData);

			const stderrData: string[] = [];
			child.stderr.setEncoding('utf8');
			child.stderr.on('data', raw => stderrData.push(raw as string));

922 923
			child.on('error', e);
			child.on('exit', onExit);
924
		});
J
Joao Moreno 已提交
925 926
	}

J
Joao Moreno 已提交
927
	async getHEAD(): Promise<Ref> {
J
Joao Moreno 已提交
928
		try {
J
Joao Moreno 已提交
929
			const result = await this.run(['symbolic-ref', '--short', 'HEAD']);
J
Joao Moreno 已提交
930 931 932 933 934 935 936

			if (!result.stdout) {
				throw new Error('Not in a branch');
			}

			return { name: result.stdout.trim(), commit: void 0, type: RefType.Head };
		} catch (err) {
J
Joao Moreno 已提交
937
			const result = await this.run(['rev-parse', 'HEAD']);
J
Joao Moreno 已提交
938 939 940 941 942 943 944 945 946

			if (!result.stdout) {
				throw new Error('Error parsing HEAD');
			}

			return { name: void 0, commit: result.stdout.trim(), type: RefType.Head };
		}
	}

J
Joao Moreno 已提交
947
	async getRefs(): Promise<Ref[]> {
J
Joao Moreno 已提交
948
		const result = await this.run(['for-each-ref', '--format', '%(refname) %(objectname)']);
J
Joao Moreno 已提交
949

J
Joao Moreno 已提交
950
		const fn = (line): Ref | null => {
J
Joao Moreno 已提交
951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966
			let match: RegExpExecArray | null;

			if (match = /^refs\/heads\/([^ ]+) ([0-9a-f]{40})$/.exec(line)) {
				return { name: match[1], commit: match[2], type: RefType.Head };
			} else if (match = /^refs\/remotes\/([^/]+)\/([^ ]+) ([0-9a-f]{40})$/.exec(line)) {
				return { name: `${match[1]}/${match[2]}`, commit: match[3], type: RefType.RemoteHead, remote: match[1] };
			} else if (match = /^refs\/tags\/([^ ]+) ([0-9a-f]{40})$/.exec(line)) {
				return { name: match[1], commit: match[2], type: RefType.Tag };
			}

			return null;
		};

		return result.stdout.trim().split('\n')
			.filter(line => !!line)
			.map(fn)
J
Joao Moreno 已提交
967
			.filter(ref => !!ref) as Ref[];
J
Joao Moreno 已提交
968 969
	}

970 971
	async getStashes(): Promise<Stash[]> {
		const result = await this.run(['stash', 'list']);
J
Joao Moreno 已提交
972
		const regex = /^stash@{(\d+)}:(.+)$/;
973 974 975 976
		const rawStashes = result.stdout.trim().split('\n')
			.filter(b => !!b)
			.map(line => regex.exec(line))
			.filter(g => !!g)
J
Joao Moreno 已提交
977
			.map(([, index, description]: RegExpExecArray) => ({ index: parseInt(index), description }));
978

J
Joao Moreno 已提交
979 980
		return rawStashes;
	}
981

J
Joao Moreno 已提交
982
	async getRemotes(): Promise<Remote[]> {
J
Joao Moreno 已提交
983
		const result = await this.run(['remote', '--verbose']);
J
Joao Moreno 已提交
984
		const regex = /^([^\s]+)\s+([^\s]+)\s/;
J
Joao Moreno 已提交
985
		const rawRemotes = result.stdout.trim().split('\n')
J
Joao Moreno 已提交
986 987 988
			.filter(b => !!b)
			.map(line => regex.exec(line))
			.filter(g => !!g)
J
Joao Moreno 已提交
989 990 991
			.map((groups: RegExpExecArray) => ({ name: groups[1], url: groups[2] }));

		return uniqBy(rawRemotes, remote => remote.name);
J
Joao Moreno 已提交
992 993
	}

J
Joao Moreno 已提交
994
	async getBranch(name: string): Promise<Branch> {
J
Joao Moreno 已提交
995 996 997 998
		if (name === 'HEAD') {
			return this.getHEAD();
		}

J
Joao Moreno 已提交
999
		const result = await this.run(['rev-parse', name]);
J
Joao Moreno 已提交
1000 1001

		if (!result.stdout) {
J
Joao Moreno 已提交
1002
			return Promise.reject<Branch>(new Error('No such branch'));
J
Joao Moreno 已提交
1003 1004 1005 1006 1007
		}

		const commit = result.stdout.trim();

		try {
J
Joao Moreno 已提交
1008
			const res2 = await this.run(['rev-parse', '--symbolic-full-name', '--abbrev-ref', name + '@{u}']);
J
Joao Moreno 已提交
1009 1010
			const upstream = res2.stdout.trim();

J
Joao Moreno 已提交
1011
			const res3 = await this.run(['rev-list', '--left-right', name + '...' + upstream]);
J
Joao Moreno 已提交
1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045

			let ahead = 0, behind = 0;
			let i = 0;

			while (i < res3.stdout.length) {
				switch (res3.stdout.charAt(i)) {
					case '<': ahead++; break;
					case '>': behind++; break;
					default: i++; break;
				}

				while (res3.stdout.charAt(i++) !== '\n') { /* no-op */ }
			}

			return { name, type: RefType.Head, commit, upstream, ahead, behind };
		} catch (err) {
			return { name, type: RefType.Head, commit };
		}
	}

	async getCommitTemplate(): Promise<string> {
		try {
			const result = await this.run(['config', '--get', 'commit.template']);

			if (!result.stdout) {
				return '';
			}

			// https://github.com/git/git/blob/3a0f269e7c82aa3a87323cb7ae04ac5f129f036b/path.c#L612
			const homedir = os.homedir();
			let templatePath = result.stdout.trim()
				.replace(/^~([^\/]*)\//, (_, user) => `${user ? path.join(path.dirname(homedir), user) : homedir}/`);

			if (!path.isAbsolute(templatePath)) {
J
Joao Moreno 已提交
1046
				templatePath = path.join(this.repositoryRoot, templatePath);
J
Joao Moreno 已提交
1047 1048 1049 1050 1051 1052 1053 1054 1055 1056
			}

			const raw = await readfile(templatePath, 'utf8');
			return raw.replace(/^\s*#.*$\n?/gm, '').trim();

		} catch (err) {
			return '';
		}
	}

J
Joao Moreno 已提交
1057
	async getCommit(ref: string): Promise<Commit> {
J
Joao Moreno 已提交
1058 1059 1060 1061
		const result = await this.run(['show', '-s', '--format=%H\n%B', ref]);
		const match = /^([0-9a-f]{40})\n([^]*)$/m.exec(result.stdout.trim());

		if (!match) {
J
Joao Moreno 已提交
1062
			return Promise.reject<Commit>('bad commit format');
J
Joao Moreno 已提交
1063 1064 1065 1066
		}

		return { hash: match[1], message: match[2] };
	}
1067
}