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

6
import { promises as fs, exists, realpath } from 'fs';
J
Joao Moreno 已提交
7
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 * as iconv from 'iconv-lite-umd';
J
Joao Moreno 已提交
13
import * as filetype from 'file-type';
J
Joao Moreno 已提交
14
import { assign, groupBy, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent, splitInChunks, Limiter } from './util';
15
import { CancellationToken, Progress, Uri } from 'vscode';
J
Joao Moreno 已提交
16
import { URI } from 'vscode-uri';
J
Joao Moreno 已提交
17
import { detectEncoding } from './encoding';
18
import { Ref, RefType, Branch, Remote, GitErrorCodes, LogOptions, Change, Status, CommitOptions, BranchQuery } from './api/git';
J
Joao Moreno 已提交
19 20
import * as byline from 'byline';
import { StringDecoder } from 'string_decoder';
J
Joao Moreno 已提交
21

J
Joao Moreno 已提交
22 23
// https://github.com/microsoft/vscode/issues/65693
const MAX_CLI_LENGTH = 30000;
24
const isWindows = process.platform === 'win32';
J
Joao Moreno 已提交
25 26 27 28 29 30

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

J
Joao Moreno 已提交
31 32 33 34 35 36 37
export interface IFileStatus {
	x: string;
	y: string;
	path: string;
	rename?: string;
}

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

J
Joao Moreno 已提交
43 44 45 46
interface MutableRemote extends Remote {
	fetchUrl?: string;
	pushUrl?: string;
	isReadOnly: boolean;
J
Joao Moreno 已提交
47 48
}

49
// TODO@eamodio: Move to git.d.ts once we are good with the api
E
Eric Amodio 已提交
50 51 52 53
/**
 * Log file options.
 */
export interface LogFileOptions {
54 55 56 57 58 59 60
	/** Optional. The maximum number of log entries to retrieve. */
	readonly maxEntries?: number | string;
	/** Optional. The Git sha (hash) to start retrieving log entries from. */
	readonly hash?: string;
	/** Optional. Specifies whether to start retrieving log entries in reverse order. */
	readonly reverse?: boolean;
	readonly sortByAuthorDate?: boolean;
E
Eric Amodio 已提交
61 62
}

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

J
Joao Moreno 已提交
67
function findSpecificGit(path: string, onLookup: (path: string) => void): Promise<IGit> {
J
Joao Moreno 已提交
68
	return new Promise<IGit>((c, e) => {
J
Joao Moreno 已提交
69 70
		onLookup(path);

J
Joao Moreno 已提交
71 72
		const buffers: Buffer[] = [];
		const child = cp.spawn(path, ['--version']);
73
		child.stdout.on('data', (b: Buffer) => buffers.push(b));
J
Joao Moreno 已提交
74
		child.on('error', cpErrorHandler(e));
J
Joao Moreno 已提交
75 76 77 78
		child.on('exit', code => code ? e(new Error('Not found')) : c({ path, version: parseVersion(Buffer.concat(buffers).toString('utf8').trim()) }));
	});
}

J
Joao Moreno 已提交
79
function findGitDarwin(onLookup: (path: string) => void): Promise<IGit> {
J
Joao Moreno 已提交
80 81 82 83 84 85 86 87 88
	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 已提交
89 90
				onLookup(path);

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

J
Joao Moreno 已提交
94 95 96 97
					if (err) {
						return e('git not found');
					}

J
Joao 已提交
98
					return c({ path, version: parseVersion(stdout.trim()) });
J
Joao Moreno 已提交
99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120
				});
			}

			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 已提交
121
function findSystemGitWin32(base: string, onLookup: (path: string) => void): Promise<IGit> {
J
Joao Moreno 已提交
122 123 124 125
	if (!base) {
		return Promise.reject<IGit>('Not found');
	}

J
Joao Moreno 已提交
126
	return findSpecificGit(path.join(base, 'Git', 'cmd', 'git.exe'), onLookup);
J
Joao Moreno 已提交
127 128
}

129 130 131 132 133
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 已提交
134 135
function findGitWin32(onLookup: (path: string) => void): Promise<IGit> {
	return findSystemGitWin32(process.env['ProgramW6432'] as string, onLookup)
R
Rob Lourens 已提交
136 137 138 139
		.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 已提交
140 141
}

W
WhizSid 已提交
142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163
export async function findGit(hint: string | string[] | undefined, onLookup: (path: string) => void): Promise<IGit> {
	const hints = Array.isArray(hint) ? hint : hint ? [hint] : [];

	for (const hint of hints) {
		try {
			return await findSpecificGit(hint, onLookup);
		} catch {
			// noop
		}
	}

	try {
		switch (process.platform) {
			case 'darwin': return await findGitDarwin(onLookup);
			case 'win32': return await findGitWin32(onLookup);
			default: return await findSpecificGit('git', onLookup);
		}
	} catch {
		// noop
	}

	throw new Error('Git installation not found.');
J
Joao Moreno 已提交
164 165
}

J
Joao Moreno 已提交
166
export interface IExecutionResult<T extends string | Buffer> {
J
Joao Moreno 已提交
167
	exitCode: number;
J
Joao Moreno 已提交
168
	stdout: T;
J
Joao Moreno 已提交
169 170 171
	stderr: string;
}

J
Joao Moreno 已提交
172 173 174 175 176 177 178 179 180 181 182 183 184 185
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 已提交
186
export interface SpawnOptions extends cp.SpawnOptions {
J
Joao Moreno 已提交
187 188 189
	input?: string;
	encoding?: string;
	log?: boolean;
J
Joao Moreno 已提交
190
	cancellationToken?: CancellationToken;
J
Joao Moreno 已提交
191
	onSpawn?: (childProcess: cp.ChildProcess) => void;
J
Joao Moreno 已提交
192 193
}

J
Joao Moreno 已提交
194
async function exec(child: cp.ChildProcess, cancellationToken?: CancellationToken): Promise<IExecutionResult<Buffer>> {
J
Joao Moreno 已提交
195
	if (!child.stdout || !child.stderr) {
J
Joao Moreno 已提交
196 197 198 199 200
		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 已提交
201 202
	}

J
Joao Moreno 已提交
203 204
	const disposables: IDisposable[] = [];

M
Matt Bierner 已提交
205
	const once = (ee: NodeJS.EventEmitter, name: string, fn: (...args: any[]) => void) => {
J
Joao Moreno 已提交
206 207 208 209
		ee.once(name, fn);
		disposables.push(toDisposable(() => ee.removeListener(name, fn)));
	};

M
Matt Bierner 已提交
210
	const on = (ee: NodeJS.EventEmitter, name: string, fn: (...args: any[]) => void) => {
J
Joao Moreno 已提交
211 212 213 214
		ee.on(name, fn);
		disposables.push(toDisposable(() => ee.removeListener(name, fn)));
	};

J
Joao Moreno 已提交
215
	let result = Promise.all<any>([
J
Joao Moreno 已提交
216
		new Promise<number>((c, e) => {
J
Joao Moreno 已提交
217
			once(child, 'error', cpErrorHandler(e));
J
Joao Moreno 已提交
218 219
			once(child, 'exit', c);
		}),
J
Joao Moreno 已提交
220
		new Promise<Buffer>(c => {
221
			const buffers: Buffer[] = [];
222 223
			on(child.stdout!, 'data', (b: Buffer) => buffers.push(b));
			once(child.stdout!, 'close', () => c(Buffer.concat(buffers)));
J
Joao Moreno 已提交
224 225
		}),
		new Promise<string>(c => {
226
			const buffers: Buffer[] = [];
227 228
			on(child.stderr!, 'data', (b: Buffer) => buffers.push(b));
			once(child.stderr!, 'close', () => c(Buffer.concat(buffers).toString('utf8')));
J
Joao Moreno 已提交
229
		})
J
Joao Moreno 已提交
230 231 232 233 234 235 236 237 238 239
	]) 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 已提交
240

J
Joao Moreno 已提交
241 242 243 244 245 246
				e(new GitError({ message: 'Cancelled' }));
			});
		});

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

