git.ts 55.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 { 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

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

		return result;
	}
}

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

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

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

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

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

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

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

J
Joao Moreno 已提交
365
	readonly path: string;
366 367
	readonly userAgent: string;
	readonly version: string;
368
	private env: any;
J
Joao Moreno 已提交
369

370 371
	private _onOutput = new EventEmitter();
	get onOutput(): EventEmitter { return this._onOutput; }
J
Joao Moreno 已提交
372

J
Joao Moreno 已提交
373
	constructor(options: IGitOptions) {
J
Joao Moreno 已提交
374
		this.path = options.gitPath;
375 376
		this.version = options.version;
		this.userAgent = options.userAgent;
377
		this.env = options.env || {};
J
Joao Moreno 已提交
378 379
	}

J
Joao Moreno 已提交
380 381
	open(repository: string, dotGit: string): Repository {
		return new Repository(this, repository, dotGit);
J
Joao Moreno 已提交
382 383
	}

J
Joao Moreno 已提交
384 385 386 387 388
	async init(repository: string): Promise<void> {
		await this.exec(repository, ['init']);
		return;
	}

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

J
Joao Moreno 已提交
395
		while (count < 20 && await new Promise(c => exists(folderPath, c))) {
396
			folderName = `${baseFolderName}-${count++}`;
J
João Moreno 已提交
397
			folderPath = path.join(options.parentPath, folderName);
398
		}
J
Joao Moreno 已提交
399

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

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

			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 已提交
424
					options.progress.report({ increment: totalProgress - previousProgress });
J
Joao Moreno 已提交
425 426 427 428 429
					previousProgress = totalProgress;
				}
			});
		};

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

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

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

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

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

		return repoPath;
J
Joao Moreno 已提交
486 487
	}

J
Joao Moreno 已提交
488
	async getRepositoryDotGit(repositoryPath: string): Promise<string> {
489 490 491 492 493 494 495 496
		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 已提交
497 498
	}

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

J
Joao Moreno 已提交
504 505 506 507
	async exec2(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
		return await this._exec(args, options);
	}

J
Joao Moreno 已提交
508
	stream(cwd: string, args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
509
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
510
		return this.spawn(args, options);
J
Joao Moreno 已提交
511 512
	}

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

J
Joao Moreno 已提交
516 517 518 519
		if (options.onSpawn) {
			options.onSpawn(child);
		}

J
Joao Moreno 已提交
520
		if (options.input) {
521
			child.stdin!.end(options.input, 'utf8');
J
Joao Moreno 已提交
522 523
		}

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

J
Joao Moreno 已提交
526 527
		if (options.log !== false && bufferResult.stderr.length > 0) {
			this.log(`${bufferResult.stderr}\n`);
J
Joao Moreno 已提交
528 529
		}

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

		return result;
J
Joao Moreno 已提交
552 553
	}

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

567
		options.env = assign({}, process.env, this.env, options.env || {}, {
J
Joao Moreno 已提交
568
			VSCODE_GIT_COMMAND: args[0],
569
			LC_ALL: 'en_US.UTF-8',
570
			LANG: 'en_US.UTF-8',
571
			GIT_PAGER: 'cat'
J
Joao Moreno 已提交
572
		});
J
Joao Moreno 已提交
573

J
Joao Moreno 已提交
574 575 576 577
		if (options.cwd) {
			options.cwd = sanitizePath(options.cwd);
		}

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

J
Joao Moreno 已提交
582
		return cp.spawn(this.path, args, options);
J
Joao Moreno 已提交
583 584 585
	}

	private log(output: string): void {
586
		this._onOutput.emit('log', output);
J
Joao Moreno 已提交
587
	}
J
Joao Moreno 已提交
588 589
}

J
Joao Moreno 已提交
590
export interface Commit {
J
Joao Moreno 已提交
591 592
	hash: string;
	message: string;
J
Joao Moreno 已提交
593
	parents: string[];
594 595 596
	authorDate?: Date;
	authorName?: string;
	authorEmail?: string;
597
	commitDate?: Date;
J
Joao Moreno 已提交
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 633 634 635 636 637
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 已提交
638
		if (entry.x === 'R' || entry.x === 'C') {
639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665
			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;
	}
}

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 695 696 697 698 699
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 已提交
700
		const propertyMatch = /^\s*(\w+)\s*=\s*(.*)$/.exec(line);
701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727

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

728
const commitRegex = /([0-9a-f]{40})\n(.*)\n(.*)\n(.*)\n(.*)\n(.*)(?:\n([^]*?))?(?:\x00)/gm;
729 730 731 732 733

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

	let ref;
