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

import * as fs from 'fs';
import * as path from 'path';
J
Joao Moreno 已提交
8
import * as os from 'os';
J
Joao Moreno 已提交
9
import * as cp from 'child_process';
10
import * as which from 'which';
11
import { EventEmitter } from 'events';
12
import iconv = require('iconv-lite');
J
Joao Moreno 已提交
13
import * as filetype from 'file-type';
14
import { assign, groupBy, denodeify, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent } from './util';
J
Joao Moreno 已提交
15
import { CancellationToken } from 'vscode';
J
Joao Moreno 已提交
16
import { detectEncoding } from './encoding';
J
Joao Moreno 已提交
17
import { Ref, RefType, Branch, Remote, GitErrorCodes } from './api/git';
J
Joao Moreno 已提交
18

19
const readfile = denodeify<string, string | null, string>(fs.readFile);
J
Joao Moreno 已提交
20 21 22 23 24 25

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

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

33
export interface Stash {
J
Joao Moreno 已提交
34
	index: number;
35 36 37
	description: string;
}

J
Joao Moreno 已提交
38 39 40 41
interface MutableRemote extends Remote {
	fetchUrl?: string;
	pushUrl?: string;
	isReadOnly: boolean;
J
Joao Moreno 已提交
42 43
}

J
Joao Moreno 已提交
44 45 46 47
function parseVersion(raw: string): string {
	return raw.replace(/^git version /, '');
}

J
Joao Moreno 已提交
48
function findSpecificGit(path: string, onLookup: (path: string) => void): Promise<IGit> {
J
Joao Moreno 已提交
49
	return new Promise<IGit>((c, e) => {
J
Joao Moreno 已提交
50 51
		onLookup(path);

J
Joao Moreno 已提交
52 53
		const buffers: Buffer[] = [];
		const child = cp.spawn(path, ['--version']);
54
		child.stdout.on('data', (b: Buffer) => buffers.push(b));
J
Joao Moreno 已提交
55
		child.on('error', cpErrorHandler(e));
J
Joao Moreno 已提交
56 57 58 59
		child.on('exit', code => code ? e(new Error('Not found')) : c({ path, version: parseVersion(Buffer.concat(buffers).toString('utf8').trim()) }));
	});
}

J
Joao Moreno 已提交
60
function findGitDarwin(onLookup: (path: string) => void): Promise<IGit> {
J
Joao Moreno 已提交
61 62 63 64 65 66 67 68 69
	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) {
J
Joao Moreno 已提交
70 71
				onLookup(path);

J
Joao Moreno 已提交
72
				// make sure git executes
J
Joao 已提交
73
				cp.exec('git --version', (err, stdout) => {
J
Joao Moreno 已提交
74

J
Joao Moreno 已提交
75 76 77 78
					if (err) {
						return e('git not found');
					}

J
Joao 已提交
79
					return c({ path, version: parseVersion(stdout.trim()) });
J
Joao Moreno 已提交
80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101
				});
			}

			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);
			});
		});
	});
}

J
Joao Moreno 已提交
102
function findSystemGitWin32(base: string, onLookup: (path: string) => void): Promise<IGit> {
J
Joao Moreno 已提交
103 104 105 106
	if (!base) {
		return Promise.reject<IGit>('Not found');
	}

J
Joao Moreno 已提交
107
	return findSpecificGit(path.join(base, 'Git', 'cmd', 'git.exe'), onLookup);
J
Joao Moreno 已提交
108 109
}

110 111 112 113 114
function findGitWin32InPath(onLookup: (path: string) => void): Promise<IGit> {
	const whichPromise = new Promise<string>((c, e) => which('git.exe', (err, path) => err ? e(err) : c(path)));
	return whichPromise.then(path => findSpecificGit(path, onLookup));
}

J
Joao Moreno 已提交
115 116 117
function findGitWin32(onLookup: (path: string) => void): Promise<IGit> {
	return findSystemGitWin32(process.env['ProgramW6432'] as string, onLookup)
		.then(void 0, () => findSystemGitWin32(process.env['ProgramFiles(x86)'] as string, onLookup))
118 119 120
		.then(void 0, () => findSystemGitWin32(process.env['ProgramFiles'] as string, onLookup))
		.then(void 0, () => findSystemGitWin32(path.join(process.env['LocalAppData'] as string, 'Programs'), onLookup))
		.then(void 0, () => findGitWin32InPath(onLookup));
J
Joao Moreno 已提交
121 122
}

J
Joao Moreno 已提交
123
export function findGit(hint: string | undefined, onLookup: (path: string) => void): Promise<IGit> {
J
Joao Moreno 已提交
124
	const first = hint ? findSpecificGit(hint, onLookup) : Promise.reject<IGit>(null);
J
Joao Moreno 已提交
125

J
Joao Moreno 已提交
126 127 128
	return first
		.then(void 0, () => {
			switch (process.platform) {
J
Joao Moreno 已提交
129 130 131
				case 'darwin': return findGitDarwin(onLookup);
				case 'win32': return findGitWin32(onLookup);
				default: return findSpecificGit('git', onLookup);
J
Joao Moreno 已提交
132 133 134
			}
		})
		.then(null, () => Promise.reject(new Error('Git installation not found.')));
J
Joao Moreno 已提交
135 136
}

J
Joao Moreno 已提交
137
export interface IExecutionResult<T extends string | Buffer> {
J
Joao Moreno 已提交
138
	exitCode: number;
J
Joao Moreno 已提交
139
	stdout: T;
J
Joao Moreno 已提交
140 141 142
	stderr: string;
}

J
Joao Moreno 已提交
143 144 145 146 147 148 149 150 151 152 153 154 155 156
function cpErrorHandler(cb: (reason?: any) => void): (reason?: any) => void {
	return err => {
		if (/ENOENT/.test(err.message)) {
			err = new GitError({
				error: err,
				message: 'Failed to execute git (ENOENT)',
				gitErrorCode: GitErrorCodes.NotAGitRepository
			});
		}

		cb(err);
	};
}