J
Joao Moreno 已提交
248 249 250 251 252 253
	try {
		const [exitCode, stdout, stderr] = await result;
		return { exitCode, stdout, stderr };
	} finally {
		dispose(disposables);
	}
J
Joao Moreno 已提交
254 255 256 257 258 259 260 261 262 263 264 265 266 267
}

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

export class GitError {

J
Joao Moreno 已提交
268
	error?: Error;
J
Joao Moreno 已提交
269
	message: string;
J
Joao Moreno 已提交
270 271 272 273 274
	stdout?: string;
	stderr?: string;
	exitCode?: number;
	gitErrorCode?: string;
	gitCommand?: string;
J
Joao Moreno 已提交
275 276 277 278 279 280

	constructor(data: IGitErrorData) {
		if (data.error) {
			this.error = data.error;
			this.message = data.error.message;
		} else {
R
Rob Lourens 已提交
281
			this.error = undefined;
M
Matt Bierner 已提交
282
			this.message = '';
J
Joao Moreno 已提交
283 284 285
		}

		this.message = this.message || data.message || 'Git error';
J
Joao Moreno 已提交
286 287 288 289 290
		this.stdout = data.stdout;
		this.stderr = data.stderr;
		this.exitCode = data.exitCode;
		this.gitErrorCode = data.gitErrorCode;
		this.gitCommand = data.gitCommand;
J
Joao Moreno 已提交
291 292 293 294 295 296 297 298 299
	}

	toString(): string {
		let result = this.message + ' ' + JSON.stringify({
			exitCode: this.exitCode,
			gitErrorCode: this.gitErrorCode,
			gitCommand: this.gitCommand,
			stdout: this.stdout,
			stderr: this.stderr
300
		}, null, 2);
J
Joao Moreno 已提交
301 302 303 304 305 306 307 308 309 310 311 312

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

		return result;
	}
}

export interface IGitOptions {
	gitPath: string;
	version: string;
313
	env?: any;
J
Joao Moreno 已提交
314 315
}

316 317 318
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;
319
	} else if (/Authentication failed/i.test(stderr)) {
320
		return GitErrorCodes.AuthenticationFailed;
J
Joao Moreno 已提交
321
	} else if (/Not a git repository/i.test(stderr)) {
322 323 324 325 326 327 328 329 330
		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;
331 332
	} else if (/branch '.+' is not fully merged/.test(stderr)) {
		return GitErrorCodes.BranchNotFullyMerged;
333 334
	} else if (/Couldn\'t find remote ref/.test(stderr)) {
		return GitErrorCodes.NoRemoteReference;
335 336 337 338
	} 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;
339 340
	} else if (/Please,? commit your changes or stash them/.test(stderr)) {
		return GitErrorCodes.DirtyWorkTree;
341 342
	}

R
Rob Lourens 已提交
343
	return undefined;
344 345
}

J
Joao Moreno 已提交
346 347 348 349 350 351
// https://github.com/microsoft/vscode/issues/89373
// https://github.com/git-for-windows/git/issues/2478
function sanitizePath(path: string): string {
	return path.replace(/^([a-z]):\\/i, (_, letter) => `${letter.toUpperCase()}:\\`);
}

352
const COMMIT_FORMAT = '%H%n%aN%n%aE%n%at%n%ct%n%P%n%B';
353

