git.ts 44.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';
14
import { assign, groupBy, denodeify, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent } from './util';
15
import { CancellationToken, Uri } from 'vscode';
J
Joao Moreno 已提交
16
import { detectEncoding } from './encoding';
17
import { Ref, RefType, Branch, Remote, GitErrorCodes, LogOptions, Change, Status } from './api/git';
J
Joao Moreno 已提交
18

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

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

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

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

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

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

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

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

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

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

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

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

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

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

110 111 112 113 114
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 已提交
115 116
function findGitWin32(onLookup: (path: string) => void): Promise<IGit> {
	return findSystemGitWin32(process.env['ProgramW6432'] as string, onLookup)
R
Rob Lourens 已提交
117 118 119 120
		.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 已提交
121 122
}

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

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

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

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

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

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

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

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

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

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

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

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

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

export class GitError {

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

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

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

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

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

		return result;
	}
}

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

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

R
Rob Lourens 已提交
311
	return undefined;
312 313
}

314 315
const COMMIT_FORMAT = '%H\n%ae\n%P\n%B';

J
Joao Moreno 已提交
316 317
export class Git {

J
Joao Moreno 已提交
318
	readonly path: string;
319
	private env: any;
J
Joao Moreno 已提交
320

321 322
	private _onOutput = new EventEmitter();
	get onOutput(): EventEmitter { return this._onOutput; }
J
Joao Moreno 已提交
323

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

329 330
	open(repository: string): Repository {
		return new Repository(this, repository);
J
Joao Moreno 已提交
331 332
	}

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

J
Joao Moreno 已提交
338
	async clone(url: string, parentPath: string, cancellationToken?: CancellationToken): Promise<string> {
339 340 341 342 343 344 345 346 347
		let baseFolderName = decodeURI(url).replace(/^.*\//, '').replace(/\.git$/, '') || 'repository';
		let folderName = baseFolderName;
		let folderPath = path.join(parentPath, folderName);
		let count = 1;

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

J
Joao Moreno 已提交
349
		await mkdirp(parentPath);
J
Joao Moreno 已提交
350 351

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

J
Joao Moreno 已提交
365 366 367
	async getRepositoryRoot(repositoryPath: string): Promise<string> {
		const result = await this.exec(repositoryPath, ['rev-parse', '--show-toplevel']);
		return path.normalize(result.stdout.trim());
J
Joao Moreno 已提交
368 369
	}

J
Joao Moreno 已提交
370
	async exec(cwd: string, args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
J
Joao Moreno 已提交
371
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
372
		return await this._exec(args, options);
J
Joao Moreno 已提交
373 374
	}

J
Joao Moreno 已提交
375 376 377 378
	async exec2(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
		return await this._exec(args, options);
	}

J
Joao Moreno 已提交
379
	stream(cwd: string, args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
380
		options = assign({ cwd }, options || {});
J
Joao Moreno 已提交
381
		return this.spawn(args, options);
J
Joao Moreno 已提交
382 383
	}

J
Joao Moreno 已提交
384
	private async _exec(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
J
Joao Moreno 已提交
385
		const child = this.spawn(args, options);
J
Joao Moreno 已提交
386 387 388 389 390

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

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

J
Joao Moreno 已提交
393 394
		if (options.log !== false && bufferResult.stderr.length > 0) {
			this.log(`${bufferResult.stderr}\n`);
J
Joao Moreno 已提交
395 396
		}

J
Joao Moreno 已提交
397 398 399 400 401 402 403 404 405 406 407
		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 已提交
408 409 410 411
				message: 'Failed to execute git',
				stdout: result.stdout,
				stderr: result.stderr,
				exitCode: result.exitCode,
412
				gitErrorCode: getGitErrorCode(result.stderr),
J
Joao Moreno 已提交
413 414 415 416 417
				gitCommand: args[0]
			}));
		}

		return result;
J
Joao Moreno 已提交
418 419
	}