J
Joao Moreno 已提交
157
export interface SpawnOptions extends cp.SpawnOptions {
J
Joao Moreno 已提交
158 159 160
	input?: string;
	encoding?: string;
	log?: boolean;
J
Joao Moreno 已提交
161
	cancellationToken?: CancellationToken;
J
Joao Moreno 已提交
162 163
}

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

	if (cancellationToken && cancellationToken.isCancellationRequested) {
		throw new GitError({ message: 'Cancelled' });
J
Joao Moreno 已提交
171 172
	}

J
Joao Moreno 已提交
173 174
	const disposables: IDisposable[] = [];

M
Matt Bierner 已提交
175
	const once = (ee: NodeJS.EventEmitter, name: string, fn: (...args: any[]) => void) => {
J
Joao Moreno 已提交
176 177 178 179
		ee.once(name, fn);
		disposables.push(toDisposable(() => ee.removeListener(name, fn)));
	};

M
Matt Bierner 已提交
180
	const on = (ee: NodeJS.EventEmitter, name: string, fn: (...args: any[]) => void) => {
J
Joao Moreno 已提交
181 182 183 184
		ee.on(name, fn);
		disposables.push(toDisposable(() => ee.removeListener(name, fn)));
	};

J
Joao Moreno 已提交
185
	let result = Promise.all<any>([
J
Joao Moreno 已提交
186
		new Promise<number>((c, e) => {
J
Joao Moreno 已提交
187
			once(child, 'error', cpErrorHandler(e));
J
Joao Moreno 已提交
188 189
			once(child, 'exit', c);
		}),
J
Joao Moreno 已提交
190
		new Promise<Buffer>(c => {
191
			const buffers: Buffer[] = [];
M
Matt Bierner 已提交
192
			on(child.stdout, 'data', (b: Buffer) => buffers.push(b));
J
Joao Moreno 已提交
193
			once(child.stdout, 'close', () => c(Buffer.concat(buffers)));
J
Joao Moreno 已提交
194 195
		}),
		new Promise<string>(c => {
196
			const buffers: Buffer[] = [];
M
Matt Bierner 已提交
197
			on(child.stderr, 'data', (b: Buffer) => buffers.push(b));
J
Joao Moreno 已提交
198
			once(child.stderr, 'close', () => c(Buffer.concat(buffers).toString('utf8')));
J
Joao Moreno 已提交
199
		})
J
Joao Moreno 已提交
200 201 202 203 204 205 206 207 208 209
	]) as Promise<[number, Buffer, string]>;

	if (cancellationToken) {
		const cancellationPromise = new Promise<[number, Buffer, string]>((_, e) => {
			onceEvent(cancellationToken.onCancellationRequested)(() => {
				try {
					child.kill();
				} catch (err) {
					// noop
				}
J
Joao Moreno 已提交
210

J
Joao Moreno 已提交
211 212 213 214 215 216
				e(new GitError({ message: 'Cancelled' }));
			});
		});

		result = Promise.race([result, cancellationPromise]);
	}
J
Joao Moreno 已提交
217

J
Joao Moreno 已提交
218 219 220 221 222 223
	try {
		const [exitCode, stdout, stderr] = await result;
		return { exitCode, stdout, stderr };
	} finally {
		dispose(disposables);
	}
J
Joao Moreno 已提交
224 225 226 227 228 229 230 231 232 233 234 235 236 237
}

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

export class GitError {

J
Joao Moreno 已提交
238
	error?: Error;
J
Joao Moreno 已提交
239
	message: string;
J
Joao Moreno 已提交
240 241 242 243 244
	stdout?: string;
	stderr?: string;
	exitCode?: number;
	gitErrorCode?: string;
	gitCommand?: string;
J
Joao Moreno 已提交
245 246 247 248 249 250

	constructor(data: IGitErrorData) {
		if (data.error) {
			this.error = data.error;
			this.message = data.error.message;
		} else {
J
Joao Moreno 已提交
251
			this.error = void 0;
M
Matt Bierner 已提交
252
			this.message = '';
J
Joao Moreno 已提交
253 254 255
		}

		this.message = this.message || data.message || 'Git error';
J
Joao Moreno 已提交
256 257 258 259 260
		this.stdout = data.stdout;
		this.stderr = data.stderr;
		this.exitCode = data.exitCode;
		this.gitErrorCode = data.gitErrorCode;
		this.gitCommand = data.gitCommand;
J
Joao Moreno 已提交
261 262 263 264 265 266 267 268 269
	}

	toString(): string {
		let result = this.message + ' ' + JSON.stringify({
			exitCode: this.exitCode,
			gitErrorCode: this.gitErrorCode,
			gitCommand: this.gitCommand,
			stdout: this.stdout,
			stderr: this.stderr
270
		}, null, 2);
J
Joao Moreno 已提交
271 272 273 274 275 276 277 278 279 280 281 282

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

		return result;
	}
}

export interface IGitOptions {
	gitPath: string;
	version: string;
283
	env?: any;
J
Joao Moreno 已提交
284 285
}

286 287 288 289 290
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;
J
Joao Moreno 已提交
291
	} else if (/Not a git repository/i.test(stderr)) {
292 293 294 295 296 297 298 299 300
		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;
301 302
	} else if (/branch '.+' is not fully merged/.test(stderr)) {
		return GitErrorCodes.BranchNotFullyMerged;
303 304
	} else if (/Couldn\'t find remote ref/.test(stderr)) {
		return GitErrorCodes.NoRemoteReference;
305 306 307 308
	} else if (/A branch named '.+' already exists/.test(stderr)) {
		return GitErrorCodes.BranchAlreadyExists;
	} else if (/'.+' is not a valid branch name/.test(stderr)) {
		return GitErrorCodes.InvalidBranchName;
309 310 311 312 313
	}

	return void 0;
}

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

J
Joao Moreno 已提交
316
	readonly path: string;
317
	private env: any;
J
Joao Moreno 已提交
318

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

