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

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

J
Joao Moreno 已提交
22 23
// https://github.com/microsoft/vscode/issues/65693
const MAX_CLI_LENGTH = 30000;
J
Joao Moreno 已提交
24

25
const readfile = denodeify<string, string | null, string>(fs.readFile);
J
Joao Moreno 已提交
26 27 28 29 30 31

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

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

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

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

J
Joao Moreno 已提交
50 51 52 53
function parseVersion(raw: string): string {
	return raw.replace(/^git version /, '');
}

J
Joao Moreno 已提交
54
function findSpecificGit(path: string, onLookup: (path: string) => void): Promise<IGit> {
J
Joao Moreno 已提交
55
	return new Promise<IGit>((c, e) => {
J
Joao Moreno 已提交
56 57
		onLookup(path);

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

J
Joao Moreno 已提交
66
function findGitDarwin(onLookup: (path: string) => void): Promise<IGit> {
J
Joao Moreno 已提交
67 68 69 70 71 72 73 74 75
	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 已提交
76 77
				onLookup(path);

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

J
Joao Moreno 已提交
81 82 83 84
					if (err) {
						return e('git not found');
					}

J
Joao 已提交
85
					return c({ path, version: parseVersion(stdout.trim()) });
J
Joao Moreno 已提交
86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107
				});
			}

			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 已提交
108
function findSystemGitWin32(base: string, onLookup: (path: string) => void): Promise<IGit> {
J
Joao Moreno 已提交
109 110 111 112
	if (!base) {
		return Promise.reject<IGit>('Not found');
	}

J
Joao Moreno 已提交
113
	return findSpecificGit(path.join(base, 'Git', 'cmd', 'git.exe'), onLookup);
J
Joao Moreno 已提交
114 115
}

116 117 118 119 120
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 已提交
121 122
function findGitWin32(onLookup: (path: string) => void): Promise<IGit> {
	return findSystemGitWin32(process.env['ProgramW6432'] as string, onLookup)
R
Rob Lourens 已提交
123 124 125 126
		.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 已提交
127 128
}

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

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

J
Joao Moreno 已提交
143
export interface IExecutionResult<T extends string | Buffer> {
J
Joao Moreno 已提交
144
	exitCode: number;
J
Joao Moreno 已提交
145
	stdout: T;
J
Joao Moreno 已提交
146 147 148
	stderr: string;
}

J
Joao Moreno 已提交
149 150 151 152 153 154 155 156 157 158 159 160 161 162
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 已提交
163
export interface SpawnOptions extends cp.SpawnOptions {
J
Joao Moreno 已提交
164 165 166
	input?: string;
	encoding?: string;
	log?: boolean;
J
Joao Moreno 已提交
167
	cancellationToken?: CancellationToken;
J
Joao Moreno 已提交
168
	onSpawn?: (childProcess: cp.ChildProcess) => void;
J
Joao Moreno 已提交
169 170
}

J
Joao Moreno 已提交
171
async function exec(child: cp.ChildProcess, cancellationToken?: CancellationToken): Promise<IExecutionResult<Buffer>> {
J
Joao Moreno 已提交
172
	if (!child.stdout || !child.stderr) {
J
Joao Moreno 已提交
173 174 175 176 177
		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 已提交
178 179
	}

J
Joao Moreno 已提交
180 181
	const disposables: IDisposable[] = [];

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

M
Matt Bierner 已提交
187
	const on = (ee: NodeJS.EventEmitter, name: string, fn: (...args: any[]) => void) => {
J
Joao Moreno 已提交
188 189 190 191
		ee.on(name, fn);
		disposables.push(toDisposable(() => ee.removeListener(name, fn)));
	};

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

J
Joao Moreno 已提交
218 219 220 221 222 223
				e(new GitError({ message: 'Cancelled' }));
			});
		});

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

J
Joao Moreno 已提交
225 226 227 228 229 230
	try {
		const [exitCode, stdout, stderr] = await result;
		return { exitCode, stdout, stderr };
	} finally {
		dispose(disposables);
	}
J
Joao Moreno 已提交
231 232 233 234 235 236 237 238 239 240 241 242 243 244
}

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

export class GitError {

J
Joao Moreno 已提交
245
	error?: Error;
J
Joao Moreno 已提交
246
	message: string;
J
Joao Moreno 已提交
247 248 249 250 251
	stdout?: string;
	stderr?: string;
	exitCode?: number;
	gitErrorCode?: string;
	gitCommand?: string;
J
Joao Moreno 已提交
252 253 254 255 256 257

	constructor(data: IGitErrorData) {
		if (data.error) {
			this.error = data.error;
			this.message = data.error.message;
		} else {
R
Rob Lourens 已提交
258
			this.error = undefined;
M
Matt Bierner 已提交
259
			this.message = '';
J
Joao Moreno 已提交
260 261 262
		}

		this.message = this.message || data.message || 'Git error';
J
Joao Moreno 已提交
263 264 265 266 267
		this.stdout = data.stdout;
		this.stderr = data.stderr;
		this.exitCode = data.exitCode;
		this.gitErrorCode = data.gitErrorCode;
		this.gitCommand = data.gitCommand;
J
Joao Moreno 已提交
268 269 270 271 272 273 274 275 276
	}

	toString(): string {
		let result = this.message + ' ' + JSON.stringify({
			exitCode: this.exitCode,
			gitErrorCode: this.gitErrorCode,
			gitCommand: this.gitCommand,
			stdout: this.stdout,
			stderr: this.stderr
277
		}, null, 2);
J
Joao Moreno 已提交
278 279 280 281 282 283 284 285 286 287 288 289

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

		return result;
	}
}