J
Joao Moreno 已提交
420
	spawn(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
421
		if (!this.path) {
J
Joao Moreno 已提交
422 423 424 425 426 427 428 429 430 431 432
			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
		}

433
		options.env = assign({}, process.env, this.env, options.env || {}, {
J
Joao Moreno 已提交
434
			VSCODE_GIT_COMMAND: args[0],
435
			LC_ALL: 'en_US.UTF-8',
J
Joao Moreno 已提交
436 437
			LANG: 'en_US.UTF-8'
		});
J
Joao Moreno 已提交
438 439

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

J
Joao Moreno 已提交
443
		return cp.spawn(this.path, args, options);
J
Joao Moreno 已提交
444 445 446
	}

	private log(output: string): void {
447
		this._onOutput.emit('log', output);
J
Joao Moreno 已提交
448
	}
J
Joao Moreno 已提交
449 450
}

J
Joao Moreno 已提交
451
export interface Commit {
J
Joao Moreno 已提交
452 453
	hash: string;
	message: string;
J
Joao Moreno 已提交
454
	parents: string[];
455
	authorEmail?: string | undefined;
J
Joao Moreno 已提交
456 457
}

458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495
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 已提交
496
		if (entry.x === 'R' || entry.x === 'C') {
497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523
			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;
	}
}

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 549 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 577 578 579 580 581 582 583 584 585
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;
		}

		const propertyMatch = /^\s*(\w+) = (.*)$/.exec(line);

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

586
export function parseGitCommit(raw: string): Commit | null {
587
	const match = /^([0-9a-f]{40})\n(.*)\n(.*)\n([^]*)$/m.exec(raw.trim());
588 589 590 591
	if (!match) {
		return null;
	}

592 593
	const parents = match[3] ? match[3].split(' ') : [];
	return { hash: match[1], message: match[4], parents, authorEmail: match[2] };
594 595
}

596 597 598 599
interface LsTreeElement {
	mode: string;
	type: string;
	object: string;
J
Joao Moreno 已提交
600
	size: string;
601 602 603 604 605 606
	file: string;
}

export function parseLsTree(raw: string): LsTreeElement[] {
	return raw.split('\n')
		.filter(l => !!l)
J
Joao Moreno 已提交
607
		.map(line => /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/.exec(line)!)
608
		.filter(m => !!m)
J
Joao Moreno 已提交
609
		.map(([, mode, type, object, size, file]) => ({ mode, type, object, size, file }));
610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626
}

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 已提交
627 628 629 630 631 632 633 634
export interface CommitOptions {
	all?: boolean;
	amend?: boolean;
	signoff?: boolean;
	signCommit?: boolean;
	empty?: boolean;
}

635 636 637 638
export interface PullOptions {
	unshallow?: boolean;
}

J
Joao Moreno 已提交
639 640
export enum ForcePushMode {
	Force,
J
Joao Moreno 已提交
641
	ForceWithLease
J
Joao Moreno 已提交
642 643
}

J
Joao Moreno 已提交
644 645 646 647
export class Repository {

	constructor(
		private _git: Git,
648
		private repositoryRoot: string
J
Joao Moreno 已提交
649 650 651 652 653 654
	) { }

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

J
Joao Moreno 已提交
655 656
	get root(): string {
		return this.repositoryRoot;
J
Joao Moreno 已提交
657 658 659
	}

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

J
Joao Moreno 已提交
664
	stream(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
665
		return this.git.stream(this.repositoryRoot, args, options);
J
Joao Moreno 已提交
666 667
	}

J
Joao Moreno 已提交
668
	spawn(args: string[], options: SpawnOptions = {}): cp.ChildProcess {
J
Joao Moreno 已提交
669 670 671
		return this.git.spawn(args, options);
	}

J
Joao Moreno 已提交
672
	async config(scope: string, key: string, value: any = null, options: SpawnOptions = {}): Promise<string> {
J
Joao Moreno 已提交
673 674 675 676 677 678 679 680 681 682 683 684 685
		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 已提交
686
		return result.stdout.trim();
J
Joao Moreno 已提交
687 688
	}

J
Joao Moreno 已提交
689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706
	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) };
		});
	}