J
Joao Moreno 已提交
354 355
export class Git {

J
Joao Moreno 已提交
356
	readonly path: string;
357
	private env: any;
J
Joao Moreno 已提交
358

359 360
	private _onOutput = new EventEmitter();
	get onOutput(): EventEmitter { return this._onOutput; }
J
Joao Moreno 已提交
361

J
Joao Moreno 已提交
362
	constructor(options: IGitOptions) {
J
Joao Moreno 已提交
363
		this.path = options.gitPath;
364
		this.env = options.env || {};
J
Joao Moreno 已提交
365 366
	}

J
Joao Moreno 已提交
367 368
	open(repository: string, dotGit: string): Repository {
		return new Repository(this, repository, dotGit);
J
Joao Moreno 已提交
369 370
	}

J
Joao Moreno 已提交
371 372 373 374 375
	async init(repository: string): Promise<void> {
		await this.exec(repository, ['init']);
		return;
	}

J
Joao Moreno 已提交
376
	async clone(url: string, parentPath: string, progress: Progress<{ increment: number }>, cancellationToken?: CancellationToken): Promise<string> {
377
		let baseFolderName = decodeURI(url).replace(/[\/]+$/, '').replace(/^.*[\/\\]/, '').replace(/\.git$/, '') || 'repository';
378 379 380 381
		let folderName = baseFolderName;
		let folderPath = path.join(parentPath, folderName);
		let count = 1;

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

J
Joao Moreno 已提交
387
		await mkdirp(parentPath);
J
Joao Moreno 已提交
388

J
Joao Moreno 已提交
389 390 391
		const onSpawn = (child: cp.ChildProcess) => {
			const decoder = new StringDecoder('utf8');
			const lineStream = new byline.LineStream({ encoding: 'utf8' });
392
			child.stderr!.on('data', (buffer: Buffer) => lineStream.write(decoder.write(buffer)));
J
Joao Moreno 已提交
393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416

			let totalProgress = 0;
			let previousProgress = 0;

			lineStream.on('data', (line: string) => {
				let match: RegExpMatchArray | null = null;

				if (match = /Counting objects:\s*(\d+)%/i.exec(line)) {
					totalProgress = Math.floor(parseInt(match[1]) * 0.1);
				} else if (match = /Compressing objects:\s*(\d+)%/i.exec(line)) {
					totalProgress = 10 + Math.floor(parseInt(match[1]) * 0.1);
				} else if (match = /Receiving objects:\s*(\d+)%/i.exec(line)) {
					totalProgress = 20 + Math.floor(parseInt(match[1]) * 0.4);
				} else if (match = /Resolving deltas:\s*(\d+)%/i.exec(line)) {
					totalProgress = 60 + Math.floor(parseInt(match[1]) * 0.4);
				}

				if (totalProgress !== previousProgress) {
					progress.report({ increment: totalProgress - previousProgress });
					previousProgress = totalProgress;
				}
			});
		};

J
Joao Moreno 已提交
417
		try {
J
Joao Moreno 已提交
418
			await this.exec(parentPath, ['clone', url.includes(' ') ? encodeURI(url) : url, folderPath, '--progress'], { cancellationToken, onSpawn });
J
Joao Moreno 已提交
419 420 421 422 423 424 425 426 427
		} 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 已提交
428 429 430
		return folderPath;
	}

J
Joao Moreno 已提交
431
	async getRepositoryRoot(repositoryPath: string): Promise<string> {
432
		const result = await this.exec(repositoryPath, ['rev-parse', '--show-toplevel'], { log: false });
433

J
jeanp413 已提交
434
		// Keep trailing spaces which are part of the directory name
J
João Moreno 已提交
435
		const repoPath = path.normalize(result.stdout.trimLeft().replace(/[\r\n]+$/, ''));
436 437 438 439 440 441 442 443 444 445 446 447

		if (isWindows) {
			// On Git 2.25+ if you call `rev-parse --show-toplevel` on a mapped drive, instead of getting the mapped drive path back, you get the UNC path for the mapped drive.
			// So we will try to normalize it back to the mapped drive path, if possible
			const repoUri = Uri.file(repoPath);
			const pathUri = Uri.file(repositoryPath);
			if (repoUri.authority.length !== 0 && pathUri.authority.length === 0) {
				let match = /(?<=^\/?)([a-zA-Z])(?=:\/)/.exec(pathUri.path);
				if (match !== null) {
					const [, letter] = match;

					try {
448
						const networkPath = await new Promise<string | undefined>(resolve =>
449
							realpath.native(`${letter}:`, { encoding: 'utf8' }, (err, resolvedPath) =>
E
Eric Amodio 已提交
450
								resolve(err !== null ? undefined : resolvedPath),
451 452 453
							),
						);
						if (networkPath !== undefined) {
454
							return path.normalize(
455 456 457 458
								repoUri.fsPath.replace(
									networkPath,
									`${letter.toLowerCase()}:${networkPath.endsWith('\\') ? '\\' : ''}`
								),
459 460 461 462 463 464 465 466 467 468
							);
						}
					} catch { }
				}

				return path.normalize(pathUri.fsPath);
			}
		}

		return repoPath;
J
Joao Moreno 已提交
469 470
	}

J
Joao Moreno 已提交
471
	async getRepositoryDotGit(repositoryPath: string): Promise<string> {
472 473 474 475 476 477 478 479
		const result = await this.exec(repositoryPath, ['rev-parse', '--git-dir']);
		let dotGitPath = result.stdout.trim();

		if (!path.isAbsolute(dotGitPath)) {
			dotGitPath = path.join(repositoryPath, dotGitPath);
		}

		return path.normalize(dotGitPath);
J
Joao Moreno 已提交
480 481
	}

J
Joao Moreno 已提交
482
	async exec(cwd: string, args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
J
Joao Moreno 已提交
483
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
484
		return await this._exec(args, options);
J
Joao Moreno 已提交
485 486
	}

J
Joao Moreno 已提交
487 488 489 490
	async exec2(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
		return await this._exec(args, options);
	}

J
Joao Moreno 已提交
491
	stream(cwd: string, args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
492
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
493
		return this.spawn(args, options);
J
Joao Moreno 已提交
494 495
	}

J
Joao Moreno 已提交
496
	private async _exec(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
J
Joao Moreno 已提交
497
		const child = this.spawn(args, options);
J
Joao Moreno 已提交
498

J
Joao Moreno 已提交
499 500 501 502
		if (options.onSpawn) {
			options.onSpawn(child);
		}

J
Joao Moreno 已提交
503
		if (options.input) {
504
			child.stdin!.end(options.input, 'utf8');
J
Joao Moreno 已提交
505 506
		}

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

J
Joao Moreno 已提交
509 510
		if (options.log !== false && bufferResult.stderr.length > 0) {
			this.log(`${bufferResult.stderr}\n`);
J
Joao Moreno 已提交
511 512
		}

J
Joao Moreno 已提交
513 514 515 516 517 518 519 520 521 522 523
		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 已提交
524 525 526 527
				message: 'Failed to execute git',
				stdout: result.stdout,
				stderr: result.stderr,
				exitCode: result.exitCode,
528
				gitErrorCode: getGitErrorCode(result.stderr),
J
Joao Moreno 已提交
529 530 531 532 533
				gitCommand: args[0]
			}));
		}

		return result;
J
Joao Moreno 已提交
534 535
	}

J
Joao Moreno 已提交
536
	spawn(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
537
		if (!this.path) {
J
Joao Moreno 已提交
538 539 540 541 542 543 544 545 546 547 548
			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
		}

549
		options.env = assign({}, process.env, this.env, options.env || {}, {
J
Joao Moreno 已提交
550
			VSCODE_GIT_COMMAND: args[0],
551
			LC_ALL: 'en_US.UTF-8',
552
			LANG: 'en_US.UTF-8',
553
			GIT_PAGER: 'cat'
J
Joao Moreno 已提交
554
		});
J
Joao Moreno 已提交
555

J
Joao Moreno 已提交
556 557 558 559
		if (options.cwd) {
			options.cwd = sanitizePath(options.cwd);
		}

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

J
Joao Moreno 已提交
564
		return cp.spawn(this.path, args, options);
J
Joao Moreno 已提交
565 566 567
	}

	private log(output: string): void {
568
		this._onOutput.emit('log', output);
J
Joao Moreno 已提交
569
	}
J
Joao Moreno 已提交
570 571
}

J
Joao Moreno 已提交
572
export interface Commit {
J
Joao Moreno 已提交
573 574
	hash: string;
	message: string;
J
Joao Moreno 已提交
575
	parents: string[];
576 577 578
	authorDate?: Date;
	authorName?: string;
	authorEmail?: string;
579
	commitDate?: Date;
J
Joao Moreno 已提交
580 581
}

582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619
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 已提交
620
		if (entry.x === 'R' || entry.x === 'C') {
621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647
			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;
	}
}

648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681
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 已提交
682
		const propertyMatch = /^\s*(\w+)\s+=\s+(.*)$/.exec(line);
683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709

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

710
const commitRegex = /([0-9a-f]{40})\n(.*)\n(.*)\n(.*)\n(.*)\n(.*)(?:\n([^]*?))?(?:\x00)/gm;
711 712 713 714 715

export function parseGitCommits(data: string): Commit[] {
	let commits: Commit[] = [];

	let ref;
716 717 718 719
	let authorName;
	let authorEmail;
	let authorDate;
	let commitDate;
720 721 722 723 724 725 726 727 728 729
	let parents;
	let message;
	let match;

	do {
		match = commitRegex.exec(data);
		if (match === null) {
			break;
		}

730
		[, ref, authorName, authorEmail, authorDate, commitDate, parents, message] = match;
731

732 733 734 735 736 737 738 739 740
		if (message[message.length - 1] === '\n') {
			message = message.substr(0, message.length - 1);
		}

		// Stop excessive memory usage by using substr -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
		commits.push({
			hash: ` ${ref}`.substr(1),
			message: ` ${message}`.substr(1),
			parents: parents ? parents.split(' ') : [],
741 742 743 744
			authorDate: new Date(Number(authorDate) * 1000),
			authorName: ` ${authorName}`.substr(1),
			authorEmail: ` ${authorEmail}`.substr(1),
			commitDate: new Date(Number(commitDate) * 1000),
745 746 747 748
		});
	} while (true);

	return commits;
749 750
}

751 752 753 754
interface LsTreeElement {
	mode: string;
	type: string;
	object: string;
J
Joao Moreno 已提交
755
	size: string;
756 757 758 759 760 761
	file: string;
}

export function parseLsTree(raw: string): LsTreeElement[] {
	return raw.split('\n')
		.filter(l => !!l)
J
Joao Moreno 已提交
762
		.map(line => /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/.exec(line)!)
763
		.filter(m => !!m)
J
Joao Moreno 已提交
764
		.map(([, mode, type, object, size, file]) => ({ mode, type, object, size, file }));
765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781
}

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

