git.ts 44.8 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 16
import { CancellationToken } from 'vscode';
import { URI } from 'vscode-uri';
J
Joao Moreno 已提交
17
import { detectEncoding } from './encoding';
J
Joao Moreno 已提交
18
import { Ref, RefType, Branch, Remote, GitErrorCodes, LogOptions, Change, Status } from './api/git';
J
Joao Moreno 已提交
19

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

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

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

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

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

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

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

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

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

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

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

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

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

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

111 112 113 114 115
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 已提交
116 117
function findGitWin32(onLookup: (path: string) => void): Promise<IGit> {
	return findSystemGitWin32(process.env['ProgramW6432'] as string, onLookup)
R
Rob Lourens 已提交
118 119 120 121
		.then(undefined, () => findSystemGitWin32(process.env['ProgramFiles(x86)'] as string, onLookup))
		.then(undefined, () => findSystemGitWin32(process.env['ProgramFiles'] as string, onLookup))
		.then(undefined, () => findSystemGitWin32(path.join(process.env['LocalAppData'] as string, 'Programs'), onLookup))
		.then(undefined, () => findGitWin32InPath(onLookup));
J
Joao Moreno 已提交
122 123
}

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

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

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

J
Joao Moreno 已提交
144 145 146 147 148 149 150 151 152 153 154 155 156 157
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 已提交
158
export interface SpawnOptions extends cp.SpawnOptions {
J
Joao Moreno 已提交
159 160 161
	input?: string;
	encoding?: string;
	log?: boolean;
J
Joao Moreno 已提交
162
	cancellationToken?: CancellationToken;
J
Joao Moreno 已提交
163 164
}

J
Joao Moreno 已提交
165
async function exec(child: cp.ChildProcess, cancellationToken?: CancellationToken): Promise<IExecutionResult<Buffer>> {
J
Joao Moreno 已提交
166
	if (!child.stdout || !child.stderr) {
J
Joao Moreno 已提交
167 168 169 170 171
		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 已提交
172 173
	}

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

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

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

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

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

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

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

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

export class GitError {

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

	constructor(data: IGitErrorData) {
		if (data.error) {
			this.error = data.error;
			this.message = data.error.message;
		} else {
R
Rob Lourens 已提交
252
			this.error = undefined;
M
Matt Bierner 已提交
253
			this.message = '';
J
Joao Moreno 已提交
254 255 256
		}

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

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

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

		return result;
	}
}

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

287 288 289 290 291
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 已提交
292
	} else if (/Not a git repository/i.test(stderr)) {
293 294 295 296 297 298 299 300 301
		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;
302 303
	} else if (/branch '.+' is not fully merged/.test(stderr)) {
		return GitErrorCodes.BranchNotFullyMerged;
304 305
	} else if (/Couldn\'t find remote ref/.test(stderr)) {
		return GitErrorCodes.NoRemoteReference;
306 307 308 309
	} 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;
310 311
	} else if (/Please,? commit your changes or stash them/.test(stderr)) {
		return GitErrorCodes.DirtyWorkTree;
312 313
	}

R
Rob Lourens 已提交
314
	return undefined;
315 316
}

317 318
const COMMIT_FORMAT = '%H\n%ae\n%P\n%B';

J
Joao Moreno 已提交
319 320
export class Git {

J
Joao Moreno 已提交
321
	readonly path: string;
322
	private env: any;
J
Joao Moreno 已提交
323

324 325
	private _onOutput = new EventEmitter();
	get onOutput(): EventEmitter { return this._onOutput; }
J
Joao Moreno 已提交
326

J
Joao Moreno 已提交
327
	constructor(options: IGitOptions) {
J
Joao Moreno 已提交
328
		this.path = options.gitPath;
329
		this.env = options.env || {};
J
Joao Moreno 已提交
330 331
	}

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

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

J
Joao Moreno 已提交
341
	async clone(url: string, parentPath: string, cancellationToken?: CancellationToken): Promise<string> {
342 343 344 345 346 347 348 349 350
		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 已提交
351

J
Joao Moreno 已提交
352
		await mkdirp(parentPath);
J
Joao Moreno 已提交
353 354

		try {
S
Scott Craig 已提交
355
			await this.exec(parentPath, ['clone', url.includes(' ') ? encodeURI(url) : url, folderPath], { cancellationToken });
J
Joao Moreno 已提交
356 357 358 359 360 361 362 363 364
		} 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 已提交
365 366 367
		return folderPath;
	}

J
Joao Moreno 已提交
368 369 370
	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 已提交
371 372
	}