J
Joao Moreno 已提交
322
	constructor(options: IGitOptions) {
J
Joao Moreno 已提交
323
		this.path = options.gitPath;
324
		this.env = options.env || {};
J
Joao Moreno 已提交
325 326
	}

327 328
	open(repository: string): Repository {
		return new Repository(this, repository);
J
Joao Moreno 已提交
329 330
	}

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

J
Joao Moreno 已提交
336
	async clone(url: string, parentPath: string, cancellationToken?: CancellationToken): Promise<string> {
337 338 339 340 341 342 343 344 345
		let baseFolderName = decodeURI(url).replace(/^.*\//, '').replace(/\.git$/, '') || 'repository';
		let folderName = baseFolderName;
		let folderPath = path.join(parentPath, folderName);
		let count = 1;

		while (count < 20 && await new Promise(c => fs.exists(folderPath, c))) {
			folderName = `${baseFolderName}-${count++}`;
			folderPath = path.join(parentPath, folderName);
		}
J
Joao Moreno 已提交
346

J
Joao Moreno 已提交
347
		await mkdirp(parentPath);
J
Joao Moreno 已提交
348 349 350 351 352 353 354 355 356 357 358 359

		try {
			await this.exec(parentPath, ['clone', url, folderPath], { cancellationToken });
		} catch (err) {
			if (err.stderr) {
				err.stderr = err.stderr.replace(/^Cloning.+$/m, '').trim();
				err.stderr = err.stderr.replace(/^ERROR:\s+/, '').trim();
			}

			throw err;
		}

J
Joao Moreno 已提交
360 361 362
		return folderPath;
	}

J
Joao Moreno 已提交
363 364 365
	async getRepositoryRoot(repositoryPath: string): Promise<string> {
		const result = await this.exec(repositoryPath, ['rev-parse', '--show-toplevel']);
		return path.normalize(result.stdout.trim());
J
Joao Moreno 已提交
366 367
	}

J
Joao Moreno 已提交
368
	async exec(cwd: string, args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
J
Joao Moreno 已提交
369
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
370
		return await this._exec(args, options);
J
Joao Moreno 已提交
371 372
	}

J
Joao Moreno 已提交
373 374 375 376
	async exec2(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
		return await this._exec(args, options);
	}

J
Joao Moreno 已提交
377
	stream(cwd: string, args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
378
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
379
		return this.spawn(args, options);
J
Joao Moreno 已提交
380 381
	}

J
Joao Moreno 已提交
382
	private async _exec(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
J
Joao Moreno 已提交
383
		const child = this.spawn(args, options);
J
Joao Moreno 已提交
384 385 386 387 388

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

J
Joao Moreno 已提交
389
		const bufferResult = await exec(child, options.cancellationToken);
J
Joao Moreno 已提交
390

J
Joao Moreno 已提交
391 392
		if (options.log !== false && bufferResult.stderr.length > 0) {
			this.log(`${bufferResult.stderr}\n`);
J
Joao Moreno 已提交
393 394
		}

J
Joao Moreno 已提交
395 396 397 398 399 400 401 402 403 404 405
		let encoding = options.encoding || 'utf8';
		encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';

		const result: IExecutionResult<string> = {
			exitCode: bufferResult.exitCode,
			stdout: iconv.decode(bufferResult.stdout, encoding),
			stderr: bufferResult.stderr
		};

		if (bufferResult.exitCode) {
			return Promise.reject<IExecutionResult<string>>(new GitError({
J
Joao Moreno 已提交
406 407 408 409
				message: 'Failed to execute git',
				stdout: result.stdout,
				stderr: result.stderr,
				exitCode: result.exitCode,
410
				gitErrorCode: getGitErrorCode(result.stderr),
J
Joao Moreno 已提交
411 412 413 414 415
				gitCommand: args[0]
			}));
		}

		return result;
J
Joao Moreno 已提交
416 417
	}

J
Joao Moreno 已提交
418
	spawn(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
419
		if (!this.path) {
J
Joao Moreno 已提交
420 421 422 423 424 425 426 427 428 429 430
			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
		}

431
		options.env = assign({}, process.env, this.env, options.env || {}, {
J
Joao Moreno 已提交
432
			VSCODE_GIT_COMMAND: args[0],
433
			LC_ALL: 'en_US.UTF-8',
J
Joao Moreno 已提交
434 435
			LANG: 'en_US.UTF-8'
		});
J
Joao Moreno 已提交
436 437

		if (options.log !== false) {
J
Joao Moreno 已提交
438
			this.log(`> git ${args.join(' ')}\n`);
J
Joao Moreno 已提交
439 440
		}

J
Joao Moreno 已提交
441
		return cp.spawn(this.path, args, options);
J
Joao Moreno 已提交
442 443 444
	}

	private log(output: string): void {
445
		this._onOutput.emit('log', output);
J
Joao Moreno 已提交
446
	}
J
Joao Moreno 已提交
447 448
}

J
Joao Moreno 已提交
449
export interface Commit {
J
Joao Moreno 已提交
450 451
	hash: string;
	message: string;
J
Joao Moreno 已提交
452
	parents: string[];
J
Joao Moreno 已提交
453 454
}

455 456 457 458 459 460 461 462 463 464 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 492
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 已提交
493
		if (entry.x === 'R' || entry.x === 'C') {
494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520
			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;
	}
}

521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 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
export interface Submodule {
	name: string;
	path: string;
	url: string;
}

export function parseGitmodules(raw: string): Submodule[] {
	const regex = /\r?\n/g;
	let position = 0;
	let match: RegExpExecArray | null = null;

	const result: Submodule[] = [];
	let submodule: Partial<Submodule> = {};

	function parseLine(line: string): void {
		const sectionMatch = /^\s*\[submodule "([^"]+)"\]\s*$/.exec(line);

		if (sectionMatch) {
			if (submodule.name && submodule.path && submodule.url) {
				result.push(submodule as Submodule);
			}

			const name = sectionMatch[1];

			if (name) {
				submodule = { name };
				return;
			}
		}

		if (!submodule) {
			return;
		}

		const propertyMatch = /^\s*(\w+) = (.*)$/.exec(line);

		if (!propertyMatch) {
			return;
		}

		const [, key, value] = propertyMatch;

		switch (key) {
			case 'path': submodule.path = value; break;
			case 'url': submodule.url = value; break;
		}
	}

	while (match = regex.exec(raw)) {
		parseLine(raw.substring(position, match.index));
		position = match.index + match[0].length;
	}

	parseLine(raw.substring(position));

	if (submodule.name && submodule.path && submodule.url) {
		result.push(submodule as Submodule);
	}

	return result;
}