782 783
export interface PullOptions {
	unshallow?: boolean;
J
Joao Moreno 已提交
784
	tags?: boolean;
785
	readonly cancellationToken?: CancellationToken;
786 787
}

J
Joao Moreno 已提交
788 789
export enum ForcePushMode {
	Force,
J
Joao Moreno 已提交
790
	ForceWithLease
J
Joao Moreno 已提交
791 792
}

J
Joao Moreno 已提交
793 794 795 796
export class Repository {

	constructor(
		private _git: Git,
J
Joao Moreno 已提交
797 798
		private repositoryRoot: string,
		readonly dotGit: string
J
Joao Moreno 已提交
799 800 801 802 803 804
	) { }

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

J
Joao Moreno 已提交
805 806
	get root(): string {
		return this.repositoryRoot;
J
Joao Moreno 已提交
807 808 809
	}

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

J
Joao Moreno 已提交
814
	stream(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
815
		return this.git.stream(this.repositoryRoot, args, options);
J
Joao Moreno 已提交
816 817
	}

J
Joao Moreno 已提交
818
	spawn(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
819 820 821
		return this.git.spawn(args, options);
	}

J
Joao Moreno 已提交
822
	async config(scope: string, key: string, value: any = null, options: SpawnOptions = {}): Promise<string> {
J
Joao Moreno 已提交
823 824 825 826 827 828 829 830 831 832 833 834 835
		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 已提交
836
		return result.stdout.trim();
J
Joao Moreno 已提交
837 838
	}

J
Joao Moreno 已提交
839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856
	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) };
		});
	}

857
	async log(options?: LogOptions): Promise<Commit[]> {
E
Eric Amodio 已提交
858 859
		const maxEntries = options?.maxEntries ?? 32;
		const args = ['log', `-n${maxEntries}`, `--format=${COMMIT_FORMAT}`, '-z', '--'];
A
Alex Ross 已提交
860 861 862
		if (options?.path) {
			args.push(options.path);
		}
863

864 865
		const result = await this.run(args);
		if (result.exitCode) {
866
			// An empty repo
867 868 869
			return [];
		}

870 871
		return parseGitCommits(result.stdout);
	}
872

873
	async logFile(uri: Uri, options?: LogFileOptions): Promise<Commit[]> {
874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893
		const args = ['log', `--format=${COMMIT_FORMAT}`, '-z'];

		if (options?.maxEntries && !options?.reverse) {
			args.push(`-n${options.maxEntries}`);
		}

		if (options?.hash) {
			// If we are reversing, we must add a range (with HEAD) because we are using --ancestry-path for better reverse walking
			if (options?.reverse) {
				args.push('--reverse', '--ancestry-path', `${options.hash}..HEAD`);
			} else {
				args.push(options.hash);
			}
		}

		if (options?.sortByAuthorDate) {
			args.push('--author-date-order');
		}

		args.push('--', uri.fsPath);
894

895 896 897 898
		const result = await this.run(args);
		if (result.exitCode) {
			// No file history, e.g. a new file or untracked
			return [];
899 900
		}

901
		return parseGitCommits(result.stdout);
902 903
	}

904
	async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false): Promise<string> {
J
Joao Moreno 已提交
905
		const stdout = await this.buffer(object);
906 907 908 909 910

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

J
Joao Moreno 已提交
911 912 913
		encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';

		return iconv.decode(stdout, encoding);
J
Joao Moreno 已提交
914 915 916
	}

	async buffer(object: string): Promise<Buffer> {
J
João Moreno 已提交
917
		const child = this.stream(['show', '--textconv', object]);
J
Joao Moreno 已提交
918 919

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

923
		const { exitCode, stdout, stderr } = await exec(child);
J
Joao Moreno 已提交
924 925

		if (exitCode) {
926
			const err = new GitError({
J
Joao Moreno 已提交
927 928
				message: 'Could not show object.',
				exitCode
929 930 931 932 933 934 935
			});

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

			return Promise.reject<Buffer>(err);
J
Joao Moreno 已提交
936 937 938
		}

		return stdout;
J
Joao Moreno 已提交
939 940
	}

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

J
Joao Moreno 已提交
945
			if (elements.length === 0) {
J
Joao Moreno 已提交
946
				throw new GitError({ message: 'Path not known by git', gitErrorCode: GitErrorCodes.UnknownPath });
J
Joao Moreno 已提交
947 948
			}

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

J
Joao Moreno 已提交
953
			return { mode, object, size };
J
Joao Moreno 已提交
954 955
		}

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

J
Joao Moreno 已提交
958
		if (elements.length === 0) {
J
Joao Moreno 已提交
959
			throw new GitError({ message: 'Path not known by git', gitErrorCode: GitErrorCodes.UnknownPath });
J
Joao Moreno 已提交
960 961
		}

J
Joao Moreno 已提交
962
		const { mode, object, size } = elements[0];
J
Joao Moreno 已提交
963
		return { mode, object, size: parseInt(size) };
J
Joao Moreno 已提交
964 965
	}

J
Joao Moreno 已提交
966
	async lstree(treeish: string, path: string): Promise<LsTreeElement[]> {
J
Joao Moreno 已提交
967
		const { stdout } = await this.run(['ls-tree', '-l', treeish, '--', sanitizePath(path)]);
968 969
		return parseLsTree(stdout);
	}
970

971
	async lsfiles(path: string): Promise<LsFilesElement[]> {
J
Joao Moreno 已提交
972
		const { stdout } = await this.run(['ls-files', '--stage', '--', sanitizePath(path)]);
973
		return parseLsFiles(stdout);
974 975
	}

J
Joao Moreno 已提交
976
	async getGitRelativePath(ref: string, relativePath: string): Promise<string> {
977 978
		const relativePathLowercase = relativePath.toLowerCase();
		const dirname = path.posix.dirname(relativePath) + '/';
J
Joao Moreno 已提交
979
		const elements: { file: string; }[] = ref ? await this.lstree(ref, dirname) : await this.lsfiles(dirname);
980 981 982 983
		const element = elements.filter(file => file.file.toLowerCase() === relativePathLowercase)[0];

		if (!element) {
			throw new GitError({ message: 'Git relative path not found.' });
984
		}
985 986

		return element.file;
987 988
	}

J
Joao Moreno 已提交
989
	async detectObjectType(object: string): Promise<{ mimetype: string, encoding?: string }> {
J
João Moreno 已提交
990
		const child = await this.stream(['show', '--textconv', object]);
991
		const buffer = await readBytes(child.stdout!, 4100);
J
Joao Moreno 已提交
992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028

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

1029 1030 1031 1032 1033 1034 1035
	async apply(patch: string, reverse?: boolean): Promise<void> {
		const args = ['apply', patch];

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

1036 1037 1038 1039 1040 1041 1042 1043 1044
		try {
			await this.run(args);
		} catch (err) {
			if (/patch does not apply/.test(err.stderr)) {
				err.gitErrorCode = GitErrorCodes.PatchDoesNotApply;
			}

			throw err;
		}
1045 1046 1047
	}

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

J
Joao Moreno 已提交
1050
		if (cached) {
1051 1052 1053 1054 1055 1056 1057
			args.push('--cached');
		}

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

1058 1059 1060 1061
	diffWithHEAD(): Promise<Change[]>;
	diffWithHEAD(path: string): Promise<string>;
	diffWithHEAD(path?: string | undefined): Promise<string | Change[]>;
	async diffWithHEAD(path?: string | undefined): Promise<string | Change[]> {
1062 1063 1064 1065
		if (!path) {
			return await this.diffFiles(false);
		}

J
Joao Moreno 已提交
1066
		const args = ['diff', '--', sanitizePath(path)];
J
Joao Moreno 已提交
1067 1068 1069 1070
		const result = await this.run(args);
		return result.stdout;
	}

1071 1072 1073
	diffWith(ref: string): Promise<Change[]>;
	diffWith(ref: string, path: string): Promise<string>;
	diffWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
1074 1075 1076 1077 1078
	async diffWith(ref: string, path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(false, ref);
		}

J
Joao Moreno 已提交
1079
		const args = ['diff', ref, '--', sanitizePath(path)];
J
Joao Moreno 已提交
1080 1081 1082 1083
		const result = await this.run(args);
		return result.stdout;
	}