J
Joao Moreno 已提交
373 374 375 376 377
	async getRepositoryDotGit(repositoryPath: string): Promise<string> {
		const result = await this.exec(repositoryPath, ['rev-parse', '--absolute-git-dir']);
		return path.normalize(result.stdout.trim());
	}

J
Joao Moreno 已提交
378
	async exec(cwd: string, args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
J
Joao Moreno 已提交
379
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
380
		return await this._exec(args, options);
J
Joao Moreno 已提交
381 382
	}

J
Joao Moreno 已提交
383 384 385 386
	async exec2(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
		return await this._exec(args, options);
	}

J
Joao Moreno 已提交
387
	stream(cwd: string, args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
388
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
389
		return this.spawn(args, options);
J
Joao Moreno 已提交
390 391
	}

J
Joao Moreno 已提交
392
	private async _exec(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
J
Joao Moreno 已提交
393
		const child = this.spawn(args, options);
J
Joao Moreno 已提交
394 395 396 397 398

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

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

J
Joao Moreno 已提交
401 402
		if (options.log !== false && bufferResult.stderr.length > 0) {
			this.log(`${bufferResult.stderr}\n`);
J
Joao Moreno 已提交
403 404
		}

J
Joao Moreno 已提交
405 406 407 408 409 410 411 412 413 414 415
		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 已提交
416 417 418 419
				message: 'Failed to execute git',
				stdout: result.stdout,
				stderr: result.stderr,
				exitCode: result.exitCode,
420
				gitErrorCode: getGitErrorCode(result.stderr),
J
Joao Moreno 已提交
421 422 423 424 425
				gitCommand: args[0]
			}));
		}

		return result;
J
Joao Moreno 已提交
426 427
	}

J
Joao Moreno 已提交
428
	spawn(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
429
		if (!this.path) {
J
Joao Moreno 已提交
430 431 432 433 434 435 436 437 438 439 440
			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
		}

441
		options.env = assign({}, process.env, this.env, options.env || {}, {
J
Joao Moreno 已提交
442
			VSCODE_GIT_COMMAND: args[0],
443
			LC_ALL: 'en_US.UTF-8',
J
Joao Moreno 已提交
444 445
			LANG: 'en_US.UTF-8'
		});
J
Joao Moreno 已提交
446 447

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

J
Joao Moreno 已提交
451
		return cp.spawn(this.path, args, options);
J
Joao Moreno 已提交
452 453 454
	}

	private log(output: string): void {
455
		this._onOutput.emit('log', output);
J
Joao Moreno 已提交
456
	}
J
Joao Moreno 已提交
457 458
}

J
Joao Moreno 已提交
459
export interface Commit {
J
Joao Moreno 已提交
460 461
	hash: string;
	message: string;
J
Joao Moreno 已提交
462
	parents: string[];
463
	authorEmail?: string | undefined;
J
Joao Moreno 已提交
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 493 494 495 496 497 498 499 500 501 502 503
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 已提交
504
		if (entry.x === 'R' || entry.x === 'C') {
505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531
			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;
	}
}

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

J
Joao Moreno 已提交
566
		const propertyMatch = /^\s*(\w+)\s+=\s+(.*)$/.exec(line);
567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593

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

594
export function parseGitCommit(raw: string): Commit | null {
595
	const match = /^([0-9a-f]{40})\n(.*)\n(.*)\n([^]*)$/m.exec(raw.trim());
596 597 598 599
	if (!match) {
		return null;
	}

600 601
	const parents = match[3] ? match[3].split(' ') : [];
	return { hash: match[1], message: match[4], parents, authorEmail: match[2] };
602 603
}

604 605 606 607
interface LsTreeElement {
	mode: string;
	type: string;
	object: string;
J
Joao Moreno 已提交
608
	size: string;
609 610 611 612 613 614
	file: string;
}

export function parseLsTree(raw: string): LsTreeElement[] {
	return raw.split('\n')
		.filter(l => !!l)
J
Joao Moreno 已提交
615
		.map(line => /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/.exec(line)!)
616
		.filter(m => !!m)
J
Joao Moreno 已提交
617
		.map(([, mode, type, object, size, file]) => ({ mode, type, object, size, file }));
618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634
}

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 已提交
635 636 637 638 639 640 641 642
export interface CommitOptions {
	all?: boolean;
	amend?: boolean;
	signoff?: boolean;
	signCommit?: boolean;
	empty?: boolean;
}

643 644
export interface PullOptions {
	unshallow?: boolean;
J
Joao Moreno 已提交
645
	tags?: boolean;
646 647
}

J
Joao Moreno 已提交
648 649
export enum ForcePushMode {
	Force,
J
Joao Moreno 已提交
650
	ForceWithLease
J
Joao Moreno 已提交
651 652
}