734 735 736 737
	let authorName;
	let authorEmail;
	let authorDate;
	let commitDate;
738 739 740 741 742 743 744 745 746 747
	let parents;
	let message;
	let match;

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

748
		[, ref, authorName, authorEmail, authorDate, commitDate, parents, message] = match;
749

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

	return commits;
767 768
}

769 770 771 772
interface LsTreeElement {
	mode: string;
	type: string;
	object: string;
J
Joao Moreno 已提交
773
	size: string;
774 775 776 777 778 779
	file: string;
}

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

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

800 801
export interface PullOptions {
	unshallow?: boolean;
J
Joao Moreno 已提交
802
	tags?: boolean;
803
	readonly cancellationToken?: CancellationToken;
804 805
}

J
Joao Moreno 已提交
806 807
export enum ForcePushMode {
	Force,
J
Joao Moreno 已提交
808
	ForceWithLease
J
Joao Moreno 已提交
809 810
}

J
Joao Moreno 已提交
811 812 813 814
export class Repository {

	constructor(
		private _git: Git,
J
Joao Moreno 已提交
815 816
		private repositoryRoot: string,
		readonly dotGit: string
J
Joao Moreno 已提交
817 818 819 820 821 822
	) { }

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

J
Joao Moreno 已提交
823 824
	get root(): string {
		return this.repositoryRoot;
J
Joao Moreno 已提交
825 826 827
	}

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

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

J
Joao Moreno 已提交
836
	spawn(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
837 838 839
		return this.git.spawn(args, options);
	}

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

J
Joao Moreno 已提交
857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874
	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) };
		});
	}

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

882 883
		const result = await this.run(args);
		if (result.exitCode) {
884
			// An empty repo
885 886 887
			return [];
		}

888 889
		return parseGitCommits(result.stdout);
	}
890

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

913 914 915 916
		const result = await this.run(args);
		if (result.exitCode) {
			// No file history, e.g. a new file or untracked
			return [];
917 918
		}

919
		return parseGitCommits(result.stdout);
920 921
	}

922
	async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false): Promise<string> {
J
Joao Moreno 已提交
923
		const stdout = await this.buffer(object);
924 925 926 927 928

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

J
Joao Moreno 已提交
929 930 931
		encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';

		return iconv.decode(stdout, encoding);
J
Joao Moreno 已提交
932 933 934
	}

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

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

941
		const { exitCode, stdout, stderr } = await exec(child);
J
Joao Moreno 已提交
942 943

		if (exitCode) {
944
			const err = new GitError({
J
Joao Moreno 已提交
945 946
				message: 'Could not show object.',
				exitCode
947 948 949 950 951 952 953
			});

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

			return Promise.reject<Buffer>(err);
J
Joao Moreno 已提交
954 955 956
		}

		return stdout;
J
Joao Moreno 已提交
957 958
	}

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

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

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

J
Joao Moreno 已提交
971
			return { mode, object, size };
J
Joao Moreno 已提交
972 973
		}

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

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

J
Joao Moreno 已提交
980
		const { mode, object, size } = elements[0];
J
Joao Moreno 已提交
981
		return { mode, object, size: parseInt(size) };
J
Joao Moreno 已提交
982 983
	}

J
Joao Moreno 已提交
984
	async lstree(treeish: string, path: string): Promise<LsTreeElement[]> {
J
Joao Moreno 已提交
985
		const { stdout } = await this.run(['ls-tree', '-l', treeish, '--', sanitizePath(path)]);
986 987
		return parseLsTree(stdout);
	}
988

989
	async lsfiles(path: string): Promise<LsFilesElement[]> {
J
Joao Moreno 已提交
990
		const { stdout } = await this.run(['ls-files', '--stage', '--', sanitizePath(path)]);
991
		return parseLsFiles(stdout);
992 993
	}

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

		if (!element) {
			throw new GitError({ message: 'Git relative path not found.' });
1002
		}
1003 1004

		return element.file;
1005 1006
	}