1084 1085 1086
	diffIndexWithHEAD(): Promise<Change[]>;
	diffIndexWithHEAD(path: string): Promise<string>;
	diffIndexWithHEAD(path?: string | undefined): Promise<string | Change[]>;
1087 1088 1089 1090 1091
	async diffIndexWithHEAD(path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(true);
		}

J
Joao Moreno 已提交
1092
		const args = ['diff', '--cached', '--', sanitizePath(path)];
J
Joao Moreno 已提交
1093 1094 1095 1096
		const result = await this.run(args);
		return result.stdout;
	}

1097 1098 1099
	diffIndexWith(ref: string): Promise<Change[]>;
	diffIndexWith(ref: string, path: string): Promise<string>;
	diffIndexWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
1100 1101 1102 1103 1104
	async diffIndexWith(ref: string, path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(true, ref);
		}

J
Joao Moreno 已提交
1105
		const args = ['diff', '--cached', ref, '--', sanitizePath(path)];
J
Joao Moreno 已提交
1106 1107 1108 1109 1110 1111 1112 1113 1114 1115
		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;
	}

1116 1117 1118
	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[]>;
1119 1120 1121 1122 1123 1124
	async diffBetween(ref1: string, ref2: string, path?: string): Promise<string | Change[]> {
		const range = `${ref1}...${ref2}`;
		if (!path) {
			return await this.diffFiles(false, range);
		}

J
Joao Moreno 已提交
1125
		const args = ['diff', range, '--', sanitizePath(path)];
J
Joao Moreno 已提交
1126 1127 1128 1129 1130
		const result = await this.run(args);

		return result.stdout.trim();
	}

1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157
	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 已提交
1158
			const originalUri = URI.file(path.isAbsolute(resourcePath) ? resourcePath : path.join(this.repositoryRoot, resourcePath));
1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185
			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 已提交
1186
					const uri = URI.file(path.isAbsolute(newPath) ? newPath : path.join(this.repositoryRoot, newPath));
1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211
					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 已提交
1212 1213 1214 1215 1216 1217 1218
	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 已提交
1219 1220 1221 1222 1223 1224 1225
	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 已提交
1226 1227 1228 1229 1230 1231 1232 1233 1234
	async add(paths: string[], opts?: { update?: boolean }): Promise<void> {
		const args = ['add'];

		if (opts && opts.update) {
			args.push('-u');
		} else {
			args.push('-A');
		}

J
Joao Moreno 已提交
1235
		if (paths && paths.length) {
1236
			for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {
J
João Moreno 已提交
1237
				await this.run([...args, '--', ...chunk]);
1238
			}
J
Joao Moreno 已提交
1239
		} else {
J
João Moreno 已提交
1240
			await this.run([...args, '--', '.']);
J
Joao Moreno 已提交
1241 1242 1243
		}
	}

J
Joao Moreno 已提交
1244 1245 1246 1247 1248 1249 1250
	async rm(paths: string[]): Promise<void> {
		const args = ['rm', '--'];

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

J
Joao Moreno 已提交
1251
		args.push(...paths.map(sanitizePath));
J
Joao Moreno 已提交
1252 1253 1254 1255

		await this.run(args);
	}

J
Joao Moreno 已提交
1256
	async stage(path: string, data: string): Promise<void> {
J
Joao Moreno 已提交
1257
		const child = this.stream(['hash-object', '--stdin', '-w', '--path', sanitizePath(path)], { stdio: [null, null, null] });
1258
		child.stdin!.end(data, 'utf8');
J
Joao Moreno 已提交
1259 1260

		const { exitCode, stdout } = await exec(child);
J
Joao Moreno 已提交
1261
		const hash = stdout.toString('utf8');
J
Joao Moreno 已提交
1262 1263 1264 1265 1266 1267 1268 1269

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

J
Joao Moreno 已提交
1270
		const treeish = await this.getCommit('HEAD').then(() => 'HEAD', () => '');
J
Joao Moreno 已提交
1271
		let mode: string;
D
Darrien Singleton 已提交
1272
		let add: string = '';
J
Joao Moreno 已提交
1273 1274

		try {
1275
			const details = await this.getObjectDetails(treeish, path);
J
Joao Moreno 已提交
1276 1277
			mode = details.mode;
		} catch (err) {
J
Joao Moreno 已提交
1278 1279 1280 1281
			if (err.gitErrorCode !== GitErrorCodes.UnknownPath) {
				throw err;
			}

J
Joao Moreno 已提交
1282
			mode = '100644';
D
Darrien Singleton 已提交
1283
			add = '--add';
J
Joao Moreno 已提交
1284 1285
		}

D
Darrien Singleton 已提交
1286
		await this.run(['update-index', add, '--cacheinfo', mode, hash, path]);
J
Joao Moreno 已提交
1287 1288
	}

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

1292 1293 1294 1295
		if (opts.track) {
			args.push('--track');
		}

J
Joao Moreno 已提交
1296 1297 1298 1299 1300
		if (treeish) {
			args.push(treeish);
		}

		try {
J
Joao Moreno 已提交
1301
			if (paths && paths.length > 0) {
J
Joao Moreno 已提交
1302
				for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
J
Joao Moreno 已提交
1303 1304 1305 1306 1307
					await this.run([...args, '--', ...chunk]);
				}
			} else {
				await this.run(args);
			}
J
Joao Moreno 已提交
1308
		} catch (err) {
J
Joao Moreno 已提交
1309
			if (/Please,? commit your changes or stash them/.test(err.stderr || '')) {
J
Joao Moreno 已提交
1310 1311 1312 1313 1314 1315 1316
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
			}

			throw err;
		}
	}

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

J
Joao Moreno 已提交
1320
		if (opts.all) {
J
Joao Moreno 已提交
1321 1322 1323
			args.push('--all');
		}

J
Joao Moreno 已提交
1324
		if (opts.amend) {
J
Joao Moreno 已提交
1325 1326 1327
			args.push('--amend');
		}

J
Joao Moreno 已提交
1328
		if (opts.signoff) {
J
Joao Moreno 已提交
1329 1330 1331
			args.push('--signoff');
		}

1332 1333 1334
		if (opts.signCommit) {
			args.push('-S');
		}
1335

T
Tom Basche 已提交
1336 1337 1338
		if (opts.empty) {
			args.push('--allow-empty');
		}
1339

1340 1341 1342 1343
		if (opts.noVerify) {
			args.push('--no-verify');
		}