J
Joao Moreno 已提交
653 654 655 656
export class Repository {

	constructor(
		private _git: Git,
J
Joao Moreno 已提交
657 658
		private repositoryRoot: string,
		readonly dotGit: string
J
Joao Moreno 已提交
659 660 661 662 663 664
	) { }

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

J
Joao Moreno 已提交
665 666
	get root(): string {
		return this.repositoryRoot;
J
Joao Moreno 已提交
667 668 669
	}

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

J
Joao Moreno 已提交
674
	stream(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
675
		return this.git.stream(this.repositoryRoot, args, options);
J
Joao Moreno 已提交
676 677
	}

J
Joao Moreno 已提交
678
	spawn(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
679 680 681
		return this.git.spawn(args, options);
	}

J
Joao Moreno 已提交
682
	async config(scope: string, key: string, value: any = null, options: SpawnOptions = {}): Promise<string> {
J
Joao Moreno 已提交
683 684 685 686 687 688 689 690 691 692 693 694 695
		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 已提交
696
		return result.stdout.trim();
J
Joao Moreno 已提交
697 698
	}

J
Joao Moreno 已提交
699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716
	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) };
		});
	}

717 718 719
	async log(options?: LogOptions): Promise<Commit[]> {
		const maxEntries = options && typeof options.maxEntries === 'number' && options.maxEntries > 0 ? options.maxEntries : 32;
		const args = ['log', '-' + maxEntries, `--pretty=format:${COMMIT_FORMAT}%x00%x00`];
720 721 722 723 724 725
		const gitResult = await this.run(args);
		if (gitResult.exitCode) {
			// An empty repo.
			return [];
		}

726
		const s = gitResult.stdout;
727
		const result: Commit[] = [];
728 729 730 731 732 733 734 735
		let index = 0;
		while (index < s.length) {
			let nextIndex = s.indexOf('\x00\x00', index);
			if (nextIndex === -1) {
				nextIndex = s.length;
			}

			let entry = s.substr(index, nextIndex - index);
736 737 738
			if (entry.startsWith('\n')) {
				entry = entry.substring(1);
			}
739

740 741 742 743 744 745
			const commit = parseGitCommit(entry);
			if (!commit) {
				break;
			}

			result.push(commit);
746
			index = nextIndex + 2;
747 748 749 750 751
		}

		return result;
	}

752
	async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false): Promise<string> {
J
Joao Moreno 已提交
753
		const stdout = await this.buffer(object);
754 755 756 757 758

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

J
Joao Moreno 已提交
759 760 761
		encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';

		return iconv.decode(stdout, encoding);
J
Joao Moreno 已提交
762 763 764
	}

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

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

771
		const { exitCode, stdout, stderr } = await exec(child);
J
Joao Moreno 已提交
772 773

		if (exitCode) {
774
			const err = new GitError({
J
Joao Moreno 已提交
775 776
				message: 'Could not show object.',
				exitCode
777 778 779 780 781 782 783
			});

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

			return Promise.reject<Buffer>(err);
J
Joao Moreno 已提交
784 785 786
		}

		return stdout;
J
Joao Moreno 已提交
787 788
	}

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

J
Joao Moreno 已提交
793
			if (elements.length === 0) {
J
Joao Moreno 已提交
794 795 796
				throw new GitError({ message: 'Error running ls-files' });
			}

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

J
Joao Moreno 已提交
801
			return { mode, object, size };
J
Joao Moreno 已提交
802 803
		}

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

J
Joao Moreno 已提交
806 807
		if (elements.length === 0) {
			throw new GitError({ message: 'Error running ls-files' });
J
Joao Moreno 已提交
808 809
		}

J
Joao Moreno 已提交
810
		const { mode, object, size } = elements[0];
J
Joao Moreno 已提交
811
		return { mode, object, size: parseInt(size) };
J
Joao Moreno 已提交
812 813
	}

J
Joao Moreno 已提交
814 815
	async lstree(treeish: string, path: string): Promise<LsTreeElement[]> {
		const { stdout } = await this.run(['ls-tree', '-l', treeish, '--', path]);
816 817
		return parseLsTree(stdout);
	}
818

819 820 821
	async lsfiles(path: string): Promise<LsFilesElement[]> {
		const { stdout } = await this.run(['ls-files', '--stage', '--', path]);
		return parseLsFiles(stdout);
822 823
	}