export interface IGitOptions {
	gitPath: string;
	version: string;
290
	env?: any;
J
Joao Moreno 已提交
291 292
}

293 294 295 296 297
function getGitErrorCode(stderr: string): string | undefined {
	if (/Another git process seems to be running in this repository|If no other git process is currently running/.test(stderr)) {
		return GitErrorCodes.RepositoryIsLocked;
	} else if (/Authentication failed/.test(stderr)) {
		return GitErrorCodes.AuthenticationFailed;
J
Joao Moreno 已提交
298
	} else if (/Not a git repository/i.test(stderr)) {
299 300 301 302 303 304 305 306 307
		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;
308 309
	} else if (/branch '.+' is not fully merged/.test(stderr)) {
		return GitErrorCodes.BranchNotFullyMerged;
310 311
	} else if (/Couldn\'t find remote ref/.test(stderr)) {
		return GitErrorCodes.NoRemoteReference;
312 313 314 315
	} 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;
316 317
	} else if (/Please,? commit your changes or stash them/.test(stderr)) {
		return GitErrorCodes.DirtyWorkTree;
318 319
	}

R
Rob Lourens 已提交
320
	return undefined;
321 322
}

323 324
const COMMIT_FORMAT = '%H\n%ae\n%P\n%B';

J
Joao Moreno 已提交
325 326
export class Git {

J
Joao Moreno 已提交
327
	readonly path: string;
328
	private env: any;
J
Joao Moreno 已提交
329

330 331
	private _onOutput = new EventEmitter();
	get onOutput(): EventEmitter { return this._onOutput; }
J
Joao Moreno 已提交
332

J
Joao Moreno 已提交
333
	constructor(options: IGitOptions) {
J
Joao Moreno 已提交
334
		this.path = options.gitPath;
335
		this.env = options.env || {};
J
Joao Moreno 已提交
336 337
	}

J
Joao Moreno 已提交
338 339
	open(repository: string, dotGit: string): Repository {
		return new Repository(this, repository, dotGit);
J
Joao Moreno 已提交
340 341
	}

J
Joao Moreno 已提交
342 343 344 345 346
	async init(repository: string): Promise<void> {
		await this.exec(repository, ['init']);
		return;
	}

J
Joao Moreno 已提交
347
	async clone(url: string, parentPath: string, progress: Progress<{ increment: number }>, cancellationToken?: CancellationToken): Promise<string> {
348
		let baseFolderName = decodeURI(url).replace(/[\/]+$/, '').replace(/^.*[\/\\]/, '').replace(/\.git$/, '') || 'repository';
349 350 351 352 353 354 355 356
		let folderName = baseFolderName;
		let folderPath = path.join(parentPath, folderName);
		let count = 1;

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

J
Joao Moreno 已提交
358
		await mkdirp(parentPath);
J
Joao Moreno 已提交
359

J
Joao Moreno 已提交
360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387
		const onSpawn = (child: cp.ChildProcess) => {
			const decoder = new StringDecoder('utf8');
			const lineStream = new byline.LineStream({ encoding: 'utf8' });
			child.stderr.on('data', (buffer: Buffer) => lineStream.write(decoder.write(buffer)));

			let totalProgress = 0;
			let previousProgress = 0;

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

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

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

J
Joao Moreno 已提交
388
		try {
J
Joao Moreno 已提交
389
			await this.exec(parentPath, ['clone', url.includes(' ') ? encodeURI(url) : url, folderPath, '--progress'], { cancellationToken, onSpawn });
J
Joao Moreno 已提交
390 391 392 393 394 395 396 397 398
		} 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 已提交
399 400 401
		return folderPath;
	}

J
Joao Moreno 已提交
402 403
	async getRepositoryRoot(repositoryPath: string): Promise<string> {
		const result = await this.exec(repositoryPath, ['rev-parse', '--show-toplevel']);
J
jeanp413 已提交
404 405
		// Keep trailing spaces which are part of the directory name
		return path.normalize(result.stdout.trimLeft().replace(/(\r\n|\r|\n)+$/, ''));
J
Joao Moreno 已提交
406 407
	}

J
Joao Moreno 已提交
408
	async getRepositoryDotGit(repositoryPath: string): Promise<string> {
409 410 411 412 413 414 415 416
		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 已提交
417 418
	}

J
Joao Moreno 已提交
419
	async exec(cwd: string, args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
J
Joao Moreno 已提交
420
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
421
		return await this._exec(args, options);
J
Joao Moreno 已提交
422 423
	}

J
Joao Moreno 已提交
424 425 426 427
	async exec2(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
		return await this._exec(args, options);
	}

J
Joao Moreno 已提交
428
	stream(cwd: string, args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
429
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
430
		return this.spawn(args, options);
J
Joao Moreno 已提交
431 432
	}

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

J
Joao Moreno 已提交
436 437 438 439
		if (options.onSpawn) {
			options.onSpawn(child);
		}

J
Joao Moreno 已提交
440 441 442 443
		if (options.input) {
			child.stdin.end(options.input, 'utf8');
		}

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

J
Joao Moreno 已提交
446 447
		if (options.log !== false && bufferResult.stderr.length > 0) {
			this.log(`${bufferResult.stderr}\n`);
J
Joao Moreno 已提交
448 449
		}

J
Joao Moreno 已提交
450 451 452 453 454 455 456 457 458 459 460
		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 已提交
461 462 463 464
				message: 'Failed to execute git',
				stdout: result.stdout,
				stderr: result.stderr,
				exitCode: result.exitCode,
465
				gitErrorCode: getGitErrorCode(result.stderr),
J
Joao Moreno 已提交
466 467 468 469 470
				gitCommand: args[0]
			}));
		}

		return result;