J
Joao Moreno 已提交
1344 1345 1346
		try {
			await this.run(args, { input: message || '' });
		} catch (commitErr) {
1347 1348 1349
			await this.handleCommitError(commitErr);
		}
	}
J
Joao Moreno 已提交
1350

1351 1352 1353 1354
	async rebaseAbort(): Promise<void> {
		await this.run(['rebase', '--abort']);
	}

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

1358 1359 1360 1361 1362 1363
		try {
			await this.run(args);
		} catch (commitErr) {
			await this.handleCommitError(commitErr);
		}
	}
J
Joao Moreno 已提交
1364

1365 1366 1367
	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 已提交
1368 1369
			throw commitErr;
		}
1370 1371

		try {
J
Joao Moreno 已提交
1372 1373 1374 1375 1376
			await this.run(['config', '--get-all', 'user.name']);
		} catch (err) {
			err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
			throw err;
		}
1377 1378

		try {
J
Joao Moreno 已提交
1379 1380 1381 1382
			await this.run(['config', '--get-all', 'user.email']);
		} catch (err) {
			err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
			throw err;
1383 1384 1385
		}

		throw commitErr;
J
Joao Moreno 已提交
1386 1387
	}

J
Joao Moreno 已提交
1388
	async branch(name: string, checkout: boolean, ref?: string): Promise<void> {
J
Joao Moreno 已提交
1389
		const args = checkout ? ['checkout', '-q', '-b', name, '--no-track'] : ['branch', '-q', name];
J
Joao Moreno 已提交
1390 1391 1392 1393 1394

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

J
Joao Moreno 已提交
1395 1396 1397
		await this.run(args);
	}

1398 1399
	async deleteBranch(name: string, force?: boolean): Promise<void> {
		const args = ['branch', force ? '-D' : '-d', name];
M
Maik Riechert 已提交
1400 1401 1402
		await this.run(args);
	}

1403 1404 1405 1406 1407
	async renameBranch(name: string): Promise<void> {
		const args = ['branch', '-m', name];
		await this.run(args);
	}

J
Joao Moreno 已提交
1408 1409 1410 1411 1412
	async setBranchUpstream(name: string, upstream: string): Promise<void> {
		const args = ['branch', '--set-upstream-to', upstream, name];
		await this.run(args);
	}

1413 1414 1415 1416 1417
	async deleteRef(ref: string): Promise<void> {
		const args = ['update-ref', '-d', ref];
		await this.run(args);
	}

J
Joao Moreno 已提交
1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429
	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;
		}
1430 1431
	}

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

J
Joao Moreno 已提交
1435 1436
		if (message) {
			args = [...args, '-a', name, '-m', message];
1437
		} else {
J
Joao Moreno 已提交
1438
			args = [...args, name];
1439 1440 1441 1442 1443
		}

		await this.run(args);
	}

X
Xhulio Hasani 已提交
1444 1445 1446 1447 1448
	async deleteTag(name: string): Promise<void> {
		let args = ['tag', '-d', name];
		await this.run(args);
	}

J
Joao Moreno 已提交
1449
	async clean(paths: string[]): Promise<void> {
J
Joao Moreno 已提交
1450
		const pathsByGroup = groupBy(paths.map(sanitizePath), p => path.dirname(p));
J
Joao Moreno 已提交
1451
		const groups = Object.keys(pathsByGroup).map(k => pathsByGroup[k]);
J
Joao Moreno 已提交
1452

J
Joao Moreno 已提交
1453 1454
		const limiter = new Limiter(5);
		const promises: Promise<any>[] = [];
J
João Moreno 已提交
1455
		const args = ['clean', '-f', '-q'];
J
Joao Moreno 已提交
1456 1457 1458

		for (const paths of groups) {
			for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {
J
João Moreno 已提交
1459
				promises.push(limiter.queue(() => this.run([...args, '--', ...chunk])));
J
Joao Moreno 已提交
1460
			}
J
Joao Moreno 已提交
1461
		}
J
Joao Moreno 已提交
1462 1463

		await Promise.all(promises);
J
Joao Moreno 已提交
1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480
	}

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

J
Joao Moreno 已提交
1485
	async revert(treeish: string, paths: string[]): Promise<void> {
J
Joao Moreno 已提交
1486 1487 1488 1489 1490
		const result = await this.run(['branch']);
		let args: string[];

		// In case there are no branches, we must use rm --cached
		if (!result.stdout) {
J
João Moreno 已提交
1491
			args = ['rm', '--cached', '-r'];
J
Joao Moreno 已提交
1492
		} else {
J
João Moreno 已提交
1493
			args = ['reset', '-q', treeish];
J
Joao Moreno 已提交
1494 1495 1496
		}

		try {
1497 1498
			if (paths && paths.length > 0) {
				for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {
J
João Moreno 已提交
1499
					await this.run([...args, '--', ...chunk]);
1500 1501
				}
			} else {
J
João Moreno 已提交
1502
				await this.run([...args, '--', '.']);
1503
			}
J
Joao Moreno 已提交
1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514
		} 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 已提交
1515 1516 1517 1518 1519
	async addRemote(name: string, url: string): Promise<void> {
		const args = ['remote', 'add', name, url];
		await this.run(args);
	}

J
Joao Moreno 已提交
1520
	async removeRemote(name: string): Promise<void> {
J
João Moreno 已提交
1521 1522 1523 1524 1525 1526
		const args = ['remote', 'remove', name];
		await this.run(args);
	}

	async renameRemote(name: string, newName: string): Promise<void> {
		const args = ['remote', 'rename', name, newName];
J
Joao Moreno 已提交
1527 1528 1529
		await this.run(args);
	}

J
Joao Moreno 已提交
1530
	async fetch(options: { remote?: string, ref?: string, all?: boolean, prune?: boolean, depth?: number, silent?: boolean } = {}): Promise<void> {
J
Joao Moreno 已提交
1531
		const args = ['fetch'];
J
Joao Moreno 已提交
1532
		const spawnOptions: SpawnOptions = {};
J
Joao Moreno 已提交
1533

J
Joao Moreno 已提交
1534 1535
		if (options.remote) {
			args.push(options.remote);
J
Joao Moreno 已提交
1536

J
Joao Moreno 已提交
1537 1538
			if (options.ref) {
				args.push(options.ref);
J
Joao Moreno 已提交
1539
			}
J
Joao Moreno 已提交
1540 1541
		} else if (options.all) {
			args.push('--all');
J
Joao Moreno 已提交
1542 1543
		}

R
Ryan Scott 已提交
1544
		if (options.prune) {
R
Ryan Scott 已提交
1545
			args.push('--prune');
R
Ryan Scott 已提交
1546 1547
		}

1548
		if (typeof options.depth === 'number') {
1549 1550
			args.push(`--depth=${options.depth}`);
		}
R
Ryan Scott 已提交
1551

J
Joao Moreno 已提交
1552 1553 1554 1555
		if (options.silent) {
			spawnOptions.env = { 'VSCODE_GIT_FETCH_SILENT': 'true' };
		}

J
Joao Moreno 已提交
1556
		try {
J
Joao Moreno 已提交
1557
			await this.run(args, spawnOptions);
J
Joao Moreno 已提交
1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568
		} 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;
		}
	}

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

J
Joao Moreno 已提交
1572
		if (options.tags) {
H
Hao Hu 已提交
1573 1574
			args.push('--tags');
		}
1575 1576 1577 1578

		if (options.unshallow) {
			args.push('--unshallow');
		}