J
Joao Moreno 已提交
824
	async getGitRelativePath(ref: string, relativePath: string): Promise<string> {
825 826
		const relativePathLowercase = relativePath.toLowerCase();
		const dirname = path.posix.dirname(relativePath) + '/';
J
Joao Moreno 已提交
827
		const elements: { file: string; }[] = ref ? await this.lstree(ref, dirname) : await this.lsfiles(dirname);
828 829 830 831
		const element = elements.filter(file => file.file.toLowerCase() === relativePathLowercase)[0];

		if (!element) {
			throw new GitError({ message: 'Git relative path not found.' });
832
		}
833 834

		return element.file;
835 836
	}

J
Joao Moreno 已提交
837 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 868 869 870 871 872 873 874 875 876
	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' };
		}
	}

877 878 879 880 881 882 883
	async apply(patch: string, reverse?: boolean): Promise<void> {
		const args = ['apply', patch];

		if (reverse) {
			args.push('-R');
		}

884 885 886 887 888 889 890 891 892
		try {
			await this.run(args);
		} catch (err) {
			if (/patch does not apply/.test(err.stderr)) {
				err.gitErrorCode = GitErrorCodes.PatchDoesNotApply;
			}

			throw err;
		}
893 894 895
	}

	async diff(cached = false): Promise<string> {
896 897
		const args = ['diff'];

J
Joao Moreno 已提交
898
		if (cached) {
899 900 901 902 903 904 905
			args.push('--cached');
		}

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

906 907 908 909
	diffWithHEAD(): Promise<Change[]>;
	diffWithHEAD(path: string): Promise<string>;
	diffWithHEAD(path?: string | undefined): Promise<string | Change[]>;
	async diffWithHEAD(path?: string | undefined): Promise<string | Change[]> {
910 911 912 913
		if (!path) {
			return await this.diffFiles(false);
		}

J
Joao Moreno 已提交
914 915 916 917 918
		const args = ['diff', '--', path];
		const result = await this.run(args);
		return result.stdout;
	}

919 920 921
	diffWith(ref: string): Promise<Change[]>;
	diffWith(ref: string, path: string): Promise<string>;
	diffWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
922 923 924 925 926
	async diffWith(ref: string, path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(false, ref);
		}

J
Joao Moreno 已提交
927 928 929 930 931
		const args = ['diff', ref, '--', path];
		const result = await this.run(args);
		return result.stdout;
	}

932 933 934
	diffIndexWithHEAD(): Promise<Change[]>;
	diffIndexWithHEAD(path: string): Promise<string>;
	diffIndexWithHEAD(path?: string | undefined): Promise<string | Change[]>;
935 936 937 938 939
	async diffIndexWithHEAD(path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(true);
		}

J
Joao Moreno 已提交
940 941 942 943 944
		const args = ['diff', '--cached', '--', path];
		const result = await this.run(args);
		return result.stdout;
	}

945 946 947
	diffIndexWith(ref: string): Promise<Change[]>;
	diffIndexWith(ref: string, path: string): Promise<string>;
	diffIndexWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
948 949 950 951 952
	async diffIndexWith(ref: string, path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(true, ref);
		}

J
Joao Moreno 已提交
953 954 955 956 957 958 959 960 961 962 963
		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;
	}

964 965 966
	diffBetween(ref1: string, ref2: string): Promise<Change[]>;
	diffBetween(ref1: string, ref2: string, path: string): Promise<string>;
	diffBetween(ref1: string, ref2: string, path?: string | undefined): Promise<string | Change[]>;
967 968 969 970 971 972 973
	async diffBetween(ref1: string, ref2: string, path?: string): Promise<string | Change[]> {
		const range = `${ref1}...${ref2}`;
		if (!path) {
			return await this.diffFiles(false, range);
		}

		const args = ['diff', range, '--', path];
J
Joao Moreno 已提交
974 975 976 977 978
		const result = await this.run(args);

		return result.stdout.trim();
	}