583 584 585 586 587 588
export function parseGitCommit(raw: string): Commit | null {
	const match = /^([0-9a-f]{40})\n(.*)\n([^]*)$/m.exec(raw.trim());
	if (!match) {
		return null;
	}

J
Joao Moreno 已提交
589 590
	const parents = match[2] ? match[2].split(' ') : [];
	return { hash: match[1], message: match[3], parents };
591 592
}

593 594 595 596
interface LsTreeElement {
	mode: string;
	type: string;
	object: string;
J
Joao Moreno 已提交
597
	size: string;
598 599 600 601 602 603
	file: string;
}

export function parseLsTree(raw: string): LsTreeElement[] {
	return raw.split('\n')
		.filter(l => !!l)
J
Joao Moreno 已提交
604
		.map(line => /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/.exec(line)!)
605
		.filter(m => !!m)
J
Joao Moreno 已提交
606
		.map(([, mode, type, object, size, file]) => ({ mode, type, object, size, file }));
607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623
}

interface LsFilesElement {
	mode: string;
	object: string;
	stage: string;
	file: string;
}

export function parseLsFiles(raw: string): LsFilesElement[] {
	return raw.split('\n')
		.filter(l => !!l)
		.map(line => /^(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/.exec(line)!)
		.filter(m => !!m)
		.map(([, mode, object, stage, file]) => ({ mode, object, stage, file }));
}

J
Joao Moreno 已提交
624 625 626 627 628 629 630 631
export interface CommitOptions {
	all?: boolean;
	amend?: boolean;
	signoff?: boolean;
	signCommit?: boolean;
	empty?: boolean;
}

J
Joao Moreno 已提交
632 633
export enum ForcePushMode {
	Force,
J
Joao Moreno 已提交
634
	ForceWithLease
J
Joao Moreno 已提交
635 636
}

J
Joao Moreno 已提交
637 638 639 640
export class Repository {

	constructor(
		private _git: Git,
641
		private repositoryRoot: string
J
Joao Moreno 已提交
642 643 644 645 646 647
	) { }

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

J
Joao Moreno 已提交
648 649
	get root(): string {
		return this.repositoryRoot;
J
Joao Moreno 已提交
650 651 652
	}

	// TODO@Joao: rename to exec
J
Joao Moreno 已提交
653
	async run(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
J
Joao Moreno 已提交
654
		return await this.git.exec(this.repositoryRoot, args, options);
J
Joao Moreno 已提交
655 656
	}

J
Joao Moreno 已提交
657
	stream(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
658
		return this.git.stream(this.repositoryRoot, args, options);
J
Joao Moreno 已提交
659 660
	}

J
Joao Moreno 已提交
661
	spawn(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
662 663 664
		return this.git.spawn(args, options);
	}

J
Joao Moreno 已提交
665
	async config(scope: string, key: string, value: any = null, options: SpawnOptions = {}): Promise<string> {
J
Joao Moreno 已提交
666 667 668 669 670 671 672 673 674 675 676 677 678
		const args = ['config'];

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

		args.push(key);

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

		const result = await this.run(args, options);
J
Joao Moreno 已提交
679
		return result.stdout.trim();
J
Joao Moreno 已提交
680 681
	}

J
Joao Moreno 已提交
682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699
	async getConfigs(scope: string): Promise<{ key: string; value: string; }[]> {
		const args = ['config'];

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

		args.push('-l');

		const result = await this.run(args);
		const lines = result.stdout.trim().split(/\r|\r\n|\n/);

		return lines.map(entry => {
			const equalsIndex = entry.indexOf('=');
			return { key: entry.substr(0, equalsIndex), value: entry.substr(equalsIndex + 1) };
		});
	}

700
	async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false): Promise<string> {
J
Joao Moreno 已提交
701
		const stdout = await this.buffer(object);
702 703 704 705 706

		if (autoGuessEncoding) {
			encoding = detectEncoding(stdout) || encoding;
		}

J
Joao Moreno 已提交
707 708 709
		encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';

		return iconv.decode(stdout, encoding);
J
Joao Moreno 已提交
710 711 712
	}

	async buffer(object: string): Promise<Buffer> {
J
Joao Moreno 已提交
713 714 715
		const child = this.stream(['show', object]);

		if (!child.stdout) {
J
Joao Moreno 已提交
716
			return Promise.reject<Buffer>('Can\'t open file from git');
J
Joao Moreno 已提交
717 718
		}

719
		const { exitCode, stdout, stderr } = await exec(child);
J
Joao Moreno 已提交
720 721

		if (exitCode) {
722
			const err = new GitError({
J
Joao Moreno 已提交
723 724
				message: 'Could not show object.',
				exitCode
725 726 727 728 729 730 731
			});

			if (/exists on disk, but not in/.test(stderr)) {
				err.gitErrorCode = GitErrorCodes.WrongCase;
			}

			return Promise.reject<Buffer>(err);
J
Joao Moreno 已提交
732 733 734
		}

		return stdout;
J
Joao Moreno 已提交
735 736
	}

J
Joao Moreno 已提交
737
	async getObjectDetails(treeish: string, path: string): Promise<{ mode: string, object: string, size: number }> {
J
Joao Moreno 已提交
738
		if (!treeish) { // index
J
Joao Moreno 已提交
739
			const elements = await this.lsfiles(path);
J
Joao Moreno 已提交
740

J
Joao Moreno 已提交
741
			if (elements.length === 0) {
J
Joao Moreno 已提交
742 743 744
				throw new GitError({ message: 'Error running ls-files' });
			}

J
Joao Moreno 已提交
745
			const { mode, object } = elements[0];
J
Joao Moreno 已提交
746 747 748
			const catFile = await this.run(['cat-file', '-s', object]);
			const size = parseInt(catFile.stdout);

J
Joao Moreno 已提交
749
			return { mode, object, size };
J
Joao Moreno 已提交
750 751
		}

J
Joao Moreno 已提交
752
		const elements = await this.lstree(treeish, path);
J
Joao Moreno 已提交
753

J
Joao Moreno 已提交
754 755
		if (elements.length === 0) {
			throw new GitError({ message: 'Error running ls-files' });
J
Joao Moreno 已提交
756 757
		}

J
Joao Moreno 已提交
758
		const { mode, object, size } = elements[0];
J
Joao Moreno 已提交
759
		return { mode, object, size: parseInt(size) };
J
Joao Moreno 已提交
760 761
	}

J
Joao Moreno 已提交
762 763
	async lstree(treeish: string, path: string): Promise<LsTreeElement[]> {
		const { stdout } = await this.run(['ls-tree', '-l', treeish, '--', path]);
764 765
		return parseLsTree(stdout);
	}
766

767 768 769
	async lsfiles(path: string): Promise<LsFilesElement[]> {
		const { stdout } = await this.run(['ls-files', '--stage', '--', path]);
		return parseLsFiles(stdout);
770 771
	}

J
Joao Moreno 已提交
772
	async getGitRelativePath(ref: string, relativePath: string): Promise<string> {
773 774
		const relativePathLowercase = relativePath.toLowerCase();
		const dirname = path.posix.dirname(relativePath) + '/';
J
Joao Moreno 已提交
775
		const elements: { file: string; }[] = ref ? await this.lstree(ref, dirname) : await this.lsfiles(dirname);
776 777 778 779
		const element = elements.filter(file => file.file.toLowerCase() === relativePathLowercase)[0];

		if (!element) {
			throw new GitError({ message: 'Git relative path not found.' });
780
		}
781 782

		return element.file;
783 784
	}

J
Joao Moreno 已提交
785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824
	async detectObjectType(object: string): Promise<{ mimetype: string, encoding?: string }> {
		const child = await this.stream(['show', object]);
		const buffer = await readBytes(child.stdout, 4100);

		try {
			child.kill();
		} catch (err) {
			// noop
		}

		const encoding = detectUnicodeEncoding(buffer);
		let isText = true;

		if (encoding !== Encoding.UTF16be && encoding !== Encoding.UTF16le) {
			for (let i = 0; i < buffer.length; i++) {
				if (buffer.readInt8(i) === 0) {
					isText = false;
					break;
				}
			}
		}

		if (!isText) {
			const result = filetype(buffer);

			if (!result) {
				return { mimetype: 'application/octet-stream' };
			} else {
				return { mimetype: result.mime };
			}
		}

		if (encoding) {
			return { mimetype: 'text/plain', encoding };
		} else {
			// TODO@JOAO: read the setting OUTSIDE!
			return { mimetype: 'text/plain' };
		}
	}

J
Joao Moreno 已提交
825
	async diff(path: string, cached = false): Promise<string> {
826 827
		const args = ['diff'];

J
Joao Moreno 已提交
828
		if (cached) {
829 830 831 832 833 834 835 836 837
			args.push('--cached');
		}

		args.push('--', path);

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

J
Joao Moreno 已提交
838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867
	async diffWithHEAD(path: string): Promise<string> {
		const args = ['diff', '--', path];
		const result = await this.run(args);
		return result.stdout;
	}

	async diffWith(ref: string, path: string): Promise<string> {
		const args = ['diff', ref, '--', path];
		const result = await this.run(args);
		return result.stdout;
	}

	async diffIndexWithHEAD(path: string): Promise<string> {
		const args = ['diff', '--cached', '--', path];
		const result = await this.run(args);
		return result.stdout;
	}

	async diffIndexWith(ref: string, path: string): Promise<string> {
		const args = ['diff', '--cached', ref, '--', path];
		const result = await this.run(args);
		return result.stdout;
	}

	async diffBlobs(object1: string, object2: string): Promise<string> {
		const args = ['diff', object1, object2];
		const result = await this.run(args);
		return result.stdout;
	}

J
Joao Moreno 已提交
868 869 870 871 872 873 874 875 876 877 878 879 880 881
	async diffBetween(ref1: string, ref2: string, path: string): Promise<string> {
		const args = ['diff', `${ref1}...${ref2}`, '--', path];
		const result = await this.run(args);

		return result.stdout.trim();
	}

	async getMergeBase(ref1: string, ref2: string): Promise<string> {
		const args = ['merge-base', ref1, ref2];
		const result = await this.run(args);

		return result.stdout.trim();
	}

J
Joao Moreno 已提交
882 883 884 885 886 887 888
	async hashObject(data: string): Promise<string> {
		const args = ['hash-object', '-w', '--stdin'];
		const result = await this.run(args, { input: data });

		return result.stdout.trim();
	}

J
Joao Moreno 已提交
889 890 891 892 893 894 895 896 897 898 899 900
	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);
	}