J
Joao Moreno 已提交
1007
	async detectObjectType(object: string): Promise<{ mimetype: string, encoding?: string }> {
J
João Moreno 已提交
1008
		const child = await this.stream(['show', '--textconv', object]);
1009
		const buffer = await readBytes(child.stdout!, 4100);
J
Joao Moreno 已提交
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 1042 1043 1044 1045 1046

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

1047 1048 1049 1050 1051 1052 1053
	async apply(patch: string, reverse?: boolean): Promise<void> {
		const args = ['apply', patch];

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

1054 1055 1056 1057 1058 1059 1060 1061 1062
		try {
			await this.run(args);
		} catch (err) {
			if (/patch does not apply/.test(err.stderr)) {
				err.gitErrorCode = GitErrorCodes.PatchDoesNotApply;
			}

			throw err;
		}
1063 1064 1065
	}

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

J
Joao Moreno 已提交
1068
		if (cached) {
1069 1070 1071 1072 1073 1074 1075
			args.push('--cached');
		}

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

1076 1077 1078 1079
	diffWithHEAD(): Promise<Change[]>;
	diffWithHEAD(path: string): Promise<string>;
	diffWithHEAD(path?: string | undefined): Promise<string | Change[]>;
	async diffWithHEAD(path?: string | undefined): Promise<string | Change[]> {
1080 1081 1082 1083
		if (!path) {
			return await this.diffFiles(false);
		}

J
Joao Moreno 已提交
1084
		const args = ['diff', '--', sanitizePath(path)];
J
Joao Moreno 已提交
1085 1086 1087 1088
		const result = await this.run(args);
		return result.stdout;
	}

1089 1090 1091
	diffWith(ref: string): Promise<Change[]>;
	diffWith(ref: string, path: string): Promise<string>;
	diffWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
1092 1093 1094 1095 1096
	async diffWith(ref: string, path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(false, ref);
		}

J
Joao Moreno 已提交
1097
		const args = ['diff', ref, '--', sanitizePath(path)];
J
Joao Moreno 已提交
1098 1099 1100 1101
		const result = await this.run(args);
		return result.stdout;
	}

1102 1103 1104
	diffIndexWithHEAD(): Promise<Change[]>;
	diffIndexWithHEAD(path: string): Promise<string>;
	diffIndexWithHEAD(path?: string | undefined): Promise<string | Change[]>;
1105 1106 1107 1108 1109
	async diffIndexWithHEAD(path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(true);
		}

J
Joao Moreno 已提交
1110
		const args = ['diff', '--cached', '--', sanitizePath(path)];
J
Joao Moreno 已提交
1111 1112 1113 1114
		const result = await this.run(args);
		return result.stdout;
	}

1115 1116 1117
	diffIndexWith(ref: string): Promise<Change[]>;
	diffIndexWith(ref: string, path: string): Promise<string>;
	diffIndexWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
1118 1119 1120 1121 1122
	async diffIndexWith(ref: string, path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(true, ref);
		}

J
Joao Moreno 已提交
1123
		const args = ['diff', '--cached', ref, '--', sanitizePath(path)];
J
Joao Moreno 已提交
1124 1125 1126 1127 1128 1129 1130 1131 1132 1133
		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;
	}

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

		return result.stdout.trim();
	}

1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175
	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 已提交
1176
			const originalUri = Uri.file(path.isAbsolute(resourcePath) ? resourcePath : path.join(this.repositoryRoot, resourcePath));
1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203
			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 已提交
1204
					const uri = Uri.file(path.isAbsolute(newPath) ? newPath : path.join(this.repositoryRoot, newPath));
1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229
					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 已提交
1230 1231 1232 1233 1234 1235 1236
	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 已提交
1237 1238 1239 1240 1241 1242 1243
	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 已提交
1244 1245 1246 1247 1248 1249 1250 1251 1252
	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 已提交
1253
		if (paths && paths.length) {
1254
			for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
J
João Moreno 已提交
1255
				await this.run([...args, '--', ...chunk]);
1256
			}
J
Joao Moreno 已提交
1257
		} else {
J
João Moreno 已提交
1258
			await this.run([...args, '--', '.']);
J
Joao Moreno 已提交
1259 1260 1261
		}
	}

J
Joao Moreno 已提交
1262 1263 1264 1265 1266 1267 1268
	async rm(paths: string[]): Promise<void> {
		const args = ['rm', '--'];

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

J
Joao Moreno 已提交
1269
		args.push(...paths.map(sanitizePath));
J
Joao Moreno 已提交
1270 1271 1272 1273

		await this.run(args);
	}

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

		const { exitCode, stdout } = await exec(child);
J
Joao Moreno 已提交
1279
		const hash = stdout.toString('utf8');
J
Joao Moreno 已提交
1280 1281 1282 1283 1284 1285 1286 1287

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

J
Joao Moreno 已提交
1288
		const treeish = await this.getCommit('HEAD').then(() => 'HEAD', () => '');
J
Joao Moreno 已提交
1289
		let mode: string;
D
Darrien Singleton 已提交
1290
		let add: string = '';