979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
	private async diffFiles(cached: boolean, ref?: string): Promise<Change[]> {
		const args = ['diff', '--name-status', '-z', '--diff-filter=ADMR'];
		if (cached) {
			args.push('--cached');
		}

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

		const gitResult = await this.run(args);
		if (gitResult.exitCode) {
			return [];
		}

		const entries = gitResult.stdout.split('\x00');
		let index = 0;
		const result: Change[] = [];

		entriesLoop:
		while (index < entries.length - 1) {
			const change = entries[index++];
			const resourcePath = entries[index++];
			if (!change || !resourcePath) {
				break;
			}

J
Joao Moreno 已提交
1006
			const originalUri = URI.file(path.isAbsolute(resourcePath) ? resourcePath : path.join(this.repositoryRoot, resourcePath));
1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033
			let status: Status = Status.UNTRACKED;

			// Copy or Rename status comes with a number, e.g. 'R100'. We don't need the number, so we use only first character of the status.
			switch (change[0]) {
				case 'M':
					status = Status.MODIFIED;
					break;

				case 'A':
					status = Status.INDEX_ADDED;
					break;

				case 'D':
					status = Status.DELETED;
					break;

				// Rename contains two paths, the second one is what the file is renamed/copied to.
				case 'R':
					if (index >= entries.length) {
						break;
					}

					const newPath = entries[index++];
					if (!newPath) {
						break;
					}

J
Joao Moreno 已提交
1034
					const uri = URI.file(path.isAbsolute(newPath) ? newPath : path.join(this.repositoryRoot, newPath));
1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059
					result.push({
						uri,
						renameUri: uri,
						originalUri,
						status: Status.INDEX_RENAMED
					});

					continue;

				default:
					// Unknown status
					break entriesLoop;
			}

			result.push({
				status,
				originalUri,
				uri: originalUri,
				renameUri: originalUri,
			});
		}

		return result;
	}

J
Joao Moreno 已提交
1060 1061 1062 1063 1064 1065 1066
	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 已提交
1067 1068 1069 1070 1071 1072 1073
	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 已提交
1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085
	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 已提交
1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097
	async rm(paths: string[]): Promise<void> {
		const args = ['rm', '--'];

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

		args.push(...paths);

		await this.run(args);
	}

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

		const { exitCode, stdout } = await exec(child);
J
Joao Moreno 已提交
1103
		const hash = stdout.toString('utf8');
J
Joao Moreno 已提交
1104 1105 1106 1107 1108 1109 1110 1111

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

J
Joao Moreno 已提交
1112 1113 1114
		let mode: string;

		try {
J
Joao Moreno 已提交
1115
			const details = await this.getObjectDetails('HEAD', path);
J
Joao Moreno 已提交
1116 1117 1118 1119 1120 1121
			mode = details.mode;
		} catch (err) {
			mode = '100644';
		}

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

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

1127 1128 1129 1130
		if (opts.track) {
			args.push('--track');
		}

J
Joao Moreno 已提交
1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142
		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 已提交
1143
			if (/Please,? commit your changes or stash them/.test(err.stderr || '')) {
J
Joao Moreno 已提交
1144 1145 1146 1147 1148 1149 1150
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
			}

			throw err;
		}
	}

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

J
Joao Moreno 已提交
1154
		if (opts.all) {
J
Joao Moreno 已提交
1155 1156 1157
			args.push('--all');
		}

J
Joao Moreno 已提交
1158
		if (opts.amend) {
J
Joao Moreno 已提交
1159 1160 1161
			args.push('--amend');
		}

J
Joao Moreno 已提交
1162
		if (opts.signoff) {
J
Joao Moreno 已提交
1163 1164 1165
			args.push('--signoff');
		}

1166 1167 1168
		if (opts.signCommit) {
			args.push('-S');
		}
T
Tom Basche 已提交
1169 1170 1171
		if (opts.empty) {
			args.push('--allow-empty');
		}
1172

J
Joao Moreno 已提交
1173 1174 1175
		try {
			await this.run(args, { input: message || '' });
		} catch (commitErr) {
1176 1177 1178
			await this.handleCommitError(commitErr);
		}
	}
J
Joao Moreno 已提交
1179

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

1183 1184 1185 1186 1187 1188
		try {
			await this.run(args);
		} catch (commitErr) {
			await this.handleCommitError(commitErr);
		}
	}
J
Joao Moreno 已提交
1189

1190 1191 1192
	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 已提交
1193 1194
			throw commitErr;
		}
1195 1196

		try {
J
Joao Moreno 已提交
1197 1198 1199 1200 1201
			await this.run(['config', '--get-all', 'user.name']);
		} catch (err) {
			err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
			throw err;
		}
1202 1203

		try {
J
Joao Moreno 已提交
1204 1205 1206 1207
			await this.run(['config', '--get-all', 'user.email']);
		} catch (err) {
			err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
			throw err;
1208 1209 1210
		}

		throw commitErr;
J
Joao Moreno 已提交
1211 1212
	}

J
Joao Moreno 已提交
1213
	async branch(name: string, checkout: boolean, ref?: string): Promise<void> {
J
Joao Moreno 已提交
1214
		const args = checkout ? ['checkout', '-q', '-b', name, '--no-track'] : ['branch', '-q', name];
J
Joao Moreno 已提交
1215 1216 1217 1218 1219

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

J
Joao Moreno 已提交
1220 1221 1222
		await this.run(args);
	}