J
Joao Moreno 已提交
471 472
	}

J
Joao Moreno 已提交
473
	spawn(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
474
		if (!this.path) {
J
Joao Moreno 已提交
475 476 477 478 479 480 481 482 483 484 485
			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
		}

486
		options.env = assign({}, process.env, this.env, options.env || {}, {
J
Joao Moreno 已提交
487
			VSCODE_GIT_COMMAND: args[0],
488
			LC_ALL: 'en_US.UTF-8',
J
Joao Moreno 已提交
489 490
			LANG: 'en_US.UTF-8'
		});
J
Joao Moreno 已提交
491 492

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

J
Joao Moreno 已提交
496
		return cp.spawn(this.path, args, options);
J
Joao Moreno 已提交
497 498 499
	}

	private log(output: string): void {
500
		this._onOutput.emit('log', output);
J
Joao Moreno 已提交
501
	}
J
Joao Moreno 已提交
502 503
}

J
Joao Moreno 已提交
504
export interface Commit {
J
Joao Moreno 已提交
505 506
	hash: string;
	message: string;
J
Joao Moreno 已提交
507
	parents: string[];
508
	authorEmail?: string | undefined;
J
Joao Moreno 已提交
509 510
}

511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548
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 已提交
549
		if (entry.x === 'R' || entry.x === 'C') {
550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576
			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;
	}
}

577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610
export interface Submodule {
	name: string;
	path: string;
	url: string;
}

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

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

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

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

			const name = sectionMatch[1];

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

		if (!submodule) {
			return;
		}

J
Joao Moreno 已提交
611
		const propertyMatch = /^\s*(\w+)\s+=\s+(.*)$/.exec(line);
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 638

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

639
export function parseGitCommit(raw: string): Commit | null {
J
Joao Moreno 已提交
640
	const match = /^([0-9a-f]{40})\n(.*)\n(.*)(\n([^]*))?$/m.exec(raw.trim());
641 642 643 644
	if (!match) {
		return null;
	}

645
	const parents = match[3] ? match[3].split(' ') : [];
J
Joao Moreno 已提交
646
	return { hash: match[1], message: match[5], parents, authorEmail: match[2] };
647 648
}

649 650 651 652
interface LsTreeElement {
	mode: string;
	type: string;
	object: string;
J
Joao Moreno 已提交
653
	size: string;
654 655 656 657 658 659
	file: string;
}

export function parseLsTree(raw: string): LsTreeElement[] {
	return raw.split('\n')
		.filter(l => !!l)
J
Joao Moreno 已提交
660
		.map(line => /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/.exec(line)!)
661
		.filter(m => !!m)
J
Joao Moreno 已提交
662
		.map(([, mode, type, object, size, file]) => ({ mode, type, object, size, file }));
663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679
}

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

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

J
Joao Moreno 已提交
680
export interface CommitOptions {
J
Joao Moreno 已提交
681
	all?: boolean | 'tracked';
J
Joao Moreno 已提交
682 683 684 685 686 687
	amend?: boolean;
	signoff?: boolean;
	signCommit?: boolean;
	empty?: boolean;
}

688 689
export interface PullOptions {
	unshallow?: boolean;
J
Joao Moreno 已提交
690
	tags?: boolean;
691
	readonly cancellationToken?: CancellationToken;
692 693
}

J
Joao Moreno 已提交
694 695
export enum ForcePushMode {
	Force,
J
Joao Moreno 已提交
696
	ForceWithLease
J
Joao Moreno 已提交
697 698
}

J
Joao Moreno 已提交
699 700 701 702
export class Repository {

	constructor(
		private _git: Git,
J
Joao Moreno 已提交
703 704
		private repositoryRoot: string,
		readonly dotGit: string
J
Joao Moreno 已提交
705 706 707 708 709 710
	) { }

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

J
Joao Moreno 已提交
711 712
	get root(): string {
		return this.repositoryRoot;
J
Joao Moreno 已提交
713 714 715
	}

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

J
Joao Moreno 已提交
720
	stream(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
721
		return this.git.stream(this.repositoryRoot, args, options);
J
Joao Moreno 已提交
722 723
	}

J
Joao Moreno 已提交
724
	spawn(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
725 726 727
		return this.git.spawn(args, options);
	}

J
Joao Moreno 已提交
728
	async config(scope: string, key: string, value: any = null, options: SpawnOptions = {}): Promise<string> {
J
Joao Moreno 已提交
729 730 731 732 733 734 735 736 737 738 739 740 741
		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 已提交
742
		return result.stdout.trim();
J
Joao Moreno 已提交
743 744
	}

J
Joao Moreno 已提交
745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762
	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) };
		});
	}

763 764 765
	async log(options?: LogOptions): Promise<Commit[]> {
		const maxEntries = options && typeof options.maxEntries === 'number' && options.maxEntries > 0 ? options.maxEntries : 32;
		const args = ['log', '-' + maxEntries, `--pretty=format:${COMMIT_FORMAT}%x00%x00`];
766 767 768 769 770 771
		const gitResult = await this.run(args);
		if (gitResult.exitCode) {
			// An empty repo.
			return [];
		}

772
		const s = gitResult.stdout;
773
		const result: Commit[] = [];
774 775 776 777 778 779 780 781
		let index = 0;
		while (index < s.length) {
			let nextIndex = s.indexOf('\x00\x00', index);
			if (nextIndex === -1) {
				nextIndex = s.length;
			}

			let entry = s.substr(index, nextIndex - index);
782 783 784
			if (entry.startsWith('\n')) {
				entry = entry.substring(1);
			}
785

786 787 788 789 790 791
			const commit = parseGitCommit(entry);
			if (!commit) {
				break;
			}

			result.push(commit);
792
			index = nextIndex + 2;
793 794 795 796 797
		}

		return result;
	}