J
Joao Moreno 已提交
1291 1292

		try {
1293
			const details = await this.getObjectDetails(treeish, path);
J
Joao Moreno 已提交
1294 1295
			mode = details.mode;
		} catch (err) {
J
Joao Moreno 已提交
1296 1297 1298 1299
			if (err.gitErrorCode !== GitErrorCodes.UnknownPath) {
				throw err;
			}

J
Joao Moreno 已提交
1300
			mode = '100644';
D
Darrien Singleton 已提交
1301
			add = '--add';
J
Joao Moreno 已提交
1302 1303
		}

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

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

1310 1311 1312 1313
		if (opts.track) {
			args.push('--track');
		}

J
João Moreno 已提交
1314 1315 1316 1317
		if (opts.detached) {
			args.push('--detach');
		}

J
Joao Moreno 已提交
1318 1319 1320 1321 1322
		if (treeish) {
			args.push(treeish);
		}

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

			throw err;
		}
	}

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

J
Joao Moreno 已提交
1343
		if (opts.all) {
J
Joao Moreno 已提交
1344 1345 1346
			args.push('--all');
		}

J
João Moreno 已提交
1347
		if (opts.amend && message) {
J
Joao Moreno 已提交
1348 1349 1350
			args.push('--amend');
		}

J
João Moreno 已提交
1351 1352 1353 1354 1355 1356
		if (opts.amend && !message) {
			args.push('--amend', '--no-edit');
		} else {
			args.push('--file', '-');
		}

J
Joao Moreno 已提交
1357
		if (opts.signoff) {
J
Joao Moreno 已提交
1358 1359 1360
			args.push('--signoff');
		}

1361 1362 1363
		if (opts.signCommit) {
			args.push('-S');
		}
1364

T
Tom Basche 已提交
1365 1366 1367
		if (opts.empty) {
			args.push('--allow-empty');
		}
1368

1369 1370 1371 1372
		if (opts.noVerify) {
			args.push('--no-verify');
		}

1373 1374 1375
		// Stops git from guessing at user/email
		args.splice(0, 0, '-c', 'user.useConfigOnly=true');

J
Joao Moreno 已提交
1376
		try {
J
João Moreno 已提交
1377
			await this.run(args, !opts.amend || message ? { input: message || '' } : {});
J
Joao Moreno 已提交
1378
		} catch (commitErr) {
1379 1380 1381
			await this.handleCommitError(commitErr);
		}
	}
J
Joao Moreno 已提交
1382

1383 1384 1385 1386
	async rebaseAbort(): Promise<void> {
		await this.run(['rebase', '--abort']);
	}

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

1390 1391 1392 1393 1394 1395
		try {
			await this.run(args);
		} catch (commitErr) {
			await this.handleCommitError(commitErr);
		}
	}
J
Joao Moreno 已提交
1396

1397 1398 1399
	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 已提交
1400 1401
			throw commitErr;
		}
1402 1403

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

		try {
J
Joao Moreno 已提交
1411 1412 1413 1414
			await this.run(['config', '--get-all', 'user.email']);
		} catch (err) {
			err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
			throw err;
1415 1416 1417
		}

		throw commitErr;
J
Joao Moreno 已提交
1418 1419
	}

J
Joao Moreno 已提交
1420
	async branch(name: string, checkout: boolean, ref?: string): Promise<void> {
J
Joao Moreno 已提交
1421
		const args = checkout ? ['checkout', '-q', '-b', name, '--no-track'] : ['branch', '-q', name];
J
Joao Moreno 已提交
1422 1423 1424 1425 1426

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

J
Joao Moreno 已提交
1427 1428 1429
		await this.run(args);
	}

1430 1431
	async deleteBranch(name: string, force?: boolean): Promise<void> {
		const args = ['branch', force ? '-D' : '-d', name];
M
Maik Riechert 已提交
1432 1433 1434
		await this.run(args);
	}

1435 1436 1437 1438 1439
	async renameBranch(name: string): Promise<void> {
		const args = ['branch', '-m', name];
		await this.run(args);
	}

K
kingwl 已提交
1440 1441 1442 1443 1444
	async move(from: string, to: string): Promise<void> {
		const args = ['mv', from, to];
		await this.run(args);
	}

J
Joao Moreno 已提交
1445 1446 1447 1448 1449
	async setBranchUpstream(name: string, upstream: string): Promise<void> {
		const args = ['branch', '--set-upstream-to', upstream, name];
		await this.run(args);
	}

1450 1451 1452 1453 1454
	async deleteRef(ref: string): Promise<void> {
		const args = ['update-ref', '-d', ref];
		await this.run(args);
	}