J
Joao Moreno 已提交
901 902 903 904 905 906 907 908 909 910 911 912
	async rm(paths: string[]): Promise<void> {
		const args = ['rm', '--'];

		if (!paths || !paths.length) {
			return;
		}

		args.push(...paths);

		await this.run(args);
	}

J
Joao Moreno 已提交
913
	async stage(path: string, data: string): Promise<void> {
914
		const child = this.stream(['hash-object', '--stdin', '-w', '--path', path], { stdio: [null, null, null] });
J
Joao Moreno 已提交
915 916 917
		child.stdin.end(data, 'utf8');

		const { exitCode, stdout } = await exec(child);
J
Joao Moreno 已提交
918
		const hash = stdout.toString('utf8');
J
Joao Moreno 已提交
919 920 921 922 923 924 925 926

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

J
Joao Moreno 已提交
927 928 929
		let mode: string;

		try {
J
Joao Moreno 已提交
930
			const details = await this.getObjectDetails('HEAD', path);
J
Joao Moreno 已提交
931 932 933 934 935 936
			mode = details.mode;
		} catch (err) {
			mode = '100644';
		}

		await this.run(['update-index', '--cacheinfo', mode, hash, path]);
J
Joao Moreno 已提交
937 938
	}

939
	async checkout(treeish: string, paths: string[], opts: { track?: boolean } = Object.create(null)): Promise<void> {
J
Joao Moreno 已提交
940 941
		const args = ['checkout', '-q'];

942 943 944 945
		if (opts.track) {
			args.push('--track');
		}

J
Joao Moreno 已提交
946 947 948 949 950 951 952 953 954 955 956 957
		if (treeish) {
			args.push(treeish);
		}

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

		try {
			await this.run(args);
		} catch (err) {
J
Joao Moreno 已提交
958
			if (/Please,? commit your changes or stash them/.test(err.stderr || '')) {
J
Joao Moreno 已提交
959 960 961 962 963 964 965
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
			}

			throw err;
		}
	}