798
	async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false): Promise<string> {
J
Joao Moreno 已提交
799
		const stdout = await this.buffer(object);
800 801 802 803 804

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

J
Joao Moreno 已提交
805 806 807
		encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';

		return iconv.decode(stdout, encoding);
J
Joao Moreno 已提交
808 809 810
	}

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

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

817
		const { exitCode, stdout, stderr } = await exec(child);
J
Joao Moreno 已提交
818 819

		if (exitCode) {
820
			const err = new GitError({
J
Joao Moreno 已提交
821 822
				message: 'Could not show object.',
				exitCode
823 824 825 826 827 828 829
			});

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

			return Promise.reject<Buffer>(err);
J
Joao Moreno 已提交
830 831 832
		}

		return stdout;
J
Joao Moreno 已提交
833 834
	}

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

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

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

J
Joao Moreno 已提交
847
			return { mode, object, size };
J
Joao Moreno 已提交
848 849
		}

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

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

J
Joao Moreno 已提交
856
		const { mode, object, size } = elements[0];
J
Joao Moreno 已提交
857
		return { mode, object, size: parseInt(size) };
J
Joao Moreno 已提交
858 859
	}

J
Joao Moreno 已提交
860 861
	async lstree(treeish: string, path: string): Promise<LsTreeElement[]> {
		const { stdout } = await this.run(['ls-tree', '-l', treeish, '--', path]);
862 863
		return parseLsTree(stdout);
	}
864

865 866 867
	async lsfiles(path: string): Promise<LsFilesElement[]> {
		const { stdout } = await this.run(['ls-files', '--stage', '--', path]);
		return parseLsFiles(stdout);
868 869
	}

J
Joao Moreno 已提交
870
	async getGitRelativePath(ref: string, relativePath: string): Promise<string> {
871 872
		const relativePathLowercase = relativePath.toLowerCase();
		const dirname = path.posix.dirname(relativePath) + '/';
J
Joao Moreno 已提交
873
		const elements: { file: string; }[] = ref ? await this.lstree(ref, dirname) : await this.lsfiles(dirname);
874 875 876 877
		const element = elements.filter(file => file.file.toLowerCase() === relativePathLowercase)[0];

		if (!element) {
			throw new GitError({ message: 'Git relative path not found.' });
878
		}
879 880

		return element.file;
881 882
	}

J
Joao Moreno 已提交
883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922
	async detectObjectType(object: string): Promise<{ mimetype: string, encoding?: string }> {
		const child = await this.stream(['show', object]);
		const buffer = await readBytes(child.stdout, 4100);

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

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

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

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

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

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

923 924 925 926 927 928 929
	async apply(patch: string, reverse?: boolean): Promise<void> {
		const args = ['apply', patch];

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

930 931 932 933 934 935 936 937 938
		try {
			await this.run(args);
		} catch (err) {
			if (/patch does not apply/.test(err.stderr)) {
				err.gitErrorCode = GitErrorCodes.PatchDoesNotApply;
			}

			throw err;
		}
939 940 941
	}

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

J
Joao Moreno 已提交
944
		if (cached) {
945 946 947 948 949 950 951
			args.push('--cached');
		}

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

952 953 954 955
	diffWithHEAD(): Promise<Change[]>;
	diffWithHEAD(path: string): Promise<string>;
	diffWithHEAD(path?: string | undefined): Promise<string | Change[]>;
	async diffWithHEAD(path?: string | undefined): Promise<string | Change[]> {
956 957 958 959
		if (!path) {
			return await this.diffFiles(false);
		}

J
Joao Moreno 已提交
960 961 962 963 964
		const args = ['diff', '--', path];
		const result = await this.run(args);
		return result.stdout;
	}

965 966 967
	diffWith(ref: string): Promise<Change[]>;
	diffWith(ref: string, path: string): Promise<string>;
	diffWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
968 969 970 971 972
	async diffWith(ref: string, path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(false, ref);
		}

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

978 979 980
	diffIndexWithHEAD(): Promise<Change[]>;
	diffIndexWithHEAD(path: string): Promise<string>;
	diffIndexWithHEAD(path?: string | undefined): Promise<string | Change[]>;
981 982 983 984 985
	async diffIndexWithHEAD(path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(true);
		}

J
Joao Moreno 已提交
986 987 988 989 990
		const args = ['diff', '--cached', '--', path];
		const result = await this.run(args);
		return result.stdout;
	}

991 992 993
	diffIndexWith(ref: string): Promise<Change[]>;
	diffIndexWith(ref: string, path: string): Promise<string>;
	diffIndexWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
994 995 996 997 998
	async diffIndexWith(ref: string, path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(true, ref);
		}

J
Joao Moreno 已提交
999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009
		const args = ['diff', '--cached', ref, '--', path];
		const result = await this.run(args);
		return result.stdout;
	}

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

1010 1011 1012
	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[]>;
1013 1014 1015 1016 1017 1018 1019
	async diffBetween(ref1: string, ref2: string, path?: string): Promise<string | Change[]> {
		const range = `${ref1}...${ref2}`;
		if (!path) {
			return await this.diffFiles(false, range);
		}

		const args = ['diff', range, '--', path];
J
Joao Moreno 已提交
1020 1021 1022 1023 1024
		const result = await this.run(args);

		return result.stdout.trim();
	}