707 708 709
	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`];
710 711 712 713 714 715
		const gitResult = await this.run(args);
		if (gitResult.exitCode) {
			// An empty repo.
			return [];
		}

716
		const s = gitResult.stdout;
717
		const result: Commit[] = [];
718 719 720 721 722 723 724 725
		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);
726 727 728
			if (entry.startsWith('\n')) {
				entry = entry.substring(1);
			}
729

730 731 732 733 734 735
			const commit = parseGitCommit(entry);
			if (!commit) {
				break;
			}

			result.push(commit);
736
			index = nextIndex + 2;
737 738 739 740 741
		}

		return result;
	}

742
	async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false): Promise<string> {
J
Joao Moreno 已提交
743
		const stdout = await this.buffer(object);
744 745 746 747 748

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

J
Joao Moreno 已提交
749 750 751
		encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';

		return iconv.decode(stdout, encoding);
J
Joao Moreno 已提交
752 753 754
	}

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

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

761
		const { exitCode, stdout, stderr } = await exec(child);
J
Joao Moreno 已提交
762 763

		if (exitCode) {
764
			const err = new GitError({
J
Joao Moreno 已提交
765 766
				message: 'Could not show object.',
				exitCode
767 768 769 770 771 772 773
			});

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

			return Promise.reject<Buffer>(err);
J
Joao Moreno 已提交
774 775 776
		}

		return stdout;
J
Joao Moreno 已提交
777 778
	}

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

J
Joao Moreno 已提交
783
			if (elements.length === 0) {
J
Joao Moreno 已提交
784 785 786
				throw new GitError({ message: 'Error running ls-files' });
			}

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

J
Joao Moreno 已提交
791
			return { mode, object, size };
J
Joao Moreno 已提交
792 793
		}

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

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

J
Joao Moreno 已提交
800
		const { mode, object, size } = elements[0];
J
Joao Moreno 已提交
801
		return { mode, object, size: parseInt(size) };
J
Joao Moreno 已提交
802 803
	}

J
Joao Moreno 已提交
804 805
	async lstree(treeish: string, path: string): Promise<LsTreeElement[]> {
		const { stdout } = await this.run(['ls-tree', '-l', treeish, '--', path]);
806 807
		return parseLsTree(stdout);
	}
808

809 810 811
	async lsfiles(path: string): Promise<LsFilesElement[]> {
		const { stdout } = await this.run(['ls-files', '--stage', '--', path]);
		return parseLsFiles(stdout);
812 813
	}

J
Joao Moreno 已提交
814
	async getGitRelativePath(ref: string, relativePath: string): Promise<string> {
815 816
		const relativePathLowercase = relativePath.toLowerCase();
		const dirname = path.posix.dirname(relativePath) + '/';
J
Joao Moreno 已提交
817
		const elements: { file: string; }[] = ref ? await this.lstree(ref, dirname) : await this.lsfiles(dirname);
818 819 820 821
		const element = elements.filter(file => file.file.toLowerCase() === relativePathLowercase)[0];

		if (!element) {
			throw new GitError({ message: 'Git relative path not found.' });
822
		}
823 824

		return element.file;
825 826
	}

J
Joao Moreno 已提交
827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866
	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' };
		}
	}

867 868 869 870 871 872 873
	async apply(patch: string, reverse?: boolean): Promise<void> {
		const args = ['apply', patch];

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

874 875 876 877 878 879 880 881 882
		try {
			await this.run(args);
		} catch (err) {
			if (/patch does not apply/.test(err.stderr)) {
				err.gitErrorCode = GitErrorCodes.PatchDoesNotApply;
			}

			throw err;
		}
883 884 885
	}

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

J
Joao Moreno 已提交
888
		if (cached) {
889 890 891 892 893 894 895
			args.push('--cached');
		}

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

896 897 898 899
	diffWithHEAD(): Promise<Change[]>;
	diffWithHEAD(path: string): Promise<string>;
	diffWithHEAD(path?: string | undefined): Promise<string | Change[]>;
	async diffWithHEAD(path?: string | undefined): Promise<string | Change[]> {
900 901 902 903
		if (!path) {
			return await this.diffFiles(false);
		}

J
Joao Moreno 已提交
904 905 906 907 908
		const args = ['diff', '--', path];
		const result = await this.run(args);
		return result.stdout;
	}

909 910 911
	diffWith(ref: string): Promise<Change[]>;
	diffWith(ref: string, path: string): Promise<string>;
	diffWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
912 913 914 915 916
	async diffWith(ref: string, path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(false, ref);
		}

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

922 923 924
	diffIndexWithHEAD(): Promise<Change[]>;
	diffIndexWithHEAD(path: string): Promise<string>;
	diffIndexWithHEAD(path?: string | undefined): Promise<string | Change[]>;
925 926 927 928 929
	async diffIndexWithHEAD(path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(true);
		}

J
Joao Moreno 已提交
930 931 932 933 934
		const args = ['diff', '--cached', '--', path];
		const result = await this.run(args);
		return result.stdout;
	}

935 936 937
	diffIndexWith(ref: string): Promise<Change[]>;
	diffIndexWith(ref: string, path: string): Promise<string>;
	diffIndexWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
938 939 940 941 942
	async diffIndexWith(ref: string, path?: string): Promise<string | Change[]> {
		if (!path) {
			return await this.diffFiles(true, ref);
		}

J
Joao Moreno 已提交
943 944 945 946 947 948 949 950 951 952 953
		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;
	}

954 955 956
	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[]>;
957 958 959 960 961 962 963
	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 已提交
964 965 966 967 968
		const result = await this.run(args);

		return result.stdout.trim();
	}

969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049
	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;
			}

			const originalUri = Uri.file(path.isAbsolute(resourcePath) ? resourcePath : path.join(this.repositoryRoot, resourcePath));
			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;
					}

					const uri = Uri.file(path.isAbsolute(newPath) ? newPath : path.join(this.repositoryRoot, newPath));
					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 已提交
1050 1051 1052 1053 1054 1055 1056
	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 已提交
1057 1058 1059 1060 1061 1062 1063
	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 已提交
1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075
	async add(paths: string[]): Promise<void> {
		const args = ['add', '-A', '--'];

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

		await this.run(args);
	}

J
Joao Moreno 已提交
1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087
	async rm(paths: string[]): Promise<void> {
		const args = ['rm', '--'];

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

		args.push(...paths);

		await this.run(args);
	}

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

		const { exitCode, stdout } = await exec(child);
J
Joao Moreno 已提交
1093
		const hash = stdout.toString('utf8');
J
Joao Moreno 已提交
1094 1095 1096 1097 1098 1099 1100 1101

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

J
Joao Moreno 已提交
1102 1103 1104
		let mode: string;

		try {
J
Joao Moreno 已提交
1105
			const details = await this.getObjectDetails('HEAD', path);
J
Joao Moreno 已提交
1106 1107 1108 1109 1110 1111
			mode = details.mode;
		} catch (err) {
			mode = '100644';
		}

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

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

1117 1118 1119 1120
		if (opts.track) {
			args.push('--track');
		}

J
Joao Moreno 已提交
1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132
		if (treeish) {
			args.push(treeish);
		}

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

		try {
			await this.run(args);
		} catch (err) {
J
Joao Moreno 已提交
1133
			if (/Please,? commit your changes or stash them/.test(err.stderr || '')) {
J
Joao Moreno 已提交
1134 1135 1136 1137 1138 1139 1140
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
			}

			throw err;
		}
	}

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

J
Joao Moreno 已提交
1144
		if (opts.all) {
J
Joao Moreno 已提交
1145 1146 1147
			args.push('--all');
		}

J
Joao Moreno 已提交
1148
		if (opts.amend) {
J
Joao Moreno 已提交
1149 1150 1151
			args.push('--amend');
		}

J
Joao Moreno 已提交
1152
		if (opts.signoff) {
J
Joao Moreno 已提交
1153 1154 1155
			args.push('--signoff');
		}

1156 1157 1158
		if (opts.signCommit) {
			args.push('-S');
		}
T
Tom Basche 已提交
1159 1160 1161
		if (opts.empty) {
			args.push('--allow-empty');
		}
1162

J
Joao Moreno 已提交
1163 1164 1165
		try {
			await this.run(args, { input: message || '' });
		} catch (commitErr) {
1166 1167 1168
			await this.handleCommitError(commitErr);
		}
	}
J
Joao Moreno 已提交
1169

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

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

1180 1181 1182
	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 已提交
1183 1184
			throw commitErr;
		}
1185 1186

		try {
J
Joao Moreno 已提交
1187 1188 1189 1190 1191
			await this.run(['config', '--get-all', 'user.name']);
		} catch (err) {
			err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
			throw err;
		}
1192 1193

		try {
J
Joao Moreno 已提交
1194 1195 1196 1197
			await this.run(['config', '--get-all', 'user.email']);
		} catch (err) {
			err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
			throw err;
1198 1199 1200
		}

		throw commitErr;
J
Joao Moreno 已提交
1201 1202
	}

J
Joao Moreno 已提交
1203
	async branch(name: string, checkout: boolean, ref?: string): Promise<void> {
J
Joao Moreno 已提交
1204
		const args = checkout ? ['checkout', '-q', '-b', name, '--no-track'] : ['branch', '-q', name];
J
Joao Moreno 已提交
1205 1206 1207 1208 1209

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

J
Joao Moreno 已提交
1210 1211 1212
		await this.run(args);
	}

1213 1214
	async deleteBranch(name: string, force?: boolean): Promise<void> {
		const args = ['branch', force ? '-D' : '-d', name];
M
Maik Riechert 已提交
1215 1216 1217
		await this.run(args);
	}

1218 1219 1220 1221 1222
	async renameBranch(name: string): Promise<void> {
		const args = ['branch', '-m', name];
		await this.run(args);
	}

J
Joao Moreno 已提交
1223 1224 1225 1226 1227
	async setBranchUpstream(name: string, upstream: string): Promise<void> {
		const args = ['branch', '--set-upstream-to', upstream, name];
		await this.run(args);
	}

1228 1229 1230 1231 1232
	async deleteRef(ref: string): Promise<void> {
		const args = ['update-ref', '-d', ref];
		await this.run(args);
	}

J
Joao Moreno 已提交
1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244
	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;
		}
1245 1246
	}

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

J
Joao Moreno 已提交
1250 1251
		if (message) {
			args = [...args, '-a', name, '-m', message];
1252
		} else {
J
Joao Moreno 已提交
1253
			args = [...args, name];
1254 1255 1256 1257 1258
		}

		await this.run(args);
	}

J
Joao Moreno 已提交
1259
	async clean(paths: string[]): Promise<void> {
J
Joao Moreno 已提交
1260 1261 1262
		const pathsByGroup = groupBy(paths, p => path.dirname(p));
		const groups = Object.keys(pathsByGroup).map(k => pathsByGroup[k]);
		const tasks = groups.map(paths => () => this.run(['clean', '-f', '-q', '--'].concat(paths)));
J
Joao Moreno 已提交
1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283

		for (let task of tasks) {
			await task();
		}
	}

	async undo(): Promise<void> {
		await this.run(['clean', '-fd']);

		try {
			await this.run(['checkout', '--', '.']);
		} catch (err) {
			if (/did not match any file\(s\) known to git\./.test(err.stderr || '')) {
				return;
			}

			throw err;
		}
	}

	async reset(treeish: string, hard: boolean = false): Promise<void> {
1284
		const args = ['reset', hard ? '--hard' : '--soft', treeish];
J
Joao Moreno 已提交
1285 1286 1287
		await this.run(args);
	}

J
Joao Moreno 已提交
1288
	async revert(treeish: string, paths: string[]): Promise<void> {
J
Joao Moreno 已提交
1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317
		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 已提交
1318 1319 1320 1321 1322
	async addRemote(name: string, url: string): Promise<void> {
		const args = ['remote', 'add', name, url];
		await this.run(args);
	}

J
Joao Moreno 已提交
1323 1324 1325 1326 1327
	async removeRemote(name: string): Promise<void> {
		const args = ['remote', 'rm', name];
		await this.run(args);
	}

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

J
Joao Moreno 已提交
1331 1332
		if (options.remote) {
			args.push(options.remote);
J
Joao Moreno 已提交
1333

J
Joao Moreno 已提交
1334 1335
			if (options.ref) {
				args.push(options.ref);
J
Joao Moreno 已提交
1336
			}
J
Joao Moreno 已提交
1337 1338
		} else if (options.all) {
			args.push('--all');
J
Joao Moreno 已提交
1339 1340
		}

R
Ryan Scott 已提交
1341
		if (options.prune) {
R
Ryan Scott 已提交
1342
			args.push('--prune');
R
Ryan Scott 已提交
1343 1344
		}

1345
		if (typeof options.depth === 'number') {
1346 1347
			args.push(`--depth=${options.depth}`);
		}
R
Ryan Scott 已提交
1348

J
Joao Moreno 已提交
1349
		try {
J
Joao Moreno 已提交
1350
			await this.run(args);
J
Joao Moreno 已提交
1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361
		} 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;
		}
	}

1362 1363 1364 1365 1366 1367
	async pull(rebase?: boolean, remote?: string, branch?: string, options: PullOptions = {}): Promise<void> {
		const args = ['pull', '--tags'];

		if (options.unshallow) {
			args.push('--unshallow');
		}
J
Joao Moreno 已提交
1368 1369 1370 1371 1372

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

M
Matt Shirley 已提交
1373
		if (remote && branch) {
1374
			args.push(remote);
M
Matt Shirley 已提交
1375
			args.push(branch);
1376 1377
		}

J
Joao Moreno 已提交
1378 1379 1380 1381 1382 1383 1384 1385 1386
		try {
			await this.run(args);
		} catch (err) {
			if (/^CONFLICT \([^)]+\): \b/m.test(err.stdout || '')) {
				err.gitErrorCode = GitErrorCodes.Conflict;
			} else if (/Please tell me who you are\./.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
			} else if (/Could not read from remote repository/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.RemoteConnectionError;
J
Joao Moreno 已提交
1387 1388
			} 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 已提交
1389
				err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
J
Joao Moreno 已提交
1390 1391 1392 1393
			} 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 已提交
1394 1395 1396 1397 1398 1399
			}

			throw err;
		}
	}

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

J
Joao Moreno 已提交
1403 1404 1405 1406
		if (forcePushMode === ForcePushMode.ForceWithLease) {
			args.push('--force-with-lease');
		} else if (forcePushMode === ForcePushMode.Force) {
			args.push('--force');
1407 1408
		}

J
Joao Moreno 已提交
1409
		if (setUpstream) {
J
Joao Moreno 已提交
1410 1411 1412
			args.push('-u');
		}

1413 1414
		if (tags) {
			args.push('--tags');
J
Joao Moreno 已提交
1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431
		}

		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;
1432 1433
			} else if (/^fatal: The current branch .* has no upstream branch/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoUpstreamBranch;
J
Joao Moreno 已提交
1434 1435 1436 1437 1438 1439
			}

			throw err;
		}
	}

R
rebornix 已提交
1440 1441 1442 1443 1444 1445 1446 1447 1448
	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 已提交
1449 1450 1451 1452
			if (/^fatal: no such path/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoPathFound;
			}

R
rebornix 已提交
1453 1454 1455 1456
			throw err;
		}
	}

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

1461 1462 1463 1464
			if (includeUntracked) {
				args.push('-u');
			}

J
Joao Moreno 已提交
1465
			if (message) {
J
Joao Moreno 已提交
1466
				args.push('-m', message);
1467 1468 1469 1470 1471 1472 1473
			}

			await this.run(args);
		} catch (err) {
			if (/No local changes to save/.test(err.stderr || '')) {
				err.gitErrorCode = GitErrorCodes.NoLocalChanges;
			}
J
Joao Moreno 已提交
1474 1475 1476 1477 1478 1479

			throw err;
		}
	}

	async popStash(index?: number): Promise<void> {
1480
		const args = ['stash', 'pop'];
J
Joao Moreno 已提交
1481
		await this.popOrApplyStash(args, index);
1482 1483 1484 1485
	}

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

1489 1490
	private async popOrApplyStash(args: string[], index?: number): Promise<void> {
		try {
1491
			if (typeof index === 'number') {
J
Joao Moreno 已提交
1492
				args.push(`stash@{${index}}`);
1493
			}
J
Joao Moreno 已提交
1494 1495 1496 1497 1498 1499

			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 || '')) {
1500
				err.gitErrorCode = GitErrorCodes.LocalChangesOverwritten;
J
Joao Moreno 已提交
1501 1502
			} else if (/^CONFLICT/m.test(err.stdout || '')) {
				err.gitErrorCode = GitErrorCodes.StashConflict;
1503
			}
J
Joao Moreno 已提交
1504

1505 1506 1507 1508
			throw err;
		}
	}

1509 1510
	getStatus(limit = 5000): Promise<{ status: IFileStatus[]; didHitLimit: boolean; }> {
		return new Promise<{ status: IFileStatus[]; didHitLimit: boolean; }>((c, e) => {
1511
			const parser = new GitStatusParser();
J
Joao Moreno 已提交
1512 1513
			const env = { GIT_OPTIONAL_LOCKS: '0' };
			const child = this.stream(['status', '-z', '-u'], { env });
1514

M
Matt Bierner 已提交
1515
			const onExit = (exitCode: number) => {
1516
				if (exitCode !== 0) {
1517 1518 1519 1520 1521 1522 1523 1524
					const stderr = stderrData.join('');
					return e(new GitError({
						message: 'Failed to execute git',
						stderr,
						exitCode,
						gitErrorCode: getGitErrorCode(stderr),
						gitCommand: 'status'
					}));
1525
				}
J
Joao Moreno 已提交
1526

1527 1528 1529
				c({ status: parser.status, didHitLimit: false });
			};

1530
			const onStdoutData = (raw: string) => {
1531 1532
				parser.update(raw);

J
Joao Moreno 已提交
1533
				if (parser.status.length > limit) {
1534
					child.removeListener('exit', onExit);
1535
					child.stdout.removeListener('data', onStdoutData);
1536 1537
					child.kill();

J
Joao Moreno 已提交
1538
					c({ status: parser.status.slice(0, limit), didHitLimit: true });
1539 1540 1541 1542
				}
			};

			child.stdout.setEncoding('utf8');
1543 1544 1545 1546 1547 1548
			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 已提交
1549
			child.on('error', cpErrorHandler(e));
1550
			child.on('exit', onExit);
1551
		});
J
Joao Moreno 已提交
1552 1553
	}

J
Joao Moreno 已提交
1554
	async getHEAD(): Promise<Ref> {
J
Joao Moreno 已提交
1555
		try {
J
Joao Moreno 已提交
1556
			const result = await this.run(['symbolic-ref', '--short', 'HEAD']);
J
Joao Moreno 已提交
1557 1558 1559 1560 1561

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

R
Rob Lourens 已提交
1562
			return { name: result.stdout.trim(), commit: undefined, type: RefType.Head };
J
Joao Moreno 已提交
1563
		} catch (err) {
J
Joao Moreno 已提交
1564
			const result = await this.run(['rev-parse', 'HEAD']);
J
Joao Moreno 已提交
1565 1566 1567 1568 1569

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

R
Rob Lourens 已提交
1570
			return { name: undefined, commit: result.stdout.trim(), type: RefType.Head };
J
Joao Moreno 已提交
1571 1572 1573
		}
	}

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

M
Matt Bierner 已提交
1577
		const fn = (line: string): Ref | null => {
J
Joao Moreno 已提交
1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593
			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 已提交
1594
			.filter(ref => !!ref) as Ref[];
J
Joao Moreno 已提交
1595 1596
	}

1597 1598
	async getStashes(): Promise<Stash[]> {
		const result = await this.run(['stash', 'list']);
J
Joao Moreno 已提交
1599
		const regex = /^stash@{(\d+)}:(.+)$/;
1600 1601
		const rawStashes = result.stdout.trim().split('\n')
			.filter(b => !!b)
M
Matt Bierner 已提交
1602
			.map(line => regex.exec(line) as RegExpExecArray)
1603
			.filter(g => !!g)
J
Joao Moreno 已提交
1604
			.map(([, index, description]: RegExpExecArray) => ({ index: parseInt(index), description }));
1605

J
Joao Moreno 已提交
1606 1607
		return rawStashes;
	}
1608

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

1614 1615
		for (const line of lines) {
			const parts = line.split(/\s/);
J
Joao Moreno 已提交
1616 1617 1618 1619
			const [name, url, type] = parts;

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

1620
			if (!remote) {
J
Joao Moreno 已提交
1621
				remote = { name, isReadOnly: false };
1622 1623 1624
				remotes.push(remote);
			}

J
Joao Moreno 已提交
1625 1626 1627 1628 1629 1630 1631
			if (/fetch/i.test(type)) {
				remote.fetchUrl = url;
			} else if (/push/i.test(type)) {
				remote.pushUrl = url;
			} else {
				remote.fetchUrl = url;
				remote.pushUrl = url;
1632 1633 1634
			}

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

1638
		return remotes;
J
Joao Moreno 已提交
1639 1640
	}

J
Joao Moreno 已提交
1641
	async getBranch(name: string): Promise<Branch> {
J
Joao Moreno 已提交
1642 1643
		if (name === 'HEAD') {
			return this.getHEAD();
1644 1645 1646 1647
		} else if (/^@/.test(name)) {
			const symbolicFullNameResult = await this.run(['rev-parse', '--symbolic-full-name', name]);
			const symbolicFullName = symbolicFullNameResult.stdout.trim();
			name = symbolicFullName || name;
J
Joao Moreno 已提交
1648 1649
		}

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

		if (!result.stdout) {
J
Joao Moreno 已提交
1653
			return Promise.reject<Branch>(new Error('No such branch'));
J
Joao Moreno 已提交
1654 1655 1656 1657 1658
		}

		const commit = result.stdout.trim();

		try {
J
Joao Moreno 已提交
1659 1660 1661 1662 1663 1664 1665
			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 已提交
1666

J
Joao Moreno 已提交
1667 1668
			const upstream = { remote: match[1], name: match[2] };
			const res3 = await this.run(['rev-list', '--left-right', name + '...' + fullUpstream]);
J
Joao Moreno 已提交
1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702

			let ahead = 0, behind = 0;
			let i = 0;

			while (i < res3.stdout.length) {
				switch (res3.stdout.charAt(i)) {
					case '<': ahead++; break;
					case '>': behind++; break;
					default: i++; break;
				}

				while (res3.stdout.charAt(i++) !== '\n') { /* no-op */ }
			}

			return { name, type: RefType.Head, commit, upstream, ahead, behind };
		} catch (err) {
			return { name, type: RefType.Head, commit };
		}
	}

	async getCommitTemplate(): Promise<string> {
		try {
			const result = await this.run(['config', '--get', 'commit.template']);

			if (!result.stdout) {
				return '';
			}

			// https://github.com/git/git/blob/3a0f269e7c82aa3a87323cb7ae04ac5f129f036b/path.c#L612
			const homedir = os.homedir();
			let templatePath = result.stdout.trim()
				.replace(/^~([^\/]*)\//, (_, user) => `${user ? path.join(path.dirname(homedir), user) : homedir}/`);

			if (!path.isAbsolute(templatePath)) {
J
Joao Moreno 已提交
1703
				templatePath = path.join(this.repositoryRoot, templatePath);
J
Joao Moreno 已提交
1704 1705 1706 1707 1708 1709 1710 1711 1712 1713
			}

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

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

J
Joao Moreno 已提交
1714
	async getCommit(ref: string): Promise<Commit> {
1715
		const result = await this.run(['show', '-s', `--format=${COMMIT_FORMAT}`, ref]);
1716
		return parseGitCommit(result.stdout) || Promise.reject<Commit>('bad commit format');
J
Joao Moreno 已提交
1717
	}
1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737

	async updateSubmodules(paths: string[]): Promise<void> {
		const args = ['submodule', 'update', '--', ...paths];
		await this.run(args);
	}

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

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

			throw err;
		}
	}
1738
}