J
Joao Moreno 已提交
1579 1580 1581 1582 1583

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

M
Matt Shirley 已提交
1584
		if (remote && branch) {
1585
			args.push(remote);
M
Matt Shirley 已提交
1586
			args.push(branch);
1587 1588
		}

J
Joao Moreno 已提交
1589
		try {
1590
			await this.run(args, options);
J
Joao Moreno 已提交
1591 1592 1593 1594 1595 1596 1597
		} 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 已提交
1598 1599
			} 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 已提交
1600
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
J
Joao Moreno 已提交
1601 1602 1603 1604
			} 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 已提交
1605 1606 1607 1608 1609 1610
			}

			throw err;
		}
	}

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

J
Joao Moreno 已提交
1614 1615 1616 1617
		if (forcePushMode === ForcePushMode.ForceWithLease) {
			args.push('--force-with-lease');
		} else if (forcePushMode === ForcePushMode.Force) {
			args.push('--force');
1618 1619
		}

J
Joao Moreno 已提交
1620
		if (setUpstream) {
J
Joao Moreno 已提交
1621 1622 1623
			args.push('-u');
		}

1624
		if (tags) {
1625
			args.push('--follow-tags');
J
Joao Moreno 已提交
1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642
		}

		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;
1643 1644
			} else if (/^fatal: The current branch .* has no upstream branch/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoUpstreamBranch;
J
João Moreno 已提交
1645 1646
			} else if (/Permission.*denied/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.PermissionDenied;
J
Joao Moreno 已提交
1647 1648 1649 1650 1651 1652
			}

			throw err;
		}
	}

R
rebornix 已提交
1653 1654
	async blame(path: string): Promise<string> {
		try {
J
Joao Moreno 已提交
1655 1656
			const args = ['blame', sanitizePath(path)];
			const result = await this.run(args);
R
rebornix 已提交
1657 1658
			return result.stdout.trim();
		} catch (err) {
R
rebornix 已提交
1659 1660 1661 1662
			if (/^fatal: no such path/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoPathFound;
			}

R
rebornix 已提交
1663 1664 1665 1666
			throw err;
		}
	}

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

1671 1672 1673 1674
			if (includeUntracked) {
				args.push('-u');
			}

J
Joao Moreno 已提交
1675
			if (message) {
J
Joao Moreno 已提交
1676
				args.push('-m', message);
1677 1678 1679 1680 1681 1682 1683
			}

			await this.run(args);
		} catch (err) {
			if (/No local changes to save/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoLocalChanges;
			}
J
Joao Moreno 已提交
1684 1685 1686 1687 1688 1689

			throw err;
		}
	}

	async popStash(index?: number): Promise<void> {
1690
		const args = ['stash', 'pop'];
J
Joao Moreno 已提交
1691
		await this.popOrApplyStash(args, index);
1692 1693 1694 1695
	}

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

1699 1700
	private async popOrApplyStash(args: string[], index?: number): Promise<void> {
		try {
1701
			if (typeof index === 'number') {
J
Joao Moreno 已提交
1702
				args.push(`stash@{${index}}`);
1703
			}
J
Joao Moreno 已提交
1704 1705 1706 1707 1708 1709

			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 || '')) {
1710
				err.gitErrorCode = GitErrorCodes.LocalChangesOverwritten;
J
Joao Moreno 已提交
1711 1712
			} else if (/^CONFLICT/m.test(err.stdout || '')) {
				err.gitErrorCode = GitErrorCodes.StashConflict;
1713
			}
J
Joao Moreno 已提交
1714

1715 1716 1717 1718
			throw err;
		}
	}

J
Joao Moreno 已提交
1719
	async dropStash(index?: number): Promise<void> {
1720 1721
		const args = ['stash', 'drop'];

D
Drew Cross 已提交
1722 1723
		if (typeof index === 'number') {
			args.push(`stash@{${index}}`);
J
Joao Moreno 已提交
1724
		}
1725

J
Joao Moreno 已提交
1726 1727
		try {
			await this.run(args);
1728 1729 1730 1731 1732 1733 1734 1735 1736
		} catch (err) {
			if (/No stash found/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoStashFound;
			}

			throw err;
		}
	}

1737 1738
	getStatus(limit = 5000): Promise<{ status: IFileStatus[]; didHitLimit: boolean; }> {
		return new Promise<{ status: IFileStatus[]; didHitLimit: boolean; }>((c, e) => {
1739
			const parser = new GitStatusParser();
J
Joao Moreno 已提交
1740 1741
			const env = { GIT_OPTIONAL_LOCKS: '0' };
			const child = this.stream(['status', '-z', '-u'], { env });
1742

M
Matt Bierner 已提交
1743
			const onExit = (exitCode: number) => {
1744
				if (exitCode !== 0) {
1745 1746 1747 1748 1749 1750 1751 1752
					const stderr = stderrData.join('');
					return e(new GitError({
						message: 'Failed to execute git',
						stderr,
						exitCode,
						gitErrorCode: getGitErrorCode(stderr),
						gitCommand: 'status'
					}));
1753
				}
J
Joao Moreno 已提交
1754

1755 1756 1757
				c({ status: parser.status, didHitLimit: false });
			};

1758
			const onStdoutData = (raw: string) => {
1759 1760
				parser.update(raw);

J
Joao Moreno 已提交
1761
				if (parser.status.length > limit) {
1762
					child.removeListener('exit', onExit);
1763
					child.stdout!.removeListener('data', onStdoutData);
1764 1765
					child.kill();

J
Joao Moreno 已提交
1766
					c({ status: parser.status.slice(0, limit), didHitLimit: true });
1767 1768 1769
				}
			};

1770 1771
			child.stdout!.setEncoding('utf8');
			child.stdout!.on('data', onStdoutData);
1772 1773

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

J
Joao Moreno 已提交
1777
			child.on('error', cpErrorHandler(e));
1778
			child.on('exit', onExit);
1779
		});
J
Joao Moreno 已提交
1780 1781
	}

J
Joao Moreno 已提交
1782
	async getHEAD(): Promise<Ref> {
J
Joao Moreno 已提交
1783
		try {
J
Joao Moreno 已提交
1784
			const result = await this.run(['symbolic-ref', '--short', 'HEAD']);
J
Joao Moreno 已提交
1785 1786 1787 1788 1789

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

R
Rob Lourens 已提交
1790
			return { name: result.stdout.trim(), commit: undefined, type: RefType.Head };
J
Joao Moreno 已提交
1791
		} catch (err) {
J
Joao Moreno 已提交
1792
			const result = await this.run(['rev-parse', 'HEAD']);
J
Joao Moreno 已提交
1793 1794 1795 1796 1797

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

R
Rob Lourens 已提交
1798
			return { name: undefined, commit: result.stdout.trim(), type: RefType.Head };
J
Joao Moreno 已提交
1799 1800 1801
		}
	}

J
Joao Moreno 已提交
1802 1803
	async findTrackingBranches(upstreamBranch: string): Promise<Branch[]> {
		const result = await this.run(['for-each-ref', '--format', '%(refname:short)%00%(upstream:short)', 'refs/heads']);
1804
		return result.stdout.trim().split('\n')
J
Joao Moreno 已提交
1805 1806 1807
			.map(line => line.trim().split('\0'))
			.filter(([_, upstream]) => upstream === upstreamBranch)
			.map(([ref]) => ({ name: ref, type: RefType.Head } as Branch));
1808 1809
	}