1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051
	private async diffFiles(cached: boolean, ref?: string): Promise<Change[]> {
		const args = ['diff', '--name-status', '-z', '--diff-filter=ADMR'];
		if (cached) {
			args.push('--cached');
		}

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

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

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

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

J
Joao Moreno 已提交
1052
			const originalUri = URI.file(path.isAbsolute(resourcePath) ? resourcePath : path.join(this.repositoryRoot, resourcePath));
1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079
			let status: Status = Status.UNTRACKED;

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

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

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

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

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

J
Joao Moreno 已提交
1080
					const uri = URI.file(path.isAbsolute(newPath) ? newPath : path.join(this.repositoryRoot, newPath));
1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105
					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 已提交
1106 1107 1108 1109 1110 1111 1112
	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 已提交
1113 1114 1115 1116 1117 1118 1119
	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 已提交
1120 1121 1122 1123 1124 1125 1126 1127 1128 1129
	async add(paths: string[], opts?: { update?: boolean }): Promise<void> {
		const args = ['add'];

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

		args.push('--');
J
Joao Moreno 已提交
1130 1131 1132 1133 1134 1135 1136 1137 1138 1139

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

		await this.run(args);
	}

J
Joao Moreno 已提交
1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151
	async rm(paths: string[]): Promise<void> {
		const args = ['rm', '--'];

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

		args.push(...paths);

		await this.run(args);
	}

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

		const { exitCode, stdout } = await exec(child);
J
Joao Moreno 已提交
1157
		const hash = stdout.toString('utf8');
J
Joao Moreno 已提交
1158 1159 1160 1161 1162 1163 1164 1165

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

J
Joao Moreno 已提交
1166
		let mode: string;
D
Darrien Singleton 已提交
1167
		let add: string = '';
J
Joao Moreno 已提交
1168 1169

		try {
J
Joao Moreno 已提交
1170
			const details = await this.getObjectDetails('HEAD', path);
J
Joao Moreno 已提交
1171 1172
			mode = details.mode;
		} catch (err) {
J
Joao Moreno 已提交
1173 1174 1175 1176
			if (err.gitErrorCode !== GitErrorCodes.UnknownPath) {
				throw err;
			}

J
Joao Moreno 已提交
1177
			mode = '100644';
D
Darrien Singleton 已提交
1178
			add = '--add';
J
Joao Moreno 已提交
1179 1180
		}

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

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

1187 1188 1189 1190
		if (opts.track) {
			args.push('--track');
		}

J
Joao Moreno 已提交
1191 1192 1193 1194 1195
		if (treeish) {
			args.push(treeish);
		}

		try {
J
Joao Moreno 已提交
1196 1197 1198 1199 1200 1201 1202
			if (paths && paths.length > 0) {
				for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {
					await this.run([...args, '--', ...chunk]);
				}
			} else {
				await this.run(args);
			}
J
Joao Moreno 已提交
1203
		} catch (err) {
J
Joao Moreno 已提交
1204
			if (/Please,? commit your changes or stash them/.test(err.stderr || '')) {
J
Joao Moreno 已提交
1205 1206 1207 1208 1209 1210 1211
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
			}

			throw err;
		}
	}

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

J
Joao Moreno 已提交
1215
		if (opts.all) {
J
Joao Moreno 已提交
1216 1217 1218
			args.push('--all');
		}

J
Joao Moreno 已提交
1219
		if (opts.amend) {
J
Joao Moreno 已提交
1220 1221 1222
			args.push('--amend');
		}

J
Joao Moreno 已提交
1223
		if (opts.signoff) {
J
Joao Moreno 已提交
1224 1225 1226
			args.push('--signoff');
		}

1227 1228 1229
		if (opts.signCommit) {
			args.push('-S');
		}
T
Tom Basche 已提交
1230 1231 1232
		if (opts.empty) {
			args.push('--allow-empty');
		}
1233

J
Joao Moreno 已提交
1234 1235 1236
		try {
			await this.run(args, { input: message || '' });
		} catch (commitErr) {
1237 1238 1239
			await this.handleCommitError(commitErr);
		}
	}
J
Joao Moreno 已提交
1240

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

1244 1245 1246 1247 1248 1249
		try {
			await this.run(args);
		} catch (commitErr) {
			await this.handleCommitError(commitErr);
		}
	}
J
Joao Moreno 已提交
1250

1251 1252 1253
	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 已提交
1254 1255
			throw commitErr;
		}
1256 1257

		try {
J
Joao Moreno 已提交
1258 1259 1260 1261 1262
			await this.run(['config', '--get-all', 'user.name']);
		} catch (err) {
			err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
			throw err;
		}
1263 1264

		try {
J
Joao Moreno 已提交
1265 1266 1267 1268
			await this.run(['config', '--get-all', 'user.email']);
		} catch (err) {
			err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
			throw err;
1269 1270 1271
		}

		throw commitErr;
J
Joao Moreno 已提交
1272 1273
	}

J
Joao Moreno 已提交
1274
	async branch(name: string, checkout: boolean, ref?: string): Promise<void> {
J
Joao Moreno 已提交
1275
		const args = checkout ? ['checkout', '-q', '-b', name, '--no-track'] : ['branch', '-q', name];
J
Joao Moreno 已提交
1276 1277 1278 1279 1280

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

J
Joao Moreno 已提交
1281 1282 1283
		await this.run(args);
	}