1223 1224
	async deleteBranch(name: string, force?: boolean): Promise<void> {
		const args = ['branch', force ? '-D' : '-d', name];
M
Maik Riechert 已提交
1225 1226 1227
		await this.run(args);
	}

1228 1229 1230 1231 1232
	async renameBranch(name: string): Promise<void> {
		const args = ['branch', '-m', name];
		await this.run(args);
	}

J
Joao Moreno 已提交
1233 1234 1235 1236 1237
	async setBranchUpstream(name: string, upstream: string): Promise<void> {
		const args = ['branch', '--set-upstream-to', upstream, name];
		await this.run(args);
	}

1238 1239 1240 1241 1242
	async deleteRef(ref: string): Promise<void> {
		const args = ['update-ref', '-d', ref];
		await this.run(args);
	}

J
Joao Moreno 已提交
1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254
	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;
		}
1255 1256
	}

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

J
Joao Moreno 已提交
1260 1261
		if (message) {
			args = [...args, '-a', name, '-m', message];
1262
		} else {
J
Joao Moreno 已提交
1263
			args = [...args, name];
1264 1265 1266 1267 1268
		}

		await this.run(args);
	}

J
Joao Moreno 已提交
1269
	async clean(paths: string[]): Promise<void> {
J
Joao Moreno 已提交
1270 1271 1272
		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 已提交
1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293

		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> {
1294
		const args = ['reset', hard ? '--hard' : '--soft', treeish];
J
Joao Moreno 已提交
1295 1296 1297
		await this.run(args);
	}

J
Joao Moreno 已提交
1298
	async revert(treeish: string, paths: string[]): Promise<void> {
J
Joao Moreno 已提交
1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327
		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 已提交
1328 1329 1330 1331 1332
	async addRemote(name: string, url: string): Promise<void> {
		const args = ['remote', 'add', name, url];
		await this.run(args);
	}

J
Joao Moreno 已提交
1333 1334 1335 1336 1337
	async removeRemote(name: string): Promise<void> {
		const args = ['remote', 'rm', name];
		await this.run(args);
	}

1338
	async fetch(options: { remote?: string, ref?: string, all?: boolean, prune?: boolean, depth?: number } = {}): Promise<void> {
J
Joao Moreno 已提交
1339 1340
		const args = ['fetch'];

J
Joao Moreno 已提交
1341 1342
		if (options.remote) {
			args.push(options.remote);
J
Joao Moreno 已提交
1343

J
Joao Moreno 已提交
1344 1345
			if (options.ref) {
				args.push(options.ref);
J
Joao Moreno 已提交
1346
			}
J
Joao Moreno 已提交
1347 1348
		} else if (options.all) {
			args.push('--all');
J
Joao Moreno 已提交
1349 1350
		}

R
Ryan Scott 已提交
1351
		if (options.prune) {
R
Ryan Scott 已提交
1352
			args.push('--prune');
R
Ryan Scott 已提交
1353 1354
		}

1355
		if (typeof options.depth === 'number') {
1356 1357
			args.push(`--depth=${options.depth}`);
		}
R
Ryan Scott 已提交
1358

J
Joao Moreno 已提交
1359
		try {
J
Joao Moreno 已提交
1360
			await this.run(args);
J
Joao Moreno 已提交
1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371
		} 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;
		}
	}

1372
	async pull(rebase?: boolean, remote?: string, branch?: string, options: PullOptions = {}): Promise<void> {
H
Hao Hu 已提交
1373 1374
		const args = ['pull'];

J
Joao Moreno 已提交
1375
		if (options.tags) {
H
Hao Hu 已提交
1376 1377
			args.push('--tags');
		}
1378 1379 1380 1381

		if (options.unshallow) {
			args.push('--unshallow');
		}
J
Joao Moreno 已提交
1382 1383 1384 1385 1386

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

M
Matt Shirley 已提交
1387
		if (remote && branch) {
1388
			args.push(remote);
M
Matt Shirley 已提交
1389
			args.push(branch);
1390 1391
		}

J
Joao Moreno 已提交
1392 1393 1394 1395 1396 1397 1398 1399 1400
		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 已提交
1401 1402
			} 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 已提交
1403
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
J
Joao Moreno 已提交
1404 1405 1406 1407
			} 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 已提交
1408 1409 1410 1411 1412 1413
			}

			throw err;
		}
	}

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

J
Joao Moreno 已提交
1417 1418 1419 1420
		if (forcePushMode === ForcePushMode.ForceWithLease) {
			args.push('--force-with-lease');
		} else if (forcePushMode === ForcePushMode.Force) {
			args.push('--force');
1421 1422
		}

