git.ts 54.8 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 { detectEncoding } from './encoding';
17
import { Ref, RefType, Branch, Remote, GitErrorCodes, LogOptions, Change, Status, CommitOptions, BranchQuery } from './api/git';
J
Joao Moreno 已提交
18 19
import * as byline from 'byline';
import { StringDecoder } from 'string_decoder';
J
Joao Moreno 已提交
20

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

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

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

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

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

48
// TODO@eamodio: Move to git.d.ts once we are good with the api
E
Eric Amodio 已提交
49 50 51 52
/**
 * Log file options.
 */
export interface LogFileOptions {
53 54 55 56 57 58 59
	/** 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 已提交
60 61
}

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

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

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

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

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

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

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

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

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

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

W
WhizSid 已提交
141 142
export async function findGit(hint: string | string[] | undefined, onLookup: (path: string) => void): Promise<IGit> {
	const hints = Array.isArray(hint) ? hint : hint ? [hint] : [];
J
Joao Moreno 已提交
143

W
WhizSid 已提交
144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162
	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 已提交
163 164
}

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

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

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

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

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

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

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

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

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

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

export interface IGitErrorData {
	error?: Error;
	message?: string;
	stdout?: string;
	stderr?: string;
	exitCode?: number;
	gitErrorCode?: string;
	gitCommand?: string;
263
	gitArgs?: string[];
J
Joao Moreno 已提交
264 265 266 267
}

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;
275
	gitArgs?: string[];
J
Joao Moreno 已提交
276 277 278 279 280 281

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

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

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

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

		return result;
	}
}

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

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

R
Rob Lourens 已提交
345
	return undefined;
346 347
}

J
Joao Moreno 已提交
348 349 350 351 352 353
// 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()}:\\`);
}

354
const COMMIT_FORMAT = '%H%n%aN%n%aE%n%at%n%ct%n%P%n%B';
355

J
João Moreno 已提交
356 357 358 359 360
export interface ICloneOptions {
	readonly parentPath: string;
	readonly progress: Progress<{ increment: number }>;
	readonly recursive?: boolean;
}
361

J
Joao Moreno 已提交
362 363
export class Git {

J
Joao Moreno 已提交
364
	readonly path: string;
365
	private env: any;
J
Joao Moreno 已提交
366

367 368
	private _onOutput = new EventEmitter();
	get onOutput(): EventEmitter { return this._onOutput; }
J
Joao Moreno 已提交
369

J
Joao Moreno 已提交
370
	constructor(options: IGitOptions) {
J
Joao Moreno 已提交
371
		this.path = options.gitPath;
372
		this.env = options.env || {};
J
Joao Moreno 已提交
373 374
	}

J
Joao Moreno 已提交
375 376
	open(repository: string, dotGit: string): Repository {
		return new Repository(this, repository, dotGit);
J
Joao Moreno 已提交
377 378
	}

J
Joao Moreno 已提交
379 380 381 382 383
	async init(repository: string): Promise<void> {
		await this.exec(repository, ['init']);
		return;
	}

J
João Moreno 已提交
384
	async clone(url: string, options: ICloneOptions, cancellationToken?: CancellationToken): Promise<string> {
385
		let baseFolderName = decodeURI(url).replace(/[\/]+$/, '').replace(/^.*[\/\\]/, '').replace(/\.git$/, '') || 'repository';
386
		let folderName = baseFolderName;
J
João Moreno 已提交
387
		let folderPath = path.join(options.parentPath, folderName);
388 389
		let count = 1;

J
Joao Moreno 已提交
390
		while (count < 20 && await new Promise(c => exists(folderPath, c))) {
391
			folderName = `${baseFolderName}-${count++}`;
J
João Moreno 已提交
392
			folderPath = path.join(options.parentPath, folderName);
393
		}
J
Joao Moreno 已提交
394

J
João Moreno 已提交
395
		await mkdirp(options.parentPath);
J
Joao Moreno 已提交
396

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

			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) {
J
João Moreno 已提交
419
					options.progress.report({ increment: totalProgress - previousProgress });
J
Joao Moreno 已提交
420 421 422 423 424
					previousProgress = totalProgress;
				}
			});
		};

J
Joao Moreno 已提交
425
		try {
J
Jordan Bayles 已提交
426
			let command = ['clone', url.includes(' ') ? encodeURI(url) : url, folderPath, '--progress'];
J
João Moreno 已提交
427
			if (options.recursive) {
J
Jordan Bayles 已提交
428 429
				command.push('--recursive');
			}
J
João Moreno 已提交
430
			await this.exec(options.parentPath, command, { cancellationToken, onSpawn });
J
Joao Moreno 已提交
431 432 433 434 435 436 437 438 439
		} 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 已提交
440 441 442
		return folderPath;
	}

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

J
jeanp413 已提交
446
		// Keep trailing spaces which are part of the directory name
J
João Moreno 已提交
447
		const repoPath = path.normalize(result.stdout.trimLeft().replace(/[\r\n]+$/, ''));
448 449 450 451 452 453 454 455 456 457 458 459

		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 {
460
						const networkPath = await new Promise<string | undefined>(resolve =>
461
							realpath.native(`${letter}:`, { encoding: 'utf8' }, (err, resolvedPath) =>
E
Eric Amodio 已提交
462
								resolve(err !== null ? undefined : resolvedPath),
463 464 465
							),
						);
						if (networkPath !== undefined) {
466
							return path.normalize(
467 468 469 470
								repoUri.fsPath.replace(
									networkPath,
									`${letter.toLowerCase()}:${networkPath.endsWith('\\') ? '\\' : ''}`
								),
471 472 473 474 475 476 477 478 479 480
							);
						}
					} catch { }
				}

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

		return repoPath;
J
Joao Moreno 已提交
481 482
	}

J
Joao Moreno 已提交
483
	async getRepositoryDotGit(repositoryPath: string): Promise<string> {
484 485 486 487 488 489 490 491
		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 已提交
492 493
	}

J
Joao Moreno 已提交
494
	async exec(cwd: string, args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
J
Joao Moreno 已提交
495
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
496
		return await this._exec(args, options);
J
Joao Moreno 已提交
497 498
	}

J
Joao Moreno 已提交
499 500 501 502
	async exec2(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
		return await this._exec(args, options);
	}

J
Joao Moreno 已提交
503
	stream(cwd: string, args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
504
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
505
		return this.spawn(args, options);
J
Joao Moreno 已提交
506 507
	}

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

J
Joao Moreno 已提交
511 512 513 514
		if (options.onSpawn) {
			options.onSpawn(child);
		}

J
Joao Moreno 已提交
515
		if (options.input) {
516
			child.stdin!.end(options.input, 'utf8');
J
Joao Moreno 已提交
517 518
		}

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

J
Joao Moreno 已提交
521 522
		if (options.log !== false && bufferResult.stderr.length > 0) {
			this.log(`${bufferResult.stderr}\n`);
J
Joao Moreno 已提交
523 524
		}

J
Joao Moreno 已提交
525 526 527 528 529 530 531 532 533 534 535
		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 已提交
536 537 538 539
				message: 'Failed to execute git',
				stdout: result.stdout,
				stderr: result.stderr,
				exitCode: result.exitCode,
540
				gitErrorCode: getGitErrorCode(result.stderr),
541 542
				gitCommand: args[0],
				gitArgs: args
J
Joao Moreno 已提交
543 544 545 546
			}));
		}

		return result;
J
Joao Moreno 已提交
547 548
	}

J
Joao Moreno 已提交
549
	spawn(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
550
		if (!this.path) {
J
Joao Moreno 已提交
551 552 553 554 555 556 557 558 559 560 561
			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
		}

562
		options.env = assign({}, process.env, this.env, options.env || {}, {
J
Joao Moreno 已提交
563
			VSCODE_GIT_COMMAND: args[0],
564
			LC_ALL: 'en_US.UTF-8',
565
			LANG: 'en_US.UTF-8',
566
			GIT_PAGER: 'cat'
J
Joao Moreno 已提交
567
		});
J
Joao Moreno 已提交
568

J
Joao Moreno 已提交
569 570 571 572
		if (options.cwd) {
			options.cwd = sanitizePath(options.cwd);
		}

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

J
Joao Moreno 已提交
577
		return cp.spawn(this.path, args, options);
J
Joao Moreno 已提交
578 579 580
	}

	private log(output: string): void {
581
		this._onOutput.emit('log', output);
J
Joao Moreno 已提交
582
	}
J
Joao Moreno 已提交
583 584
}

J
Joao Moreno 已提交
585
export interface Commit {
J
Joao Moreno 已提交
586 587
	hash: string;
	message: string;
J
Joao Moreno 已提交
588
	parents: string[];
589 590 591
	authorDate?: Date;
	authorName?: string;
	authorEmail?: string;
592
	commitDate?: Date;
J
Joao Moreno 已提交
593 594
}

595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632
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 已提交
633
		if (entry.x === 'R' || entry.x === 'C') {
634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660
			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;
	}
}

661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694
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
João Moreno 已提交
695
		const propertyMatch = /^\s*(\w+)\s*=\s*(.*)$/.exec(line);
696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722

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

723
const commitRegex = /([0-9a-f]{40})\n(.*)\n(.*)\n(.*)\n(.*)\n(.*)(?:\n([^]*?))?(?:\x00)/gm;
724 725 726 727 728

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

	let ref;
729 730 731 732
	let authorName;
	let authorEmail;
	let authorDate;
	let commitDate;
733 734 735 736 737 738 739 740 741 742
	let parents;
	let message;
	let match;

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

743
		[, ref, authorName, authorEmail, authorDate, commitDate, parents, message] = match;
744

745 746 747 748 749 750 751 752 753
		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(' ') : [],
754 755 756 757
			authorDate: new Date(Number(authorDate) * 1000),
			authorName: ` ${authorName}`.substr(1),
			authorEmail: ` ${authorEmail}`.substr(1),
			commitDate: new Date(Number(commitDate) * 1000),
758 759 760 761
		});
	} while (true);

	return commits;
762 763
}

764 765 766 767
interface LsTreeElement {
	mode: string;
	type: string;
	object: string;
J
Joao Moreno 已提交
768
	size: string;
769 770 771 772 773 774
	file: string;
}

export function parseLsTree(raw: string): LsTreeElement[] {
	return raw.split('\n')
		.filter(l => !!l)
J
Joao Moreno 已提交
775
		.map(line => /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/.exec(line)!)
776
		.filter(m => !!m)
J
Joao Moreno 已提交
777
		.map(([, mode, type, object, size, file]) => ({ mode, type, object, size, file }));
778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794
}

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

795 796
export interface PullOptions {
	unshallow?: boolean;
J
Joao Moreno 已提交
797
	tags?: boolean;
798
	readonly cancellationToken?: CancellationToken;
799 800
}

J
Joao Moreno 已提交
801 802
export enum ForcePushMode {
	Force,
J
Joao Moreno 已提交
803
	ForceWithLease
J
Joao Moreno 已提交
804 805
}

J
Joao Moreno 已提交
806 807 808 809
export class Repository {

	constructor(
		private _git: Git,
J
Joao Moreno 已提交
810 811
		private repositoryRoot: string,
		readonly dotGit: string
J
Joao Moreno 已提交
812 813 814 815 816 817
	) { }

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

J
Joao Moreno 已提交
818 819
	get root(): string {
		return this.repositoryRoot;
J
Joao Moreno 已提交
820 821 822
	}

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

J
Joao Moreno 已提交
827
	stream(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
828
		return this.git.stream(this.repositoryRoot, args, options);
J
Joao Moreno 已提交
829 830
	}

J
Joao Moreno 已提交
831
	spawn(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
832 833 834
		return this.git.spawn(args, options);
	}

J
Joao Moreno 已提交
835
	async config(scope: string, key: string, value: any = null, options: SpawnOptions = {}): Promise<string> {
J
Joao Moreno 已提交
836 837 838 839 840 841 842 843 844 845 846 847 848
		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 已提交
849
		return result.stdout.trim();
J
Joao Moreno 已提交
850 851
	}

J
Joao Moreno 已提交
852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869
	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) };
		});
	}

870
	async log(options?: LogOptions): Promise<Commit[]> {
E
Eric Amodio 已提交
871 872
		const maxEntries = options?.maxEntries ?? 32;
		const args = ['log', `-n${maxEntries}`, `--format=${COMMIT_FORMAT}`, '-z', '--'];
A
Alex Ross 已提交
873 874 875
		if (options?.path) {
			args.push(options.path);
		}
876

877 878
		const result = await this.run(args);
		if (result.exitCode) {
879
			// An empty repo
880 881 882
			return [];
		}

883 884
		return parseGitCommits(result.stdout);
	}
885

886
	async logFile(uri: Uri, options?: LogFileOptions): Promise<Commit[]> {
887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906
		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);
907

908 909 910 911
		const result = await this.run(args);
		if (result.exitCode) {
			// No file history, e.g. a new file or untracked
			return [];
912 913
		}

914
		return parseGitCommits(result.stdout);
915 916
	}

917
	async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false): Promise<string> {
J
Joao Moreno 已提交
918
		const stdout = await this.buffer(object);
919 920 921 922 923

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

J
Joao Moreno 已提交
924 925 926
		encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';

		return iconv.decode(stdout, encoding);
J
Joao Moreno 已提交
927 928 929
	}

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

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

936
		const { exitCode, stdout, stderr } = await exec(child);
J
Joao Moreno 已提交
937 938

		if (exitCode) {
939
			const err = new GitError({
J
Joao Moreno 已提交
940 941
				message: 'Could not show object.',
				exitCode
942 943 944 945 946 947 948
			});

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

			return Promise.reject<Buffer>(err);
J
Joao Moreno 已提交
949 950 951
		}

		return stdout;
J
Joao Moreno 已提交
952 953
	}

J
Joao Moreno 已提交
954
	async getObjectDetails(treeish: string, path: string): Promise<{ mode: string, object: string, size: number }> {
J
Joao Moreno 已提交
955
		if (!treeish) { // index
J
Joao Moreno 已提交
956
			const elements = await this.lsfiles(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 } = elements[0];
J
Joao Moreno 已提交
963 964 965
			const catFile = await this.run(['cat-file', '-s', object]);
			const size = parseInt(catFile.stdout);

J
Joao Moreno 已提交
966
			return { mode, object, size };
J
Joao Moreno 已提交
967 968
		}

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

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

J
Joao Moreno 已提交
975
		const { mode, object, size } = elements[0];
J
Joao Moreno 已提交
976
		return { mode, object, size: parseInt(size) };
J
Joao Moreno 已提交
977 978
	}

J
Joao Moreno 已提交
979
	async lstree(treeish: string, path: string): Promise<LsTreeElement[]> {
J
Joao Moreno 已提交
980
		const { stdout } = await this.run(['ls-tree', '-l', treeish, '--', sanitizePath(path)]);
981 982
		return parseLsTree(stdout);
	}
983

984
	async lsfiles(path: string): Promise<LsFilesElement[]> {
J
Joao Moreno 已提交
985
		const { stdout } = await this.run(['ls-files', '--stage', '--', sanitizePath(path)]);
986
		return parseLsFiles(stdout);
987 988
	}

J
Joao Moreno 已提交
989
	async getGitRelativePath(ref: string, relativePath: string): Promise<string> {
990 991
		const relativePathLowercase = relativePath.toLowerCase();
		const dirname = path.posix.dirname(relativePath) + '/';
J
Joao Moreno 已提交
992
		const elements: { file: string; }[] = ref ? await this.lstree(ref, dirname) : await this.lsfiles(dirname);
993 994 995 996
		const element = elements.filter(file => file.file.toLowerCase() === relativePathLowercase)[0];

		if (!element) {
			throw new GitError({ message: 'Git relative path not found.' });
997
		}
998 999

		return element.file;
1000 1001
	}

J
Joao Moreno 已提交
1002
	async detectObjectType(object: string): Promise<{ mimetype: string, encoding?: string }> {
J
João Moreno 已提交
1003
		const child = await this.stream(['show', '--textconv', object]);
1004
		const buffer = await readBytes(child.stdout!, 4100);
J
Joao Moreno 已提交
1005 1006 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 1034 1035 1036 1037 1038 1039 1040 1041

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

1042 1043 1044 1045 1046 1047 1048
	async apply(patch: string, reverse?: boolean): Promise<void> {
		const args = ['apply', patch];

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

1049 1050 1051 1052 1053 1054 1055 1056 1057
		try {
			await this.run(args);
		} catch (err) {
			if (/patch does not apply/.test(err.stderr)) {
				err.gitErrorCode = GitErrorCodes.PatchDoesNotApply;
			}

			throw err;
		}
1058 1059 1060
	}

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

J
Joao Moreno 已提交
1063
		if (cached) {
1064 1065 1066 1067 1068 1069 1070
			args.push('--cached');
		}

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

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

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

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

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

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

J
Joao Moreno 已提交
1105
		const args = ['diff', '--cached', '--', sanitizePath(path)];
J
Joao Moreno 已提交
1106 1107 1108 1109
		const result = await this.run(args);
		return result.stdout;
	}

1110 1111 1112
	diffIndexWith(ref: string): Promise<Change[]>;
	diffIndexWith(ref: string, path: string): Promise<string>;
	diffIndexWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
1113 1114 1115 1116 1117
	async diffIndexWith(ref: string, path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(true, ref);
		}

J
Joao Moreno 已提交
1118
		const args = ['diff', '--cached', ref, '--', sanitizePath(path)];
J
Joao Moreno 已提交
1119 1120 1121 1122 1123 1124 1125 1126 1127 1128
		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;
	}

1129 1130 1131
	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[]>;
1132 1133 1134 1135 1136 1137
	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 已提交
1138
		const args = ['diff', range, '--', sanitizePath(path)];
J
Joao Moreno 已提交
1139 1140 1141 1142 1143
		const result = await this.run(args);

		return result.stdout.trim();
	}

1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170
	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;
			}

E
Eric Amodio 已提交
1171
			const originalUri = Uri.file(path.isAbsolute(resourcePath) ? resourcePath : path.join(this.repositoryRoot, resourcePath));
1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198
			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;
					}

E
Eric Amodio 已提交
1199
					const uri = Uri.file(path.isAbsolute(newPath) ? newPath : path.join(this.repositoryRoot, newPath));
1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224
					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 已提交
1225 1226 1227 1228 1229 1230 1231
	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 已提交
1232 1233 1234 1235 1236 1237 1238
	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 已提交
1239 1240 1241 1242 1243 1244 1245 1246 1247
	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 已提交
1248
		if (paths && paths.length) {
1249
			for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
J
João Moreno 已提交
1250
				await this.run([...args, '--', ...chunk]);
1251
			}
J
Joao Moreno 已提交
1252
		} else {
J
João Moreno 已提交
1253
			await this.run([...args, '--', '.']);
J
Joao Moreno 已提交
1254 1255 1256
		}
	}

J
Joao Moreno 已提交
1257 1258 1259 1260 1261 1262 1263
	async rm(paths: string[]): Promise<void> {
		const args = ['rm', '--'];

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

J
Joao Moreno 已提交
1264
		args.push(...paths.map(sanitizePath));
J
Joao Moreno 已提交
1265 1266 1267 1268

		await this.run(args);
	}

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

		const { exitCode, stdout } = await exec(child);
J
Joao Moreno 已提交
1274
		const hash = stdout.toString('utf8');
J
Joao Moreno 已提交
1275 1276 1277 1278 1279 1280 1281 1282

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

J
Joao Moreno 已提交
1283
		const treeish = await this.getCommit('HEAD').then(() => 'HEAD', () => '');
J
Joao Moreno 已提交
1284
		let mode: string;
D
Darrien Singleton 已提交
1285
		let add: string = '';
J
Joao Moreno 已提交
1286 1287

		try {
1288
			const details = await this.getObjectDetails(treeish, path);
J
Joao Moreno 已提交
1289 1290
			mode = details.mode;
		} catch (err) {
J
Joao Moreno 已提交
1291 1292 1293 1294
			if (err.gitErrorCode !== GitErrorCodes.UnknownPath) {
				throw err;
			}

J
Joao Moreno 已提交
1295
			mode = '100644';
D
Darrien Singleton 已提交
1296
			add = '--add';
J
Joao Moreno 已提交
1297 1298
		}

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

J
João Moreno 已提交
1302
	async checkout(treeish: string, paths: string[], opts: { track?: boolean, detached?: boolean } = Object.create(null)): Promise<void> {
J
Joao Moreno 已提交
1303 1304
		const args = ['checkout', '-q'];

1305 1306 1307 1308
		if (opts.track) {
			args.push('--track');
		}

J
João Moreno 已提交
1309 1310 1311 1312
		if (opts.detached) {
			args.push('--detach');
		}

J
Joao Moreno 已提交
1313 1314 1315 1316 1317
		if (treeish) {
			args.push(treeish);
		}

		try {
J
Joao Moreno 已提交
1318
			if (paths && paths.length > 0) {
J
Joao Moreno 已提交
1319
				for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
J
Joao Moreno 已提交
1320 1321 1322 1323 1324
					await this.run([...args, '--', ...chunk]);
				}
			} else {
				await this.run(args);
			}
J
Joao Moreno 已提交
1325
		} catch (err) {
J
Joao Moreno 已提交
1326
			if (/Please,? commit your changes or stash them/.test(err.stderr || '')) {
J
Joao Moreno 已提交
1327
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
K
kingwl 已提交
1328
				err.gitTreeish = treeish;
J
Joao Moreno 已提交
1329 1330 1331 1332 1333 1334
			}

			throw err;
		}
	}

J
João Moreno 已提交
1335 1336
	async commit(message: string | undefined, opts: CommitOptions = Object.create(null)): Promise<void> {
		const args = ['commit', '--quiet', '--allow-empty-message'];
J
Joao Moreno 已提交
1337

J
Joao Moreno 已提交
1338
		if (opts.all) {
J
Joao Moreno 已提交
1339 1340 1341
			args.push('--all');
		}

J
João Moreno 已提交
1342
		if (opts.amend && message) {
J
Joao Moreno 已提交
1343 1344 1345
			args.push('--amend');
		}

J
João Moreno 已提交
1346 1347 1348 1349 1350 1351
		if (opts.amend && !message) {
			args.push('--amend', '--no-edit');
		} else {
			args.push('--file', '-');
		}

J
Joao Moreno 已提交
1352
		if (opts.signoff) {
J
Joao Moreno 已提交
1353 1354 1355
			args.push('--signoff');
		}

1356 1357 1358
		if (opts.signCommit) {
			args.push('-S');
		}
1359

T
Tom Basche 已提交
1360 1361 1362
		if (opts.empty) {
			args.push('--allow-empty');
		}
1363

1364 1365 1366 1367
		if (opts.noVerify) {
			args.push('--no-verify');
		}

J
Joao Moreno 已提交
1368
		try {
J
João Moreno 已提交
1369
			await this.run(args, !opts.amend || message ? { input: message || '' } : {});
J
Joao Moreno 已提交
1370
		} catch (commitErr) {
1371 1372 1373
			await this.handleCommitError(commitErr);
		}
	}
J
Joao Moreno 已提交
1374

1375 1376 1377 1378
	async rebaseAbort(): Promise<void> {
		await this.run(['rebase', '--abort']);
	}

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

1382 1383 1384 1385 1386 1387
		try {
			await this.run(args);
		} catch (commitErr) {
			await this.handleCommitError(commitErr);
		}
	}
J
Joao Moreno 已提交
1388

1389 1390 1391
	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 已提交
1392 1393
			throw commitErr;
		}
1394 1395

		try {
J
Joao Moreno 已提交
1396 1397 1398 1399 1400
			await this.run(['config', '--get-all', 'user.name']);
		} catch (err) {
			err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
			throw err;
		}
1401 1402

		try {
J
Joao Moreno 已提交
1403 1404 1405 1406
			await this.run(['config', '--get-all', 'user.email']);
		} catch (err) {
			err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
			throw err;
1407 1408 1409
		}

		throw commitErr;
J
Joao Moreno 已提交
1410 1411
	}

J
Joao Moreno 已提交
1412
	async branch(name: string, checkout: boolean, ref?: string): Promise<void> {
J
Joao Moreno 已提交
1413
		const args = checkout ? ['checkout', '-q', '-b', name, '--no-track'] : ['branch', '-q', name];
J
Joao Moreno 已提交
1414 1415 1416 1417 1418

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

J
Joao Moreno 已提交
1419 1420 1421
		await this.run(args);
	}

1422 1423
	async deleteBranch(name: string, force?: boolean): Promise<void> {
		const args = ['branch', force ? '-D' : '-d', name];
M
Maik Riechert 已提交
1424 1425 1426
		await this.run(args);
	}

1427 1428 1429 1430 1431
	async renameBranch(name: string): Promise<void> {
		const args = ['branch', '-m', name];
		await this.run(args);
	}

K
kingwl 已提交
1432 1433 1434 1435 1436
	async move(from: string, to: string): Promise<void> {
		const args = ['mv', from, to];
		await this.run(args);
	}

J
Joao Moreno 已提交
1437 1438 1439 1440 1441
	async setBranchUpstream(name: string, upstream: string): Promise<void> {
		const args = ['branch', '--set-upstream-to', upstream, name];
		await this.run(args);
	}

1442 1443 1444 1445 1446
	async deleteRef(ref: string): Promise<void> {
		const args = ['update-ref', '-d', ref];
		await this.run(args);
	}

J
Joao Moreno 已提交
1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458
	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;
		}
1459 1460
	}

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

J
Joao Moreno 已提交
1464 1465
		if (message) {
			args = [...args, '-a', name, '-m', message];
1466
		} else {
J
Joao Moreno 已提交
1467
			args = [...args, name];
1468 1469 1470 1471 1472
		}

		await this.run(args);
	}

X
Xhulio Hasani 已提交
1473 1474 1475 1476 1477
	async deleteTag(name: string): Promise<void> {
		let args = ['tag', '-d', name];
		await this.run(args);
	}

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

J
Joao Moreno 已提交
1482 1483
		const limiter = new Limiter(5);
		const promises: Promise<any>[] = [];
J
João Moreno 已提交
1484
		const args = ['clean', '-f', '-q'];
J
Joao Moreno 已提交
1485 1486

		for (const paths of groups) {
1487
			for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
J
João Moreno 已提交
1488
				promises.push(limiter.queue(() => this.run([...args, '--', ...chunk])));
J
Joao Moreno 已提交
1489
			}
J
Joao Moreno 已提交
1490
		}
J
Joao Moreno 已提交
1491 1492

		await Promise.all(promises);
J
Joao Moreno 已提交
1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509
	}

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

J
Joao Moreno 已提交
1514
	async revert(treeish: string, paths: string[]): Promise<void> {
J
Joao Moreno 已提交
1515 1516 1517 1518 1519
		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 已提交
1520
			args = ['rm', '--cached', '-r'];
J
Joao Moreno 已提交
1521
		} else {
J
João Moreno 已提交
1522
			args = ['reset', '-q', treeish];
J
Joao Moreno 已提交
1523 1524 1525
		}

		try {
1526
			if (paths && paths.length > 0) {
1527
				for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
J
João Moreno 已提交
1528
					await this.run([...args, '--', ...chunk]);
1529 1530
				}
			} else {
J
João Moreno 已提交
1531
				await this.run([...args, '--', '.']);
1532
			}
J
Joao Moreno 已提交
1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543
		} 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 已提交
1544 1545 1546 1547 1548
	async addRemote(name: string, url: string): Promise<void> {
		const args = ['remote', 'add', name, url];
		await this.run(args);
	}

J
Joao Moreno 已提交
1549
	async removeRemote(name: string): Promise<void> {
J
João Moreno 已提交
1550 1551 1552 1553 1554 1555
		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 已提交
1556 1557 1558
		await this.run(args);
	}

A
Asif Hasan 已提交
1559
	async fetch(options: { remote?: string, ref?: string, all?: boolean, prune?: boolean, depth?: number, silent?: boolean, readonly cancellationToken?: CancellationToken } = {}): Promise<void> {
J
Joao Moreno 已提交
1560
		const args = ['fetch'];
A
Asif Hasan 已提交
1561 1562 1563
		const spawnOptions: SpawnOptions = {
			cancellationToken: options.cancellationToken,
		};
J
Joao Moreno 已提交
1564

J
Joao Moreno 已提交
1565 1566
		if (options.remote) {
			args.push(options.remote);
J
Joao Moreno 已提交
1567

J
Joao Moreno 已提交
1568 1569
			if (options.ref) {
				args.push(options.ref);
J
Joao Moreno 已提交
1570
			}
J
Joao Moreno 已提交
1571 1572
		} else if (options.all) {
			args.push('--all');
J
Joao Moreno 已提交
1573 1574
		}

R
Ryan Scott 已提交
1575
		if (options.prune) {
R
Ryan Scott 已提交
1576
			args.push('--prune');
R
Ryan Scott 已提交
1577 1578
		}

1579
		if (typeof options.depth === 'number') {
1580 1581
			args.push(`--depth=${options.depth}`);
		}
R
Ryan Scott 已提交
1582

J
Joao Moreno 已提交
1583 1584 1585 1586
		if (options.silent) {
			spawnOptions.env = { 'VSCODE_GIT_FETCH_SILENT': 'true' };
		}

J
Joao Moreno 已提交
1587
		try {
J
Joao Moreno 已提交
1588
			await this.run(args, spawnOptions);
J
Joao Moreno 已提交
1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599
		} 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;
		}
	}

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

J
Joao Moreno 已提交
1603
		if (options.tags) {
H
Hao Hu 已提交
1604 1605
			args.push('--tags');
		}
1606 1607 1608 1609

		if (options.unshallow) {
			args.push('--unshallow');
		}
J
Joao Moreno 已提交
1610 1611 1612 1613 1614

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

M
Matt Shirley 已提交
1615
		if (remote && branch) {
1616
			args.push(remote);
M
Matt Shirley 已提交
1617
			args.push(branch);
1618 1619
		}

J
Joao Moreno 已提交
1620
		try {
1621
			await this.run(args, options);
J
Joao Moreno 已提交
1622 1623 1624 1625 1626 1627 1628
		} 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 已提交
1629 1630
			} 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 已提交
1631
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
J
Joao Moreno 已提交
1632 1633 1634 1635
			} 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 已提交
1636 1637 1638 1639 1640 1641
			}

			throw err;
		}
	}

T
tomerstav 已提交
1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659
	async rebase(branch: string, options: PullOptions = {}): Promise<void> {
		const args = ['rebase'];

		args.push(branch);

		try {
			await this.run(args, options);
		} catch (err) {
			if (/^CONFLICT \([^)]+\): \b/m.test(err.stdout || '')) {
				err.gitErrorCode = GitErrorCodes.Conflict;
			} else if (/cannot rebase onto multiple branches/i.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.CantRebaseMultipleBranches;
			}

			throw err;
		}
	}

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

J
Joao Moreno 已提交
1663 1664 1665 1666
		if (forcePushMode === ForcePushMode.ForceWithLease) {
			args.push('--force-with-lease');
		} else if (forcePushMode === ForcePushMode.Force) {
			args.push('--force');
1667 1668
		}

J
Joao Moreno 已提交
1669
		if (setUpstream) {
J
Joao Moreno 已提交
1670 1671 1672
			args.push('-u');
		}

1673
		if (followTags) {
1674
			args.push('--follow-tags');
J
Joao Moreno 已提交
1675 1676
		}

1677 1678 1679 1680
		if (tags) {
			args.push('--tags');
		}

J
Joao Moreno 已提交
1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695
		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;
1696 1697
			} else if (/^fatal: The current branch .* has no upstream branch/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoUpstreamBranch;
J
João Moreno 已提交
1698 1699
			} else if (/Permission.*denied/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.PermissionDenied;
J
Joao Moreno 已提交
1700 1701 1702 1703 1704 1705
			}

			throw err;
		}
	}

1706 1707 1708 1709 1710
	async cherryPick(commitHash: string): Promise<void> {
		const args = ['cherry-pick', commitHash];
		await this.run(args);
	}

R
rebornix 已提交
1711 1712
	async blame(path: string): Promise<string> {
		try {
J
Joao Moreno 已提交
1713 1714
			const args = ['blame', sanitizePath(path)];
			const result = await this.run(args);
R
rebornix 已提交
1715 1716
			return result.stdout.trim();
		} catch (err) {
R
rebornix 已提交
1717 1718 1719 1720
			if (/^fatal: no such path/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoPathFound;
			}

R
rebornix 已提交
1721 1722 1723 1724
			throw err;
		}
	}

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

1729 1730 1731 1732
			if (includeUntracked) {
				args.push('-u');
			}

J
Joao Moreno 已提交
1733
			if (message) {
J
Joao Moreno 已提交
1734
				args.push('-m', message);
1735 1736 1737 1738 1739 1740 1741
			}

			await this.run(args);
		} catch (err) {
			if (/No local changes to save/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoLocalChanges;
			}
J
Joao Moreno 已提交
1742 1743 1744 1745 1746 1747

			throw err;
		}
	}

	async popStash(index?: number): Promise<void> {
1748
		const args = ['stash', 'pop'];
J
Joao Moreno 已提交
1749
		await this.popOrApplyStash(args, index);
1750 1751 1752 1753
	}

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

1757 1758
	private async popOrApplyStash(args: string[], index?: number): Promise<void> {
		try {
1759
			if (typeof index === 'number') {
J
Joao Moreno 已提交
1760
				args.push(`stash@{${index}}`);
1761
			}
J
Joao Moreno 已提交
1762 1763 1764 1765 1766 1767

			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 || '')) {
1768
				err.gitErrorCode = GitErrorCodes.LocalChangesOverwritten;
J
Joao Moreno 已提交
1769 1770
			} else if (/^CONFLICT/m.test(err.stdout || '')) {
				err.gitErrorCode = GitErrorCodes.StashConflict;
1771
			}
J
Joao Moreno 已提交
1772

1773 1774 1775 1776
			throw err;
		}
	}

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

D
Drew Cross 已提交
1780 1781
		if (typeof index === 'number') {
			args.push(`stash@{${index}}`);
J
Joao Moreno 已提交
1782
		}
1783

J
Joao Moreno 已提交
1784 1785
		try {
			await this.run(args);
1786 1787 1788 1789 1790 1791 1792 1793 1794
		} catch (err) {
			if (/No stash found/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoStashFound;
			}

			throw err;
		}
	}

J
João Moreno 已提交
1795
	getStatus(opts?: { limit?: number, ignoreSubmodules?: boolean }): Promise<{ status: IFileStatus[]; didHitLimit: boolean; }> {
1796
		return new Promise<{ status: IFileStatus[]; didHitLimit: boolean; }>((c, e) => {
1797
			const parser = new GitStatusParser();
J
Joao Moreno 已提交
1798
			const env = { GIT_OPTIONAL_LOCKS: '0' };
F
Fmstrat 已提交
1799
			const args = ['status', '-z', '-u'];
J
João Moreno 已提交
1800 1801

			if (opts?.ignoreSubmodules) {
F
Fmstrat 已提交
1802 1803
				args.push('--ignore-submodules');
			}
J
João Moreno 已提交
1804

F
Fmstrat 已提交
1805
			const child = this.stream(args, { env });
1806

M
Matt Bierner 已提交
1807
			const onExit = (exitCode: number) => {
1808
				if (exitCode !== 0) {
1809 1810 1811 1812 1813 1814
					const stderr = stderrData.join('');
					return e(new GitError({
						message: 'Failed to execute git',
						stderr,
						exitCode,
						gitErrorCode: getGitErrorCode(stderr),
1815 1816
						gitCommand: 'status',
						gitArgs: args
1817
					}));
1818
				}
J
Joao Moreno 已提交
1819

1820 1821 1822
				c({ status: parser.status, didHitLimit: false });
			};

J
João Moreno 已提交
1823
			const limit = opts?.limit ?? 5000;
1824
			const onStdoutData = (raw: string) => {
1825 1826
				parser.update(raw);

J
Joao Moreno 已提交
1827
				if (parser.status.length > limit) {
1828
					child.removeListener('exit', onExit);
1829
					child.stdout!.removeListener('data', onStdoutData);
1830 1831
					child.kill();

J
Joao Moreno 已提交
1832
					c({ status: parser.status.slice(0, limit), didHitLimit: true });
1833 1834 1835
				}
			};

1836 1837
			child.stdout!.setEncoding('utf8');
			child.stdout!.on('data', onStdoutData);
1838 1839

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

J
Joao Moreno 已提交
1843
			child.on('error', cpErrorHandler(e));
1844
			child.on('exit', onExit);
1845
		});
J
Joao Moreno 已提交
1846 1847
	}

J
Joao Moreno 已提交
1848
	async getHEAD(): Promise<Ref> {
J
Joao Moreno 已提交
1849
		try {
J
Joao Moreno 已提交
1850
			const result = await this.run(['symbolic-ref', '--short', 'HEAD']);
J
Joao Moreno 已提交
1851 1852 1853 1854 1855

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

R
Rob Lourens 已提交
1856
			return { name: result.stdout.trim(), commit: undefined, type: RefType.Head };
J
Joao Moreno 已提交
1857
		} catch (err) {
J
Joao Moreno 已提交
1858
			const result = await this.run(['rev-parse', 'HEAD']);
J
Joao Moreno 已提交
1859 1860 1861 1862 1863

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

R
Rob Lourens 已提交
1864
			return { name: undefined, commit: result.stdout.trim(), type: RefType.Head };
J
Joao Moreno 已提交
1865 1866 1867
		}
	}

J
Joao Moreno 已提交
1868 1869
	async findTrackingBranches(upstreamBranch: string): Promise<Branch[]> {
		const result = await this.run(['for-each-ref', '--format', '%(refname:short)%00%(upstream:short)', 'refs/heads']);
1870
		return result.stdout.trim().split('\n')
J
Joao Moreno 已提交
1871 1872 1873
			.map(line => line.trim().split('\0'))
			.filter(([_, upstream]) => upstream === upstreamBranch)
			.map(([ref]) => ({ name: ref, type: RefType.Head } as Branch));
1874 1875
	}

1876 1877 1878 1879 1880 1881
	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 已提交
1882

J
Joao Moreno 已提交
1883
		if (opts && opts.sort && opts.sort !== 'alphabetically') {
1884
			args.push('--sort', `-${opts.sort}`);
S
skprabhanjan 已提交
1885 1886
		}

J
João Moreno 已提交
1887
		args.push('--format', '%(refname) %(objectname) %(*objectname)');
1888 1889 1890 1891 1892

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

1893 1894 1895 1896
		if (opts?.contains) {
			args.push('--contains', opts.contains);
		}

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

M
Matt Bierner 已提交
1899
		const fn = (line: string): Ref | null => {
J
Joao Moreno 已提交
1900 1901
			let match: RegExpExecArray | null;

J
João Moreno 已提交
1902
			if (match = /^refs\/heads\/([^ ]+) ([0-9a-f]{40}) ([0-9a-f]{40})?$/.exec(line)) {
J
Joao Moreno 已提交
1903
				return { name: match[1], commit: match[2], type: RefType.Head };
J
João Moreno 已提交
1904
			} else if (match = /^refs\/remotes\/([^/]+)\/([^ ]+) ([0-9a-f]{40}) ([0-9a-f]{40})?$/.exec(line)) {
J
Joao Moreno 已提交
1905
				return { name: `${match[1]}/${match[2]}`, commit: match[3], type: RefType.RemoteHead, remote: match[1] };
J
João Moreno 已提交
1906 1907
			} else if (match = /^refs\/tags\/([^ ]+) ([0-9a-f]{40}) ([0-9a-f]{40})?$/.exec(line)) {
				return { name: match[1], commit: match[3] ?? match[2], type: RefType.Tag };
J
Joao Moreno 已提交
1908 1909 1910 1911 1912 1913 1914 1915
			}

			return null;
		};

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

1919 1920
	async getStashes(): Promise<Stash[]> {
		const result = await this.run(['stash', 'list']);
J
Joao Moreno 已提交
1921
		const regex = /^stash@{(\d+)}:(.+)$/;
1922 1923
		const rawStashes = result.stdout.trim().split('\n')
			.filter(b => !!b)
M
Matt Bierner 已提交
1924
			.map(line => regex.exec(line) as RegExpExecArray)
1925
			.filter(g => !!g)
J
Joao Moreno 已提交
1926
			.map(([, index, description]: RegExpExecArray) => ({ index: parseInt(index), description }));
1927

J
Joao Moreno 已提交
1928 1929
		return rawStashes;
	}
1930

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

1936 1937
		for (const line of lines) {
			const parts = line.split(/\s/);
J
Joao Moreno 已提交
1938 1939 1940 1941
			const [name, url, type] = parts;

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

1942
			if (!remote) {
J
Joao Moreno 已提交
1943
				remote = { name, isReadOnly: false };
1944 1945 1946
				remotes.push(remote);
			}

J
Joao Moreno 已提交
1947 1948 1949 1950 1951 1952 1953
			if (/fetch/i.test(type)) {
				remote.fetchUrl = url;
			} else if (/push/i.test(type)) {
				remote.pushUrl = url;
			} else {
				remote.fetchUrl = url;
				remote.pushUrl = url;
1954 1955
			}

C
ChaseKnowlden 已提交
1956
			// https://github.com/microsoft/vscode/issues/45271
J
Joao Moreno 已提交
1957
			remote.isReadOnly = remote.pushUrl === undefined || remote.pushUrl === 'no_push';
1958
		}
J
Joao Moreno 已提交
1959

1960
		return remotes;
J
Joao Moreno 已提交
1961 1962
	}

J
Joao Moreno 已提交
1963
	async getBranch(name: string): Promise<Branch> {
J
Joao Moreno 已提交
1964 1965 1966 1967
		if (name === 'HEAD') {
			return this.getHEAD();
		}

1968 1969 1970 1971 1972 1973 1974 1975
		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 已提交
1976 1977

		if (!result.stdout) {
J
Joao Moreno 已提交
1978
			return Promise.reject<Branch>(new Error('No such branch'));
J
Joao Moreno 已提交
1979 1980 1981 1982 1983
		}

		const commit = result.stdout.trim();

		try {
J
Joao Moreno 已提交
1984 1985 1986 1987 1988 1989 1990
			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 已提交
1991

J
Joao Moreno 已提交
1992 1993
			const upstream = { remote: match[1], name: match[2] };
			const res3 = await this.run(['rev-list', '--left-right', name + '...' + fullUpstream]);
J
Joao Moreno 已提交
1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013

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

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

2019 2020 2021
	// TODO: Support core.commentChar
	stripCommitMessageComments(message: string): string {
		return message.replace(/^\s*#.*$\n?/gm, '').trim();
2022 2023
	}

2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034
	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;
		}
	}

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

2038
		try {
J
Joao Moreno 已提交
2039
			const raw = await fs.readFile(mergeMsgPath, 'utf8');
2040
			return this.stripCommitMessageComments(raw);
J
Joao Moreno 已提交
2041
		} catch {
2042 2043 2044 2045
			return undefined;
		}
	}

J
Joao Moreno 已提交
2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059
	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 已提交
2060
				templatePath = path.join(this.repositoryRoot, templatePath);
J
Joao Moreno 已提交
2061 2062
			}

J
Joao Moreno 已提交
2063
			const raw = await fs.readFile(templatePath, 'utf8');
2064
			return this.stripCommitMessageComments(raw);
J
Joao Moreno 已提交
2065 2066 2067 2068 2069
		} catch (err) {
			return '';
		}
	}

J
Joao Moreno 已提交
2070
	async getCommit(ref: string): Promise<Commit> {
2071 2072 2073 2074 2075 2076
		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 已提交
2077
	}
2078 2079

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

J
Joao Moreno 已提交
2082
		for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
J
João Moreno 已提交
2083
			await this.run([...args, '--', ...chunk]);
J
Joao Moreno 已提交
2084
		}
2085 2086 2087 2088 2089 2090
	}

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

		try {
J
Joao Moreno 已提交
2091
			const gitmodulesRaw = await fs.readFile(gitmodulesPath, 'utf8');
2092 2093 2094 2095 2096 2097 2098 2099 2100
			return parseGitmodules(gitmodulesRaw);
		} catch (err) {
			if (/ENOENT/.test(err.message)) {
				return [];
			}

			throw err;
		}
	}
2101
}