1284 1285
	async deleteBranch(name: string, force?: boolean): Promise<void> {
		const args = ['branch', force ? '-D' : '-d', name];
M
Maik Riechert 已提交
1286 1287 1288
		await this.run(args);
	}

1289 1290 1291 1292 1293
	async renameBranch(name: string): Promise<void> {
		const args = ['branch', '-m', name];
		await this.run(args);
	}

J
Joao Moreno 已提交
1294 1295 1296 1297 1298
	async setBranchUpstream(name: string, upstream: string): Promise<void> {
		const args = ['branch', '--set-upstream-to', upstream, name];
		await this.run(args);
	}

1299 1300 1301 1302 1303
	async deleteRef(ref: string): Promise<void> {
		const args = ['update-ref', '-d', ref];
		await this.run(args);
	}

J
Joao Moreno 已提交
1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315
	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;
		}
1316 1317
	}

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

J
Joao Moreno 已提交
1321 1322
		if (message) {
			args = [...args, '-a', name, '-m', message];
1323
		} else {
J
Joao Moreno 已提交
1324
			args = [...args, name];
1325 1326 1327 1328 1329
		}

		await this.run(args);
	}

X
Xhulio Hasani 已提交
1330 1331 1332 1333 1334
	async deleteTag(name: string): Promise<void> {
		let args = ['tag', '-d', name];
		await this.run(args);
	}

J
Joao Moreno 已提交
1335
	async clean(paths: string[]): Promise<void> {
J
Joao Moreno 已提交
1336 1337
		const pathsByGroup = groupBy(paths, p => path.dirname(p));
		const groups = Object.keys(pathsByGroup).map(k => pathsByGroup[k]);
J
Joao Moreno 已提交
1338

J
Joao Moreno 已提交
1339 1340 1341 1342 1343 1344 1345
		const limiter = new Limiter(5);
		const promises: Promise<any>[] = [];

		for (const paths of groups) {
			for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {
				promises.push(limiter.queue(() => this.run(['clean', '-f', '-q', '--', ...chunk])));
			}
J
Joao Moreno 已提交
1346
		}
J
Joao Moreno 已提交
1347 1348

		await Promise.all(promises);
J
Joao Moreno 已提交
1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365
	}

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

J
Joao Moreno 已提交
1370
	async revert(treeish: string, paths: string[]): Promise<void> {
J
Joao Moreno 已提交
1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399
		const result = await this.run(['branch']);
		let args: string[];

		// In case there are no branches, we must use rm --cached
		if (!result.stdout) {
			args = ['rm', '--cached', '-r', '--'];
		} else {
			args = ['reset', '-q', treeish, '--'];
		}

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

		try {
			await this.run(args);
		} catch (err) {
			// In case there are merge conflicts to be resolved, git reset will output
			// some "needs merge" data. We try to get around that.
			if (/([^:]+: needs merge\n)+/m.test(err.stdout || '')) {
				return;
			}

			throw err;
		}
	}

J
Joao Moreno 已提交
1400 1401 1402 1403 1404
	async addRemote(name: string, url: string): Promise<void> {
		const args = ['remote', 'add', name, url];
		await this.run(args);
	}

J
Joao Moreno 已提交
1405 1406 1407 1408 1409
	async removeRemote(name: string): Promise<void> {
		const args = ['remote', 'rm', name];
		await this.run(args);
	}

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

J
Joao Moreno 已提交
1414 1415
		if (options.remote) {
			args.push(options.remote);
J
Joao Moreno 已提交
1416

J
Joao Moreno 已提交
1417 1418
			if (options.ref) {
				args.push(options.ref);
J
Joao Moreno 已提交
1419
			}
J
Joao Moreno 已提交
1420 1421
		} else if (options.all) {
			args.push('--all');
J
Joao Moreno 已提交
1422 1423
		}

R
Ryan Scott 已提交
1424
		if (options.prune) {
R
Ryan Scott 已提交
1425
			args.push('--prune');
R
Ryan Scott 已提交
1426 1427
		}

1428
		if (typeof options.depth === 'number') {
1429 1430
			args.push(`--depth=${options.depth}`);
		}
R
Ryan Scott 已提交
1431

J
Joao Moreno 已提交
1432 1433 1434 1435
		if (options.silent) {
			spawnOptions.env = { 'VSCODE_GIT_FETCH_SILENT': 'true' };
		}

J
Joao Moreno 已提交
1436
		try {
J
Joao Moreno 已提交
1437
			await this.run(args, spawnOptions);
J
Joao Moreno 已提交
1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448
		} 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;
		}
	}

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

J
Joao Moreno 已提交
1452
		if (options.tags) {
H
Hao Hu 已提交
1453 1454
			args.push('--tags');
		}
1455 1456 1457 1458

		if (options.unshallow) {
			args.push('--unshallow');
		}
J
Joao Moreno 已提交
1459 1460 1461 1462 1463

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

M
Matt Shirley 已提交
1464
		if (remote && branch) {
1465
			args.push(remote);
M
Matt Shirley 已提交
1466
			args.push(branch);
1467 1468
		}

J
Joao Moreno 已提交
1469
		try {
1470
			await this.run(args, options);
J
Joao Moreno 已提交
1471 1472 1473 1474 1475 1476 1477
		} 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 已提交
1478 1479
			} 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 已提交
1480
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
J
Joao Moreno 已提交
1481 1482 1483 1484
			} 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 已提交
1485 1486 1487 1488 1489 1490
			}

			throw err;
		}
	}

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

J
Joao Moreno 已提交
1494 1495 1496 1497
		if (forcePushMode === ForcePushMode.ForceWithLease) {
			args.push('--force-with-lease');
		} else if (forcePushMode === ForcePushMode.Force) {
			args.push('--force');
1498 1499
		}