J
Joao Moreno 已提交
1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466
	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;
		}
1467 1468
	}

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

J
Joao Moreno 已提交
1472 1473
		if (message) {
			args = [...args, '-a', name, '-m', message];
1474
		} else {
J
Joao Moreno 已提交
1475
			args = [...args, name];
1476 1477 1478 1479 1480
		}

		await this.run(args);
	}

X
Xhulio Hasani 已提交
1481 1482 1483 1484 1485
	async deleteTag(name: string): Promise<void> {
		let args = ['tag', '-d', name];
		await this.run(args);
	}

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

J
Joao Moreno 已提交
1490 1491
		const limiter = new Limiter(5);
		const promises: Promise<any>[] = [];
J
João Moreno 已提交
1492
		const args = ['clean', '-f', '-q'];
J
Joao Moreno 已提交
1493 1494

		for (const paths of groups) {
1495
			for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
J
João Moreno 已提交
1496
				promises.push(limiter.queue(() => this.run([...args, '--', ...chunk])));
J
Joao Moreno 已提交
1497
			}
J
Joao Moreno 已提交
1498
		}
J
Joao Moreno 已提交
1499 1500

		await Promise.all(promises);
J
Joao Moreno 已提交
1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517
	}

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

J
Joao Moreno 已提交
1522
	async revert(treeish: string, paths: string[]): Promise<void> {
J
Joao Moreno 已提交
1523 1524 1525 1526 1527
		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 已提交
1528
			args = ['rm', '--cached', '-r'];
J
Joao Moreno 已提交
1529
		} else {
J
João Moreno 已提交
1530
			args = ['reset', '-q', treeish];
J
Joao Moreno 已提交
1531 1532 1533
		}

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

J
Joao Moreno 已提交
1557
	async removeRemote(name: string): Promise<void> {
J
João Moreno 已提交
1558 1559 1560 1561 1562 1563
		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 已提交
1564 1565 1566
		await this.run(args);
	}

A
Asif Hasan 已提交
1567
	async fetch(options: { remote?: string, ref?: string, all?: boolean, prune?: boolean, depth?: number, silent?: boolean, readonly cancellationToken?: CancellationToken } = {}): Promise<void> {
J
Joao Moreno 已提交
1568
		const args = ['fetch'];
A
Asif Hasan 已提交
1569 1570 1571
		const spawnOptions: SpawnOptions = {
			cancellationToken: options.cancellationToken,
		};
J
Joao Moreno 已提交
1572

J
Joao Moreno 已提交
1573 1574
		if (options.remote) {
			args.push(options.remote);
J
Joao Moreno 已提交
1575

J
Joao Moreno 已提交
1576 1577
			if (options.ref) {
				args.push(options.ref);
J
Joao Moreno 已提交
1578
			}
J
Joao Moreno 已提交
1579 1580
		} else if (options.all) {
			args.push('--all');
J
Joao Moreno 已提交
1581 1582
		}

R
Ryan Scott 已提交
1583
		if (options.prune) {
R
Ryan Scott 已提交
1584
			args.push('--prune');
R
Ryan Scott 已提交
1585 1586
		}

1587
		if (typeof options.depth === 'number') {
1588 1589
			args.push(`--depth=${options.depth}`);
		}
R
Ryan Scott 已提交
1590

J
Joao Moreno 已提交
1591 1592 1593 1594
		if (options.silent) {
			spawnOptions.env = { 'VSCODE_GIT_FETCH_SILENT': 'true' };
		}

J
Joao Moreno 已提交
1595
		try {
J
Joao Moreno 已提交
1596
			await this.run(args, spawnOptions);
J
Joao Moreno 已提交
1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607
		} 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;
		}
	}

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

J
Joao Moreno 已提交
1611
		if (options.tags) {
H
Hao Hu 已提交
1612 1613
			args.push('--tags');
		}
1614 1615 1616 1617

		if (options.unshallow) {
			args.push('--unshallow');
		}
J
Joao Moreno 已提交
1618 1619 1620 1621 1622

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

M
Matt Shirley 已提交
1623
		if (remote && branch) {
1624
			args.push(remote);
M
Matt Shirley 已提交
1625
			args.push(branch);
1626 1627
		}

J
Joao Moreno 已提交
1628
		try {
1629
			await this.run(args, options);
J
Joao Moreno 已提交
1630 1631 1632 1633 1634 1635 1636
		} 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 已提交
1637 1638
			} 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 已提交
1639
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
J
Joao Moreno 已提交
1640 1641 1642 1643
			} 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 已提交