J
Joao Moreno 已提交
1423
		if (setUpstream) {
J
Joao Moreno 已提交
1424 1425 1426
			args.push('-u');
		}

1427 1428
		if (tags) {
			args.push('--tags');
J
Joao Moreno 已提交
1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445
		}

		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;
1446 1447
			} else if (/^fatal: The current branch .* has no upstream branch/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoUpstreamBranch;
J
Joao Moreno 已提交
1448 1449 1450 1451 1452 1453
			}

			throw err;
		}
	}

R
rebornix 已提交
1454 1455 1456 1457 1458 1459 1460 1461 1462
	async blame(path: string): Promise<string> {
		try {
			const args = ['blame'];
			args.push(path);

			let result = await this.run(args);

			return result.stdout.trim();
		} catch (err) {
R
rebornix 已提交
1463 1464 1465 1466
			if (/^fatal: no such path/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoPathFound;
			}

R
rebornix 已提交
1467 1468 1469 1470
			throw err;
		}
	}

1471
	async createStash(message?: string, includeUntracked?: boolean): Promise<void> {
1472
		try {
J
Joao Moreno 已提交
1473
			const args = ['stash', 'push'];
1474

1475 1476 1477 1478
			if (includeUntracked) {
				args.push('-u');
			}

J
Joao Moreno 已提交
1479
			if (message) {
J
Joao Moreno 已提交
1480
				args.push('-m', message);
1481 1482 1483 1484 1485 1486 1487
			}

			await this.run(args);
		} catch (err) {
			if (/No local changes to save/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoLocalChanges;
			}
J
Joao Moreno 已提交
1488 1489 1490 1491 1492 1493

			throw err;
		}
	}

	async popStash(index?: number): Promise<void> {
1494
		const args = ['stash', 'pop'];
J
Joao Moreno 已提交
1495
		await this.popOrApplyStash(args, index);
1496 1497 1498 1499
	}

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

1503 1504
	private async popOrApplyStash(args: string[], index?: number): Promise<void> {
		try {
1505
			if (typeof index === 'number') {
J
Joao Moreno 已提交
1506
				args.push(`stash@{${index}}`);
1507
			}
J
Joao Moreno 已提交
1508 1509 1510 1511 1512 1513

			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 || '')) {
1514
				err.gitErrorCode = GitErrorCodes.LocalChangesOverwritten;
J
Joao Moreno 已提交
1515 1516
			} else if (/^CONFLICT/m.test(err.stdout || '')) {
				err.gitErrorCode = GitErrorCodes.StashConflict;
1517
			}
J
Joao Moreno 已提交
1518

1519 1520 1521 1522
			throw err;
		}
	}

1523 1524
	getStatus(limit = 5000): Promise<{ status: IFileStatus[]; didHitLimit: boolean; }> {
		return new Promise<{ status: IFileStatus[]; didHitLimit: boolean; }>((c, e) => {
1525
			const parser = new GitStatusParser();
J
Joao Moreno 已提交
1526 1527
			const env = { GIT_OPTIONAL_LOCKS: '0' };
			const child = this.stream(['status', '-z', '-u'], { env });
1528

M
Matt Bierner 已提交
1529
			const onExit = (exitCode: number) => {
1530
				if (exitCode !== 0) {
1531 1532 1533 1534 1535 1536 1537 1538
					const stderr = stderrData.join('');
					return e(new GitError({
						message: 'Failed to execute git',
						stderr,
						exitCode,
						gitErrorCode: getGitErrorCode(stderr),
						gitCommand: 'status'
					}));
1539
				}
J
Joao Moreno 已提交
1540

1541 1542 1543
				c({ status: parser.status, didHitLimit: false });
			};

1544
			const onStdoutData = (raw: string) => {
1545 1546
				parser.update(raw);

J
Joao Moreno 已提交
1547
				if (parser.status.length > limit) {
1548
					child.removeListener('exit', onExit);
1549
					child.stdout.removeListener('data', onStdoutData);
1550 1551
					child.kill();

J
Joao Moreno 已提交
1552
					c({ status: parser.status.slice(0, limit), didHitLimit: true });
1553 1554 1555 1556
				}
			};

			child.stdout.setEncoding('utf8');
1557 1558 1559 1560 1561 1562
			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 已提交
1563
			child.on('error', cpErrorHandler(e));
1564
			child.on('exit', onExit);
1565
		});
J
Joao Moreno 已提交
1566 1567
	}