1810 1811 1812 1813 1814 1815
	async getRefs(opts?: { sort?: 'alphabetically' | 'committerdate', contains?: string, pattern?: string, count?: number }): Promise<Ref[]> {
		const args = ['for-each-ref'];

		if (opts?.count) {
			args.push(`--count=${opts.count}`);
		}
S
skprabhanjan 已提交
1816

J
Joao Moreno 已提交
1817
		if (opts && opts.sort && opts.sort !== 'alphabetically') {
1818
			args.push('--sort', `-${opts.sort}`);
S
skprabhanjan 已提交
1819 1820
		}

1821 1822 1823 1824 1825 1826
		args.push('--format', '%(refname) %(objectname)');

		if (opts?.pattern) {
			args.push(opts.pattern);
		}

1827 1828 1829 1830
		if (opts?.contains) {
			args.push('--contains', opts.contains);
		}

S
skprabhanjan 已提交
1831
		const result = await this.run(args);
J
Joao Moreno 已提交
1832

M
Matt Bierner 已提交
1833
		const fn = (line: string): Ref | null => {
J
Joao Moreno 已提交
1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849
			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 已提交
1850
			.filter(ref => !!ref) as Ref[];
J
Joao Moreno 已提交
1851 1852
	}

1853 1854
	async getStashes(): Promise<Stash[]> {
		const result = await this.run(['stash', 'list']);
J
Joao Moreno 已提交
1855
		const regex = /^stash@{(\d+)}:(.+)$/;
1856 1857
		const rawStashes = result.stdout.trim().split('\n')
			.filter(b => !!b)
M
Matt Bierner 已提交
1858
			.map(line => regex.exec(line) as RegExpExecArray)
1859
			.filter(g => !!g)
J
Joao Moreno 已提交
1860
			.map(([, index, description]: RegExpExecArray) => ({ index: parseInt(index), description }));
1861

J
Joao Moreno 已提交
1862 1863
		return rawStashes;
	}
1864

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

1870 1871
		for (const line of lines) {
			const parts = line.split(/\s/);
J
Joao Moreno 已提交
1872 1873 1874 1875
			const [name, url, type] = parts;

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

1876
			if (!remote) {
J
Joao Moreno 已提交
1877
				remote = { name, isReadOnly: false };
1878 1879 1880
				remotes.push(remote);
			}

J
Joao Moreno 已提交
1881 1882 1883 1884 1885 1886 1887
			if (/fetch/i.test(type)) {
				remote.fetchUrl = url;
			} else if (/push/i.test(type)) {
				remote.pushUrl = url;
			} else {
				remote.fetchUrl = url;
				remote.pushUrl = url;
1888 1889
			}

C
ChaseKnowlden 已提交
1890
			// https://github.com/microsoft/vscode/issues/45271
J
Joao Moreno 已提交
1891
			remote.isReadOnly = remote.pushUrl === undefined || remote.pushUrl === 'no_push';
1892
		}
J
Joao Moreno 已提交
1893

1894
		return remotes;
J
Joao Moreno 已提交
1895 1896
	}

J
Joao Moreno 已提交
1897
	async getBranch(name: string): Promise<Branch> {
J
Joao Moreno 已提交
1898 1899 1900 1901
		if (name === 'HEAD') {
			return this.getHEAD();
		}

1902 1903 1904 1905 1906 1907 1908 1909
		let result = await this.run(['rev-parse', name]);

		if (!result.stdout && /^@/.test(name)) {
			const symbolicFullNameResult = await this.run(['rev-parse', '--symbolic-full-name', name]);
			name = symbolicFullNameResult.stdout.trim();

			result = await this.run(['rev-parse', name]);
		}
J
Joao Moreno 已提交
1910 1911

		if (!result.stdout) {
J
Joao Moreno 已提交
1912
			return Promise.reject<Branch>(new Error('No such branch'));
J
Joao Moreno 已提交
1913 1914 1915 1916 1917
		}

		const commit = result.stdout.trim();

		try {
J
Joao Moreno 已提交
1918 1919 1920 1921 1922 1923 1924
			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 已提交
1925

J
Joao Moreno 已提交
1926 1927
			const upstream = { remote: match[1], name: match[2] };
			const res3 = await this.run(['rev-list', '--left-right', name + '...' + fullUpstream]);
J
Joao Moreno 已提交
1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947

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

1948
	async getBranches(query: BranchQuery): Promise<Ref[]> {
1949
		const refs = await this.getRefs({ contains: query.contains, pattern: query.pattern ? `refs/${query.pattern}` : undefined, count: query.count });
1950 1951 1952
		return refs.filter(value => (value.type !== RefType.Tag) && (query.remote || !value.remote));
	}

1953 1954 1955
	// TODO: Support core.commentChar
	stripCommitMessageComments(message: string): string {
		return message.replace(/^\s*#.*$\n?/gm, '').trim();
1956 1957
	}

1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968
	async getSquashMessage(): Promise<string | undefined> {
		const squashMsgPath = path.join(this.repositoryRoot, '.git', 'SQUASH_MSG');

		try {
			const raw = await fs.readFile(squashMsgPath, 'utf8');
			return this.stripCommitMessageComments(raw);
		} catch {
			return undefined;
		}
	}

1969 1970
	async getMergeMessage(): Promise<string | undefined> {
		const mergeMsgPath = path.join(this.repositoryRoot, '.git', 'MERGE_MSG');
1971

1972
		try {
J
Joao Moreno 已提交
1973
			const raw = await fs.readFile(mergeMsgPath, 'utf8');
1974
			return this.stripCommitMessageComments(raw);
J
Joao Moreno 已提交
1975
		} catch {
1976 1977 1978 1979
			return undefined;
		}
	}

J
Joao Moreno 已提交
1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993
	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 已提交
1994
				templatePath = path.join(this.repositoryRoot, templatePath);
J
Joao Moreno 已提交
1995 1996
			}

J
Joao Moreno 已提交
1997
			const raw = await fs.readFile(templatePath, 'utf8');
1998
			return this.stripCommitMessageComments(raw);
J
Joao Moreno 已提交
1999 2000 2001 2002 2003
		} catch (err) {
			return '';
		}
	}

J
Joao Moreno 已提交
2004
	async getCommit(ref: string): Promise<Commit> {
2005 2006 2007 2008 2009 2010
		const result = await this.run(['show', '-s', `--format=${COMMIT_FORMAT}`, '-z', ref]);
		const commits = parseGitCommits(result.stdout);
		if (commits.length === 0) {
			return Promise.reject<Commit>('bad commit format');
		}
		return commits[0];
J
Joao Moreno 已提交
2011
	}
2012 2013

	async updateSubmodules(paths: string[]): Promise<void> {
J
João Moreno 已提交
2014
		const args = ['submodule', 'update'];
J
Joao Moreno 已提交
2015

J
Joao Moreno 已提交
2016
		for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
J
João Moreno 已提交
2017
			await this.run([...args, '--', ...chunk]);
J
Joao Moreno 已提交
2018
		}
2019 2020 2021 2022 2023 2024
	}

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

		try {
J
Joao Moreno 已提交
2025
			const gitmodulesRaw = await fs.readFile(gitmodulesPath, 'utf8');
2026 2027 2028 2029 2030 2031 2032 2033 2034
			return parseGitmodules(gitmodulesRaw);
		} catch (err) {
			if (/ENOENT/.test(err.message)) {
				return [];
			}

			throw err;
		}
	}
2035
}