1644 1645 1646 1647 1648 1649
			}

			throw err;
		}
	}

T
tomerstav 已提交
1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667
	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;
		}
	}

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

J
Joao Moreno 已提交
1671 1672 1673 1674
		if (forcePushMode === ForcePushMode.ForceWithLease) {
			args.push('--force-with-lease');
		} else if (forcePushMode === ForcePushMode.Force) {
			args.push('--force');
1675 1676
		}

J
Joao Moreno 已提交
1677
		if (setUpstream) {
J
Joao Moreno 已提交
1678 1679 1680
			args.push('-u');
		}

1681
		if (followTags) {
1682
			args.push('--follow-tags');
J
Joao Moreno 已提交
1683 1684
		}

1685 1686 1687 1688
		if (tags) {
			args.push('--tags');
		}

J
Joao Moreno 已提交
1689 1690 1691 1692 1693 1694 1695 1696
		if (remote) {
			args.push(remote);
		}

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

1697 1698
		args.splice(0, 0, '-c', `http.userAgent="${this.git.userAgent}"`);

J
Joao Moreno 已提交
1699 1700 1701 1702 1703 1704 1705
		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;
1706 1707
			} else if (/^fatal: The current branch .* has no upstream branch/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoUpstreamBranch;
J
João Moreno 已提交
1708 1709
			} else if (/Permission.*denied/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.PermissionDenied;
J
Joao Moreno 已提交
1710 1711 1712 1713 1714 1715
			}

			throw err;
		}
	}

1716 1717 1718 1719 1720
	async cherryPick(commitHash: string): Promise<void> {
		const args = ['cherry-pick', commitHash];
		await this.run(args);
	}

R
rebornix 已提交
1721 1722
	async blame(path: string): Promise<string> {
		try {
J
Joao Moreno 已提交
1723 1724
			const args = ['blame', sanitizePath(path)];
			const result = await this.run(args);
R
rebornix 已提交
1725 1726
			return result.stdout.trim();
		} catch (err) {
R
rebornix 已提交
1727 1728 1729 1730
			if (/^fatal: no such path/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoPathFound;
			}

R
rebornix 已提交
1731 1732 1733 1734
			throw err;
		}
	}

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

1739 1740 1741 1742
			if (includeUntracked) {
				args.push('-u');
			}

J
Joao Moreno 已提交
1743
			if (message) {
J
Joao Moreno 已提交
1744
				args.push('-m', message);
1745 1746 1747 1748 1749 1750 1751
			}

			await this.run(args);
		} catch (err) {
			if (/No local changes to save/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoLocalChanges;
			}
J
Joao Moreno 已提交
1752 1753 1754 1755 1756 1757

			throw err;
		}
	}

	async popStash(index?: number): Promise<void> {
1758
		const args = ['stash', 'pop'];
J
Joao Moreno 已提交
1759
		await this.popOrApplyStash(args, index);
1760 1761 1762 1763
	}

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

1767 1768
	private async popOrApplyStash(args: string[], index?: number): Promise<void> {
		try {
1769
			if (typeof index === 'number') {
J
Joao Moreno 已提交
1770
				args.push(`stash@{${index}}`);
1771
			}
J
Joao Moreno 已提交
1772 1773 1774 1775 1776 1777

			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 || '')) {
1778
				err.gitErrorCode = GitErrorCodes.LocalChangesOverwritten;
J
Joao Moreno 已提交
1779 1780
			} else if (/^CONFLICT/m.test(err.stdout || '')) {
				err.gitErrorCode = GitErrorCodes.StashConflict;
1781
			}
J
Joao Moreno 已提交
1782

1783 1784 1785 1786
			throw err;
		}
	}

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

D
Drew Cross 已提交
1790 1791
		if (typeof index === 'number') {
			args.push(`stash@{${index}}`);
J
Joao Moreno 已提交
1792
		}
1793

J
Joao Moreno 已提交
1794 1795
		try {
			await this.run(args);
1796 1797 1798 1799 1800 1801 1802 1803 1804
		} catch (err) {
			if (/No stash found/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoStashFound;
			}

			throw err;
		}
	}