J
Joao Moreno 已提交
966
	async commit(message: string, opts: CommitOptions = Object.create(null)): Promise<void> {
J
Joao Moreno 已提交
967 968
		const args = ['commit', '--quiet', '--allow-empty-message', '--file', '-'];

J
Joao Moreno 已提交
969
		if (opts.all) {
J
Joao Moreno 已提交
970 971 972
			args.push('--all');
		}

J
Joao Moreno 已提交
973
		if (opts.amend) {
J
Joao Moreno 已提交
974 975 976
			args.push('--amend');
		}

J
Joao Moreno 已提交
977
		if (opts.signoff) {
J
Joao Moreno 已提交
978 979 980
			args.push('--signoff');
		}

981 982 983
		if (opts.signCommit) {
			args.push('-S');
		}
T
Tom Basche 已提交
984 985 986
		if (opts.empty) {
			args.push('--allow-empty');
		}
987

J
Joao Moreno 已提交
988 989 990
		try {
			await this.run(args, { input: message || '' });
		} catch (commitErr) {
991 992 993
			await this.handleCommitError(commitErr);
		}
	}
J
Joao Moreno 已提交
994

995 996
	async rebaseContinue(): Promise<void> {
		const args = ['rebase', '--continue'];
J
Joao Moreno 已提交
997

998 999 1000 1001 1002 1003
		try {
			await this.run(args);
		} catch (commitErr) {
			await this.handleCommitError(commitErr);
		}
	}
J
Joao Moreno 已提交
1004

1005 1006 1007
	private async handleCommitError(commitErr: any): Promise<void> {
		if (/not possible because you have unmerged files/.test(commitErr.stderr || '')) {
			commitErr.gitErrorCode = GitErrorCodes.UnmergedChanges;
J
Joao Moreno 已提交
1008 1009
			throw commitErr;
		}
1010 1011

		try {
J
Joao Moreno 已提交
1012 1013 1014 1015 1016
			await this.run(['config', '--get-all', 'user.name']);
		} catch (err) {
			err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
			throw err;
		}
1017 1018

		try {
J
Joao Moreno 已提交
1019 1020 1021 1022
			await this.run(['config', '--get-all', 'user.email']);
		} catch (err) {
			err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
			throw err;
1023 1024 1025
		}

		throw commitErr;
J
Joao Moreno 已提交
1026 1027
	}

J
Joao Moreno 已提交
1028
	async branch(name: string, checkout: boolean, ref?: string): Promise<void> {
J
Joao Moreno 已提交
1029
		const args = checkout ? ['checkout', '-q', '-b', name] : ['branch', '-q', name];
J
Joao Moreno 已提交
1030 1031 1032 1033 1034

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

J
Joao Moreno 已提交
1035 1036 1037
		await this.run(args);
	}

1038 1039
	async deleteBranch(name: string, force?: boolean): Promise<void> {
		const args = ['branch', force ? '-D' : '-d', name];
M
Maik Riechert 已提交
1040 1041 1042
		await this.run(args);
	}

1043 1044 1045 1046 1047
	async renameBranch(name: string): Promise<void> {
		const args = ['branch', '-m', name];
		await this.run(args);
	}

J
Joao Moreno 已提交
1048 1049 1050 1051 1052
	async setBranchUpstream(name: string, upstream: string): Promise<void> {
		const args = ['branch', '--set-upstream-to', upstream, name];
		await this.run(args);
	}

1053 1054 1055 1056 1057
	async deleteRef(ref: string): Promise<void> {
		const args = ['update-ref', '-d', ref];
		await this.run(args);
	}

J
Joao Moreno 已提交
1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069
	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;
		}
1070 1071
	}

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

J
Joao Moreno 已提交
1075 1076
		if (message) {
			args = [...args, '-a', name, '-m', message];
1077
		} else {
J
Joao Moreno 已提交
1078
			args = [...args, name];
1079 1080 1081 1082 1083
		}

		await this.run(args);
	}

J
Joao Moreno 已提交
1084
	async clean(paths: string[]): Promise<void> {
J
Joao Moreno 已提交
1085 1086 1087
		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 已提交
1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119

		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 已提交
1120
	async revert(treeish: string, paths: string[]): Promise<void> {
J
Joao Moreno 已提交
1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149
		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;
		}
	}

J
Joao Moreno 已提交
1150 1151 1152 1153 1154
	async addRemote(name: string, url: string): Promise<void> {
		const args = ['remote', 'add', name, url];
		await this.run(args);
	}

J
Joao Moreno 已提交
1155 1156 1157 1158 1159
	async removeRemote(name: string): Promise<void> {
		const args = ['remote', 'rm', name];
		await this.run(args);
	}