J
Joao Moreno 已提交
1568
	async getHEAD(): Promise<Ref> {
J
Joao Moreno 已提交
1569
		try {
J
Joao Moreno 已提交
1570
			const result = await this.run(['symbolic-ref', '--short', 'HEAD']);
J
Joao Moreno 已提交
1571 1572 1573 1574 1575

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

R
Rob Lourens 已提交
1576
			return { name: result.stdout.trim(), commit: undefined, type: RefType.Head };
J
Joao Moreno 已提交
1577
		} catch (err) {
J
Joao Moreno 已提交
1578
			const result = await this.run(['rev-parse', 'HEAD']);
J
Joao Moreno 已提交
1579 1580 1581 1582 1583

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

R
Rob Lourens 已提交
1584
			return { name: undefined, commit: result.stdout.trim(), type: RefType.Head };
J
Joao Moreno 已提交
1585 1586 1587
		}
	}

J
Joao Moreno 已提交
1588 1589
	async findTrackingBranches(upstreamBranch: string): Promise<Branch[]> {
		const result = await this.run(['for-each-ref', '--format', '%(refname:short)%00%(upstream:short)', 'refs/heads']);
1590
		return result.stdout.trim().split('\n')
J
Joao Moreno 已提交
1591 1592 1593
			.map(line => line.trim().split('\0'))
			.filter(([_, upstream]) => upstream === upstreamBranch)
			.map(([ref]) => ({ name: ref, type: RefType.Head } as Branch));
1594 1595
	}

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

M
Matt Bierner 已提交
1599
		const fn = (line: string): Ref | null => {
J
Joao Moreno 已提交
1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615
			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 已提交
1616
			.filter(ref => !!ref) as Ref[];
J
Joao Moreno 已提交
1617 1618
	}

1619 1620
	async getStashes(): Promise<Stash[]> {
		const result = await this.run(['stash', 'list']);
J
Joao Moreno 已提交
1621
		const regex = /^stash@{(\d+)}:(.+)$/;
1622 1623
		const rawStashes = result.stdout.trim().split('\n')
			.filter(b => !!b)
M
Matt Bierner 已提交
1624
			.map(line => regex.exec(line) as RegExpExecArray)
1625
			.filter(g => !!g)
J
Joao Moreno 已提交
1626
			.map(([, index, description]: RegExpExecArray) => ({ index: parseInt(index), description }));
1627

J
Joao Moreno 已提交
1628 1629
		return rawStashes;
	}
1630

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

1636 1637
		for (const line of lines) {
			const parts = line.split(/\s/);
J
Joao Moreno 已提交
1638 1639 1640 1641
			const [name, url, type] = parts;

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

1642
			if (!remote) {
J
Joao Moreno 已提交
1643
				remote = { name, isReadOnly: false };
1644 1645 1646
				remotes.push(remote);
			}

J
Joao Moreno 已提交
1647 1648 1649 1650 1651 1652 1653
			if (/fetch/i.test(type)) {
				remote.fetchUrl = url;
			} else if (/push/i.test(type)) {
				remote.pushUrl = url;
			} else {
				remote.fetchUrl = url;
				remote.pushUrl = url;
1654 1655 1656
			}

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

1660
		return remotes;
J
Joao Moreno 已提交
1661 1662
	}

J
Joao Moreno 已提交
1663
	async getBranch(name: string): Promise<Branch> {
J
Joao Moreno 已提交
1664 1665
		if (name === 'HEAD') {
			return this.getHEAD();
1666 1667 1668 1669
		} 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 已提交
1670 1671
		}

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

		if (!result.stdout) {
J
Joao Moreno 已提交
1675
			return Promise.reject<Branch>(new Error('No such branch'));
J
Joao Moreno 已提交
1676 1677 1678 1679 1680
		}

		const commit = result.stdout.trim();

		try {
J
Joao Moreno 已提交
1681 1682 1683 1684 1685 1686 1687
			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 已提交
1688

J
Joao Moreno 已提交
1689 1690
			const upstream = { remote: match[1], name: match[2] };
			const res3 = await this.run(['rev-list', '--left-right', name + '...' + fullUpstream]);
J
Joao Moreno 已提交
1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724

			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 已提交
1725
				templatePath = path.join(this.repositoryRoot, templatePath);
J
Joao Moreno 已提交
1726 1727 1728 1729 1730 1731 1732 1733 1734 1735
			}

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

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

J
Joao Moreno 已提交
1736
	async getCommit(ref: string): Promise<Commit> {
1737
		const result = await this.run(['show', '-s', `--format=${COMMIT_FORMAT}`, ref]);
1738
		return parseGitCommit(result.stdout) || Promise.reject<Commit>('bad commit format');
J
Joao Moreno 已提交
1739
	}
1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759

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