J
João Moreno 已提交
1805
	getStatus(opts?: { limit?: number, ignoreSubmodules?: boolean }): Promise<{ status: IFileStatus[]; didHitLimit: boolean; }> {
1806
		return new Promise<{ status: IFileStatus[]; didHitLimit: boolean; }>((c, e) => {
1807
			const parser = new GitStatusParser();
J
Joao Moreno 已提交
1808
			const env = { GIT_OPTIONAL_LOCKS: '0' };
F
Fmstrat 已提交
1809
			const args = ['status', '-z', '-u'];
J
João Moreno 已提交
1810 1811

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

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

M
Matt Bierner 已提交
1817
			const onExit = (exitCode: number) => {
1818
				if (exitCode !== 0) {
1819 1820 1821 1822 1823 1824
					const stderr = stderrData.join('');
					return e(new GitError({
						message: 'Failed to execute git',
						stderr,
						exitCode,
						gitErrorCode: getGitErrorCode(stderr),
1825 1826
						gitCommand: 'status',
						gitArgs: args
1827
					}));
1828
				}
J
Joao Moreno 已提交
1829

1830 1831 1832
				c({ status: parser.status, didHitLimit: false });
			};

J
João Moreno 已提交
1833
			const limit = opts?.limit ?? 5000;
1834
			const onStdoutData = (raw: string) => {
1835 1836
				parser.update(raw);

J
Joao Moreno 已提交
1837
				if (parser.status.length > limit) {
1838
					child.removeListener('exit', onExit);
1839
					child.stdout!.removeListener('data', onStdoutData);
1840 1841
					child.kill();

J
Joao Moreno 已提交
1842
					c({ status: parser.status.slice(0, limit), didHitLimit: true });
1843 1844 1845
				}
			};

1846 1847
			child.stdout!.setEncoding('utf8');
			child.stdout!.on('data', onStdoutData);
1848 1849

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

J
Joao Moreno 已提交
1853
			child.on('error', cpErrorHandler(e));
1854
			child.on('exit', onExit);
1855
		});
J
Joao Moreno 已提交
1856 1857
	}

J
Joao Moreno 已提交
1858
	async getHEAD(): Promise<Ref> {
J
Joao Moreno 已提交
1859
		try {
J
Joao Moreno 已提交
1860
			const result = await this.run(['symbolic-ref', '--short', 'HEAD']);
J
Joao Moreno 已提交
1861 1862 1863 1864 1865

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

R
Rob Lourens 已提交
1866
			return { name: result.stdout.trim(), commit: undefined, type: RefType.Head };
J
Joao Moreno 已提交
1867
		} catch (err) {
J
Joao Moreno 已提交
1868
			const result = await this.run(['rev-parse', 'HEAD']);
J
Joao Moreno 已提交
1869 1870 1871 1872 1873

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

R
Rob Lourens 已提交
1874
			return { name: undefined, commit: result.stdout.trim(), type: RefType.Head };
J
Joao Moreno 已提交
1875 1876 1877
		}
	}

J
Joao Moreno 已提交
1878 1879
	async findTrackingBranches(upstreamBranch: string): Promise<Branch[]> {
		const result = await this.run(['for-each-ref', '--format', '%(refname:short)%00%(upstream:short)', 'refs/heads']);
1880
		return result.stdout.trim().split('\n')
J
Joao Moreno 已提交
1881 1882 1883
			.map(line => line.trim().split('\0'))
			.filter(([_, upstream]) => upstream === upstreamBranch)
			.map(([ref]) => ({ name: ref, type: RefType.Head } as Branch));
1884 1885
	}

1886 1887 1888 1889 1890 1891
	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 已提交
1892

J
Joao Moreno 已提交
1893
		if (opts && opts.sort && opts.sort !== 'alphabetically') {
1894
			args.push('--sort', `-${opts.sort}`);
S
skprabhanjan 已提交
1895 1896
		}

J
João Moreno 已提交
1897
		args.push('--format', '%(refname) %(objectname) %(*objectname)');
1898 1899 1900 1901 1902

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

1903 1904 1905 1906
		if (opts?.contains) {
			args.push('--contains', opts.contains);
		}

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

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

J
João Moreno 已提交
1912
			if (match = /^refs\/heads\/([^ ]+) ([0-9a-f]{40}) ([0-9a-f]{40})?$/.exec(line)) {
J
Joao Moreno 已提交
1913
				return { name: match[1], commit: match[2], type: RefType.Head };
J
João Moreno 已提交
1914
			} else if (match = /^refs\/remotes\/([^/]+)\/([^ ]+) ([0-9a-f]{40}) ([0-9a-f]{40})?$/.exec(line)) {
J
Joao Moreno 已提交
1915
				return { name: `${match[1]}/${match[2]}`, commit: match[3], type: RefType.RemoteHead, remote: match[1] };
J
João Moreno 已提交
1916 1917
			} 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 已提交
1918 1919 1920 1921 1922 1923 1924 1925
			}

			return null;
		};

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