J
Joao Moreno 已提交
1160
	async fetch(options: { remote?: string, ref?: string, all?: boolean } = {}): Promise<void> {
J
Joao Moreno 已提交
1161 1162
		const args = ['fetch'];

J
Joao Moreno 已提交
1163 1164
		if (options.remote) {
			args.push(options.remote);
J
Joao Moreno 已提交
1165

J
Joao Moreno 已提交
1166 1167
			if (options.ref) {
				args.push(options.ref);
J
Joao Moreno 已提交
1168
			}
J
Joao Moreno 已提交
1169 1170
		} else if (options.all) {
			args.push('--all');
J
Joao Moreno 已提交
1171 1172
		}

J
Joao Moreno 已提交
1173
		try {
J
Joao Moreno 已提交
1174
			await this.run(args);
J
Joao Moreno 已提交
1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185
		} 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 已提交
1186
	async pull(rebase?: boolean, remote?: string, branch?: string): Promise<void> {
J
Joao Moreno 已提交
1187
		const args = ['pull', '--tags'];
J
Joao Moreno 已提交
1188 1189 1190 1191 1192

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

M
Matt Shirley 已提交
1193
		if (remote && branch) {
1194
			args.push(remote);
M
Matt Shirley 已提交
1195
			args.push(branch);
1196 1197
		}

J
Joao Moreno 已提交
1198 1199 1200 1201 1202 1203 1204 1205 1206
		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;
J
Joao Moreno 已提交
1207 1208
			} 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/i.test(err.stderr)) {
				err.stderr = err.stderr.replace(/Cannot pull with rebase: You have unstaged changes/i, 'Cannot pull with rebase, you have unstaged changes');
J
Joao Moreno 已提交
1209
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
J
Joao Moreno 已提交
1210 1211 1212 1213
			} else if (/cannot lock ref|unable to update local ref/i.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.CantLockRef;
			} else if (/cannot rebase onto multiple branches/i.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.CantRebaseMultipleBranches;
J
Joao Moreno 已提交
1214 1215 1216 1217 1218 1219
			}

			throw err;
		}
	}

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

J
Joao Moreno 已提交
1223 1224 1225 1226
		if (forcePushMode === ForcePushMode.ForceWithLease) {
			args.push('--force-with-lease');
		} else if (forcePushMode === ForcePushMode.Force) {
			args.push('--force');
1227 1228
		}

J
Joao Moreno 已提交
1229
		if (setUpstream) {
J
Joao Moreno 已提交
1230 1231 1232
			args.push('-u');
		}

1233 1234
		if (tags) {
			args.push('--tags');
J
Joao Moreno 已提交
1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251
		}

		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;
1252 1253
			} else if (/^fatal: The current branch .* has no upstream branch/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoUpstreamBranch;
J
Joao Moreno 已提交
1254 1255 1256 1257 1258 1259
			}

			throw err;
		}
	}

1260
	async createStash(message?: string, includeUntracked?: boolean): Promise<void> {
1261
		try {
J
Joao Moreno 已提交
1262
			const args = ['stash', 'save'];
1263

1264 1265 1266 1267
			if (includeUntracked) {
				args.push('-u');
			}

J
Joao Moreno 已提交
1268 1269
			if (message) {
				args.push('--', message);
1270 1271 1272 1273 1274 1275 1276
			}

			await this.run(args);
		} catch (err) {
			if (/No local changes to save/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoLocalChanges;
			}
J
Joao Moreno 已提交
1277 1278 1279 1280 1281 1282

			throw err;
		}
	}

	async popStash(index?: number): Promise<void> {
1283
		const args = ['stash', 'pop'];
J
Joao Moreno 已提交
1284
		await this.popOrApplyStash(args, index);
1285 1286 1287 1288
	}

	async applyStash(index?: number): Promise<void> {
		const args = ['stash', 'apply'];
J
Joao Moreno 已提交
1289
		await this.popOrApplyStash(args, index);
1290
	}
J
Joao Moreno 已提交
1291

1292 1293
	private async popOrApplyStash(args: string[], index?: number): Promise<void> {
		try {
1294
			if (typeof index === 'number') {
J
Joao Moreno 已提交
1295
				args.push(`stash@{${index}}`);
1296
			}
J
Joao Moreno 已提交
1297 1298 1299 1300 1301 1302

			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 || '')) {
1303
				err.gitErrorCode = GitErrorCodes.LocalChangesOverwritten;
J
Joao Moreno 已提交
1304 1305
			} else if (/^CONFLICT/m.test(err.stdout || '')) {
				err.gitErrorCode = GitErrorCodes.StashConflict;
1306
			}
J
Joao Moreno 已提交
1307

1308 1309 1310 1311
			throw err;
		}
	}

1312 1313
	getStatus(limit = 5000): Promise<{ status: IFileStatus[]; didHitLimit: boolean; }> {
		return new Promise<{ status: IFileStatus[]; didHitLimit: boolean; }>((c, e) => {
1314
			const parser = new GitStatusParser();
J
Joao Moreno 已提交
1315 1316
			const env = { GIT_OPTIONAL_LOCKS: '0' };
			const child = this.stream(['status', '-z', '-u'], { env });
1317

M
Matt Bierner 已提交
1318
			const onExit = (exitCode: number) => {
1319
				if (exitCode !== 0) {
1320 1321 1322 1323 1324 1325 1326 1327
					const stderr = stderrData.join('');
					return e(new GitError({
						message: 'Failed to execute git',
						stderr,
						exitCode,
						gitErrorCode: getGitErrorCode(stderr),
						gitCommand: 'status'
					}));
1328
				}
J
Joao Moreno 已提交
1329

1330 1331 1332
				c({ status: parser.status, didHitLimit: false });
			};

1333
			const onStdoutData = (raw: string) => {
1334 1335
				parser.update(raw);

J
Joao Moreno 已提交
1336
				if (parser.status.length > limit) {
1337
					child.removeListener('exit', onExit);
1338
					child.stdout.removeListener('data', onStdoutData);
1339 1340
					child.kill();

J
Joao Moreno 已提交
1341
					c({ status: parser.status.slice(0, limit), didHitLimit: true });
1342 1343 1344 1345
				}
			};

			child.stdout.setEncoding('utf8');
1346 1347 1348 1349 1350 1351
			child.stdout.on('data', onStdoutData);

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

J
Joao Moreno 已提交
1352
			child.on('error', cpErrorHandler(e));
1353
			child.on('exit', onExit);
1354
		});
J
Joao Moreno 已提交
1355 1356
	}