J
Joao Moreno 已提交
1500
		if (setUpstream) {
J
Joao Moreno 已提交
1501 1502 1503
			args.push('-u');
		}

1504
		if (tags) {
1505
			args.push('--follow-tags');
J
Joao Moreno 已提交
1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522
		}

		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;
1523 1524
			} else if (/^fatal: The current branch .* has no upstream branch/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoUpstreamBranch;
J
Joao Moreno 已提交
1525 1526 1527 1528 1529 1530
			}

			throw err;
		}
	}

R
rebornix 已提交
1531 1532 1533 1534 1535 1536 1537 1538 1539
	async blame(path: string): Promise<string> {
		try {
			const args = ['blame'];
			args.push(path);

			let result = await this.run(args);

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

R
rebornix 已提交
1544 1545 1546 1547
			throw err;
		}
	}

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

1552 1553 1554 1555
			if (includeUntracked) {
				args.push('-u');
			}

J
Joao Moreno 已提交
1556
			if (message) {
J
Joao Moreno 已提交
1557
				args.push('-m', message);
1558 1559 1560 1561 1562 1563 1564
			}

			await this.run(args);
		} catch (err) {
			if (/No local changes to save/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoLocalChanges;
			}
J
Joao Moreno 已提交
1565 1566 1567 1568 1569 1570

			throw err;
		}
	}

	async popStash(index?: number): Promise<void> {
1571
		const args = ['stash', 'pop'];
J
Joao Moreno 已提交
1572
		await this.popOrApplyStash(args, index);
1573 1574 1575 1576
	}

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

1580 1581
	private async popOrApplyStash(args: string[], index?: number): Promise<void> {
		try {
1582
			if (typeof index === 'number') {
J
Joao Moreno 已提交
1583
				args.push(`stash@{${index}}`);
1584
			}
J
Joao Moreno 已提交
1585 1586 1587 1588 1589 1590

			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 || '')) {
1591
				err.gitErrorCode = GitErrorCodes.LocalChangesOverwritten;
J
Joao Moreno 已提交
1592 1593
			} else if (/^CONFLICT/m.test(err.stdout || '')) {
				err.gitErrorCode = GitErrorCodes.StashConflict;
1594
			}
J
Joao Moreno 已提交
1595

1596 1597 1598 1599
			throw err;
		}
	}

1600 1601
	getStatus(limit = 5000): Promise<{ status: IFileStatus[]; didHitLimit: boolean; }> {
		return new Promise<{ status: IFileStatus[]; didHitLimit: boolean; }>((c, e) => {
1602
			const parser = new GitStatusParser();
J
Joao Moreno 已提交
1603 1604
			const env = { GIT_OPTIONAL_LOCKS: '0' };
			const child = this.stream(['status', '-z', '-u'], { env });
1605

M
Matt Bierner 已提交
1606
			const onExit = (exitCode: number) => {
1607
				if (exitCode !== 0) {
1608 1609 1610 1611 1612 1613 1614 1615
					const stderr = stderrData.join('');
					return e(new GitError({
						message: 'Failed to execute git',
						stderr,
						exitCode,
						gitErrorCode: getGitErrorCode(stderr),
						gitCommand: 'status'
					}));
1616
				}
J
Joao Moreno 已提交
1617

1618 1619 1620
				c({ status: parser.status, didHitLimit: false });
			};

1621
			const onStdoutData = (raw: string) => {
1622 1623
				parser.update(raw);

J
Joao Moreno 已提交
1624
				if (parser.status.length > limit) {
1625
					child.removeListener('exit', onExit);
1626
					child.stdout.removeListener('data', onStdoutData);
1627 1628
					child.kill();

J
Joao Moreno 已提交
1629
					c({ status: parser.status.slice(0, limit), didHitLimit: true });
1630 1631 1632 1633
				}
			};

			child.stdout.setEncoding('utf8');
1634 1635 1636 1637 1638 1639
			child.stdout.on('data', onStdoutData);

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

J
Joao Moreno 已提交
1640
			child.on('error', cpErrorHandler(e));
1641
			child.on('exit', onExit);
1642
		});
J
Joao Moreno 已提交
1643 1644
	}

J
Joao Moreno 已提交
1645
	async getHEAD(): Promise<Ref> {
J
Joao Moreno 已提交
1646
		try {
J
Joao Moreno 已提交
1647
			const result = await this.run(['symbolic-ref', '--short', 'HEAD']);
J
Joao Moreno 已提交
1648 1649 1650 1651 1652

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

R
Rob Lourens 已提交
1653
			return { name: result.stdout.trim(), commit: undefined, type: RefType.Head };
J
Joao Moreno 已提交
1654
		} catch (err) {
J
Joao Moreno 已提交
1655
			const result = await this.run(['rev-parse', 'HEAD']);
J
Joao Moreno 已提交
1656 1657 1658 1659 1660

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

R
Rob Lourens 已提交
1661
			return { name: undefined, commit: result.stdout.trim(), type: RefType.Head };
J
Joao Moreno 已提交
1662 1663 1664
		}
	}

J
Joao Moreno 已提交
1665 1666
	async findTrackingBranches(upstreamBranch: string): Promise<Branch[]> {
		const result = await this.run(['for-each-ref', '--format', '%(refname:short)%00%(upstream:short)', 'refs/heads']);
1667
		return result.stdout.trim().split('\n')
J
Joao Moreno 已提交
1668 1669 1670
			.map(line => line.trim().split('\0'))
			.filter(([_, upstream]) => upstream === upstreamBranch)
			.map(([ref]) => ({ name: ref, type: RefType.Head } as Branch));
1671 1672
	}