1929 1930
	async getStashes(): Promise<Stash[]> {
		const result = await this.run(['stash', 'list']);
J
Joao Moreno 已提交
1931
		const regex = /^stash@{(\d+)}:(.+)$/;
1932 1933
		const rawStashes = result.stdout.trim().split('\n')
			.filter(b => !!b)
M
Matt Bierner 已提交
1934
			.map(line => regex.exec(line) as RegExpExecArray)
1935
			.filter(g => !!g)
J
Joao Moreno 已提交
1936
			.map(([, index, description]: RegExpExecArray) => ({ index: parseInt(index), description }));
1937

J
Joao Moreno 已提交
1938 1939
		return rawStashes;
	}
1940

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

1946 1947
		for (const line of lines) {
			const parts = line.split(/\s/);
J
Joao Moreno 已提交
1948 1949 1950 1951
			const [name, url, type] = parts;

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

1952
			if (!remote) {
J
Joao Moreno 已提交
1953
				remote = { name, isReadOnly: false };
1954 1955 1956
				remotes.push(remote);
			}

J
Joao Moreno 已提交
1957 1958 1959 1960 1961 1962 1963
			if (/fetch/i.test(type)) {
				remote.fetchUrl = url;
			} else if (/push/i.test(type)) {
				remote.pushUrl = url;
			} else {
				remote.fetchUrl = url;
				remote.pushUrl = url;
1964 1965
			}

C
ChaseKnowlden 已提交
1966
			// https://github.com/microsoft/vscode/issues/45271
J
Joao Moreno 已提交
1967
			remote.isReadOnly = remote.pushUrl === undefined || remote.pushUrl === 'no_push';
1968
		}
J
Joao Moreno 已提交
1969

1970
		return remotes;
J
Joao Moreno 已提交
1971 1972
	}

J
Joao Moreno 已提交
1973
	async getBranch(name: string): Promise<Branch> {
J
Joao Moreno 已提交
1974 1975 1976 1977
		if (name === 'HEAD') {
			return this.getHEAD();
		}

1978 1979 1980 1981 1982 1983 1984 1985
		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 已提交
1986 1987

		if (!result.stdout) {
J
Joao Moreno 已提交
1988
			return Promise.reject<Branch>(new Error('No such branch'));
J
Joao Moreno 已提交
1989 1990 1991 1992 1993
		}

		const commit = result.stdout.trim();

		try {
J
Joao Moreno 已提交
1994 1995 1996 1997 1998 1999 2000
			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 已提交
2001

J
Joao Moreno 已提交
2002 2003
			const upstream = { remote: match[1], name: match[2] };
			const res3 = await this.run(['rev-list', '--left-right', name + '...' + fullUpstream]);
J
Joao Moreno 已提交
2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023

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

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

2029 2030 2031
	// TODO: Support core.commentChar
	stripCommitMessageComments(message: string): string {
		return message.replace(/^\s*#.*$\n?/gm, '').trim();
2032 2033
	}

2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044
	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;
		}
	}

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

2048
		try {
J
Joao Moreno 已提交
2049
			const raw = await fs.readFile(mergeMsgPath, 'utf8');
2050
			return this.stripCommitMessageComments(raw);
J
Joao Moreno 已提交
2051
		} catch {
2052 2053 2054 2055
			return undefined;
		}
	}

J
Joao Moreno 已提交
2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069
	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 已提交
2070
				templatePath = path.join(this.repositoryRoot, templatePath);
J
Joao Moreno 已提交
2071 2072
			}

J
Joao Moreno 已提交
2073
			const raw = await fs.readFile(templatePath, 'utf8');
2074
			return this.stripCommitMessageComments(raw);
J
Joao Moreno 已提交
2075 2076 2077 2078 2079
		} catch (err) {
			return '';
		}
	}

J
Joao Moreno 已提交
2080
	async getCommit(ref: string): Promise<Commit> {
2081 2082 2083 2084 2085 2086
		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 已提交
2087
	}
2088 2089

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

J
Joao Moreno 已提交
2092
		for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
J
João Moreno 已提交
2093
			await this.run([...args, '--', ...chunk]);
J
Joao Moreno 已提交
2094
		}
2095 2096 2097 2098 2099 2100
	}

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

		try {
J
Joao Moreno 已提交
2101
			const gitmodulesRaw = await fs.readFile(gitmodulesPath, 'utf8');
2102 2103 2104 2105 2106 2107 2108 2109 2110
			return parseGitmodules(gitmodulesRaw);
		} catch (err) {
			if (/ENOENT/.test(err.message)) {
				return [];
			}

			throw err;
		}
	}
2111
}