J
Joao Moreno 已提交
1357
	async getHEAD(): Promise<Ref> {
J
Joao Moreno 已提交
1358
		try {
J
Joao Moreno 已提交
1359
			const result = await this.run(['symbolic-ref', '--short', 'HEAD']);
J
Joao Moreno 已提交
1360 1361 1362 1363 1364 1365 1366

			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 已提交
1367
			const result = await this.run(['rev-parse', 'HEAD']);
J
Joao Moreno 已提交
1368 1369 1370 1371 1372 1373 1374 1375 1376

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

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

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

M
Matt Bierner 已提交
1380
		const fn = (line: string): Ref | null => {
J
Joao Moreno 已提交
1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396
			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 已提交
1397
			.filter(ref => !!ref) as Ref[];
J
Joao Moreno 已提交
1398 1399
	}

1400 1401
	async getStashes(): Promise<Stash[]> {
		const result = await this.run(['stash', 'list']);
J
Joao Moreno 已提交
1402
		const regex = /^stash@{(\d+)}:(.+)$/;
1403 1404
		const rawStashes = result.stdout.trim().split('\n')
			.filter(b => !!b)
M
Matt Bierner 已提交
1405
			.map(line => regex.exec(line) as RegExpExecArray)
1406
			.filter(g => !!g)
J
Joao Moreno 已提交
1407
			.map(([, index, description]: RegExpExecArray) => ({ index: parseInt(index), description }));
1408

J
Joao Moreno 已提交
1409 1410
		return rawStashes;
	}
1411

J
Joao Moreno 已提交
1412
	async getRemotes(): Promise<Remote[]> {
J
Joao Moreno 已提交
1413
		const result = await this.run(['remote', '--verbose']);
1414
		const lines = result.stdout.trim().split('\n').filter(l => !!l);
J
Joao Moreno 已提交
1415
		const remotes: MutableRemote[] = [];
J
Joao Moreno 已提交
1416

1417 1418
		for (const line of lines) {
			const parts = line.split(/\s/);
J
Joao Moreno 已提交
1419 1420 1421 1422
			const [name, url, type] = parts;

			let remote = remotes.find(r => r.name === name);

1423
			if (!remote) {
J
Joao Moreno 已提交
1424
				remote = { name, isReadOnly: false };
1425 1426 1427
				remotes.push(remote);
			}

J
Joao Moreno 已提交
1428 1429 1430 1431 1432 1433 1434
			if (/fetch/i.test(type)) {
				remote.fetchUrl = url;
			} else if (/push/i.test(type)) {
				remote.pushUrl = url;
			} else {
				remote.fetchUrl = url;
				remote.pushUrl = url;
1435 1436 1437
			}

			// https://github.com/Microsoft/vscode/issues/45271
J
Joao Moreno 已提交
1438
			remote.isReadOnly = remote.pushUrl === undefined || remote.pushUrl === 'no_push';
1439
		}
J
Joao Moreno 已提交
1440

1441
		return remotes;
J
Joao Moreno 已提交
1442 1443
	}

J
Joao Moreno 已提交
1444
	async getBranch(name: string): Promise<Branch> {
J
Joao Moreno 已提交
1445 1446
		if (name === 'HEAD') {
			return this.getHEAD();
1447 1448 1449 1450
		} else if (/^@/.test(name)) {
			const symbolicFullNameResult = await this.run(['rev-parse', '--symbolic-full-name', name]);
			const symbolicFullName = symbolicFullNameResult.stdout.trim();
			name = symbolicFullName || name;
J
Joao Moreno 已提交
1451 1452
		}

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

		if (!result.stdout) {
J
Joao Moreno 已提交
1456
			return Promise.reject<Branch>(new Error('No such branch'));
J
Joao Moreno 已提交
1457 1458 1459 1460 1461
		}

		const commit = result.stdout.trim();

		try {
J
Joao Moreno 已提交
1462 1463 1464 1465 1466 1467 1468
			const res2 = await this.run(['rev-parse', '--symbolic-full-name', name + '@{u}']);
			const fullUpstream = res2.stdout.trim();
			const match = /^refs\/remotes\/([^/]+)\/(.+)$/.exec(fullUpstream);

			if (!match) {
				throw new Error(`Could not parse upstream branch: ${fullUpstream}`);
			}
J
Joao Moreno 已提交
1469

J
Joao Moreno 已提交
1470 1471
			const upstream = { remote: match[1], name: match[2] };
			const res3 = await this.run(['rev-list', '--left-right', name + '...' + fullUpstream]);
J
Joao Moreno 已提交
1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505

			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 已提交
1506
				templatePath = path.join(this.repositoryRoot, templatePath);
J
Joao Moreno 已提交
1507 1508 1509 1510 1511 1512 1513 1514 1515 1516
			}

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

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

J
Joao Moreno 已提交
1517
	async getCommit(ref: string): Promise<Commit> {
1518
		const result = await this.run(['show', '-s', '--format=%H\n%P\n%B', ref]);
1519
		return parseGitCommit(result.stdout) || Promise.reject<Commit>('bad commit format');
J
Joao Moreno 已提交
1520
	}
1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540

	async updateSubmodules(paths: string[]): Promise<void> {
		const args = ['submodule', 'update', '--', ...paths];
		await this.run(args);
	}

	async getSubmodules(): Promise<Submodule[]> {
		const gitmodulesPath = path.join(this.root, '.gitmodules');

		try {
			const gitmodulesRaw = await readfile(gitmodulesPath, 'utf8');
			return parseGitmodules(gitmodulesRaw);
		} catch (err) {
			if (/ENOENT/.test(err.message)) {
				return [];
			}

			throw err;
		}
	}
1541
}