J
Joao Moreno 已提交
1673
	async getRefs(opts?: { sort?: 'alphabetically' | 'committerdate' }): Promise<Ref[]> {
S
skprabhanjan 已提交
1674 1675
		const args = ['for-each-ref', '--format', '%(refname) %(objectname)'];

J
Joao Moreno 已提交
1676
		if (opts && opts.sort && opts.sort !== 'alphabetically') {
1677
			args.push('--sort', `-${opts.sort}`);
S
skprabhanjan 已提交
1678 1679 1680
		}

		const result = await this.run(args);
J
Joao Moreno 已提交
1681

M
Matt Bierner 已提交
1682
		const fn = (line: string): Ref | null => {
J
Joao Moreno 已提交
1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698
			let match: RegExpExecArray | null;

			if (match = /^refs\/heads\/([^ ]+) ([0-9a-f]{40})$/.exec(line)) {
				return { name: match[1], commit: match[2], type: RefType.Head };
			} else if (match = /^refs\/remotes\/([^/]+)\/([^ ]+) ([0-9a-f]{40})$/.exec(line)) {
				return { name: `${match[1]}/${match[2]}`, commit: match[3], type: RefType.RemoteHead, remote: match[1] };
			} else if (match = /^refs\/tags\/([^ ]+) ([0-9a-f]{40})$/.exec(line)) {
				return { name: match[1], commit: match[2], type: RefType.Tag };
			}

			return null;
		};

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

1702 1703
	async getStashes(): Promise<Stash[]> {
		const result = await this.run(['stash', 'list']);
J
Joao Moreno 已提交
1704
		const regex = /^stash@{(\d+)}:(.+)$/;
1705 1706
		const rawStashes = result.stdout.trim().split('\n')
			.filter(b => !!b)
M
Matt Bierner 已提交
1707
			.map(line => regex.exec(line) as RegExpExecArray)
1708
			.filter(g => !!g)
J
Joao Moreno 已提交
1709
			.map(([, index, description]: RegExpExecArray) => ({ index: parseInt(index), description }));
1710

J
Joao Moreno 已提交
1711 1712
		return rawStashes;
	}
1713

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

1719 1720
		for (const line of lines) {
			const parts = line.split(/\s/);
J
Joao Moreno 已提交
1721 1722 1723 1724
			const [name, url, type] = parts;

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

1725
			if (!remote) {
J
Joao Moreno 已提交
1726
				remote = { name, isReadOnly: false };
1727 1728 1729
				remotes.push(remote);
			}

J
Joao Moreno 已提交
1730 1731 1732 1733 1734 1735 1736
			if (/fetch/i.test(type)) {
				remote.fetchUrl = url;
			} else if (/push/i.test(type)) {
				remote.pushUrl = url;
			} else {
				remote.fetchUrl = url;
				remote.pushUrl = url;
1737 1738 1739
			}

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

1743
		return remotes;
J
Joao Moreno 已提交
1744 1745
	}

J
Joao Moreno 已提交
1746
	async getBranch(name: string): Promise<Branch> {
J
Joao Moreno 已提交
1747 1748 1749 1750
		if (name === 'HEAD') {
			return this.getHEAD();
		}

1751 1752 1753 1754 1755 1756 1757 1758
		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 已提交
1759 1760

		if (!result.stdout) {
J
Joao Moreno 已提交
1761
			return Promise.reject<Branch>(new Error('No such branch'));
J
Joao Moreno 已提交
1762 1763 1764 1765 1766
		}

		const commit = result.stdout.trim();

		try {
J
Joao Moreno 已提交
1767 1768 1769 1770 1771 1772 1773
			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 已提交
1774

J
Joao Moreno 已提交
1775 1776
			const upstream = { remote: match[1], name: match[2] };
			const res3 = await this.run(['rev-list', '--left-right', name + '...' + fullUpstream]);
J
Joao Moreno 已提交
1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796

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

1797 1798 1799 1800 1801 1802 1803 1804
	cleanupCommitEditMessage(message: string): string {
		//TODO: Support core.commentChar
		return message.replace(/^\s*#.*$\n?/gm, '').trim();
	}


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

1806 1807 1808
		try {
			const raw = await readfile(mergeMsgPath, 'utf8');
			return raw.trim();
J
Joao Moreno 已提交
1809
		} catch {
1810 1811 1812 1813
			return undefined;
		}
	}

J
Joao Moreno 已提交
1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827
	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 已提交
1828
				templatePath = path.join(this.repositoryRoot, templatePath);
J
Joao Moreno 已提交
1829 1830 1831
			}

			const raw = await readfile(templatePath, 'utf8');
1832
			return raw.trim();
J
Joao Moreno 已提交
1833 1834 1835 1836 1837 1838

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

J
Joao Moreno 已提交
1839
	async getCommit(ref: string): Promise<Commit> {
1840
		const result = await this.run(['show', '-s', `--format=${COMMIT_FORMAT}`, ref]);
1841
		return parseGitCommit(result.stdout) || Promise.reject<Commit>('bad commit format');
J
Joao Moreno 已提交
1842
	}
1843 1844

	async updateSubmodules(paths: string[]): Promise<void> {
J
Joao Moreno 已提交
1845 1846 1847 1848 1849
		const args = ['submodule', 'update', '--'];

		for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {
			await this.run([...args, ...chunk]);
		}
1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865
	}

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

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

			throw err;
		}
	}
1866
}