commands.ts 41.5 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.
 *--------------------------------------------------------------------------------------------*/

'use strict';

J
Joao Moreno 已提交
8
import { Uri, commands, scm, Disposable, window, workspace, QuickPickItem, OutputChannel, Range, WorkspaceEdit, Position, LineChange, SourceControl, SourceControlResourceGroup, SourceControlResourceState, TextDocumentShowOptions, ViewColumn } from 'vscode';
J
Joao Moreno 已提交
9
import { Ref, RefType, Git, GitErrorCodes, Branch } from './git';
J
Joao Moreno 已提交
10
import { Repository, Resource, Status, CommitOptions, ResourceGroupType } from './repository';
J
Joao Moreno 已提交
11
import { Model } from './model';
J
Joao Moreno 已提交
12
import { toGitUri, fromGitUri } from './uri';
13
import { applyLineChanges, intersectDiffWithRange, toLineRanges, invertLineChange } from './staging';
J
Joao Moreno 已提交
14
import * as path from 'path';
J
Joao Moreno 已提交
15
import * as os from 'os';
J
Joao Moreno 已提交
16
import TelemetryReporter from 'vscode-extension-telemetry';
J
Joao Moreno 已提交
17 18 19
import * as nls from 'vscode-nls';

const localize = nls.loadMessageBundle();
J
Joao Moreno 已提交
20

J
Joao Moreno 已提交
21 22 23 24 25 26 27
class CheckoutItem implements QuickPickItem {

	protected get shortCommit(): string { return (this.ref.commit || '').substr(0, 8); }
	protected get treeish(): string | undefined { return this.ref.name; }
	get label(): string { return this.ref.name || this.shortCommit; }
	get description(): string { return this.shortCommit; }

J
Joao Moreno 已提交
28
	constructor(protected ref: Ref) { }
J
Joao Moreno 已提交
29

J
Joao Moreno 已提交
30
	async run(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
31 32 33 34 35 36
		const ref = this.treeish;

		if (!ref) {
			return;
		}

J
Joao Moreno 已提交
37
		await repository.checkout(ref);
J
Joao Moreno 已提交
38 39 40 41 42
	}
}

class CheckoutTagItem extends CheckoutItem {

J
Joao Moreno 已提交
43 44 45
	get description(): string {
		return localize('tag at', "Tag at {0}", this.shortCommit);
	}
J
Joao Moreno 已提交
46 47 48 49
}

class CheckoutRemoteHeadItem extends CheckoutItem {

J
Joao Moreno 已提交
50 51 52
	get description(): string {
		return localize('remote branch at', "Remote branch at {0}", this.shortCommit);
	}
J
Joao Moreno 已提交
53 54 55 56 57 58 59 60 61 62 63

	protected get treeish(): string | undefined {
		if (!this.ref.name) {
			return;
		}

		const match = /^[^/]+\/(.*)$/.exec(this.ref.name);
		return match ? match[1] : this.ref.name;
	}
}

M
Maik Riechert 已提交
64 65
class BranchDeleteItem implements QuickPickItem {

66 67 68
	private get shortCommit(): string { return (this.ref.commit || '').substr(0, 8); }
	get branchName(): string | undefined { return this.ref.name; }
	get label(): string { return this.branchName || ''; }
M
Maik Riechert 已提交
69 70
	get description(): string { return this.shortCommit; }

71
	constructor(private ref: Ref) { }
M
Maik Riechert 已提交
72

J
Joao Moreno 已提交
73
	async run(repository: Repository, force?: boolean): Promise<void> {
74
		if (!this.branchName) {
M
Maik Riechert 已提交
75 76
			return;
		}
J
Joao Moreno 已提交
77
		await repository.deleteBranch(this.branchName, force);
M
Maik Riechert 已提交
78 79 80
	}
}

81 82 83 84 85 86
class MergeItem implements QuickPickItem {

	get label(): string { return this.ref.name || ''; }
	get description(): string { return this.ref.name || ''; }

	constructor(protected ref: Ref) { }
J
Joao Moreno 已提交
87

J
Joao Moreno 已提交
88 89
	async run(repository: Repository): Promise<void> {
		await repository.merge(this.ref.name! || this.ref.commit!);
J
Joao Moreno 已提交
90
	}
91 92
}

J
Joao Moreno 已提交
93 94 95 96 97
class CreateBranchItem implements QuickPickItem {

	get label(): string { return localize('create branch', '$(plus) Create new branch'); }
	get description(): string { return ''; }

J
Joao Moreno 已提交
98
	async run(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
99 100 101 102
		await commands.executeCommand('git.branch');
	}
}

J
Joao Moreno 已提交
103
interface CommandOptions {
J
Joao Moreno 已提交
104
	repository?: boolean;
J
Joao Moreno 已提交
105 106 107
	diff?: boolean;
}

108 109 110 111
interface Command {
	commandId: string;
	key: string;
	method: Function;
J
Joao Moreno 已提交
112
	options: CommandOptions;
113 114 115
}

const Commands: Command[] = [];
J
Joao Moreno 已提交
116

J
Joao Moreno 已提交
117
function command(commandId: string, options: CommandOptions = {}): Function {
J
Joao Moreno 已提交
118
	return (target: any, key: string, descriptor: any) => {
J
Joao Moreno 已提交
119 120 121 122
		if (!(typeof descriptor.value === 'function')) {
			throw new Error('not supported');
		}

J
Joao Moreno 已提交
123
		Commands.push({ commandId, key, method: descriptor.value, options });
J
Joao Moreno 已提交
124 125
	};
}
J
Joao Moreno 已提交
126

J
Joao Moreno 已提交
127
export class CommandCenter {
J
Joao Moreno 已提交
128 129

	private disposables: Disposable[];
J
Joao Moreno 已提交
130

J
Joao Moreno 已提交
131
	constructor(
J
Joao Moreno 已提交
132
		private git: Git,
J
Joao Moreno 已提交
133
		private model: Model,
J
Joao Moreno 已提交
134 135
		private outputChannel: OutputChannel,
		private telemetryReporter: TelemetryReporter
J
Joao Moreno 已提交
136
	) {
J
Joao Moreno 已提交
137 138
		this.disposables = Commands.map(({ commandId, key, method, options }) => {
			const command = this.createCommand(commandId, key, method, options);
139

J
Joao Moreno 已提交
140
			if (options.diff) {
J
Joao Moreno 已提交
141 142 143 144 145
				return commands.registerDiffInformationCommand(commandId, command);
			} else {
				return commands.registerCommand(commandId, command);
			}
		});
J
Joao Moreno 已提交
146 147
	}

J
Joao Moreno 已提交
148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163
	@command('git.refresh')
	async refresh(sourceControl?: SourceControl): Promise<void> {
		let repository: Repository | undefined = undefined;

		if (sourceControl) {
			repository = this.model.getRepositoryFromSourceControl(sourceControl);
		}

		if (!repository) {
			repository = await this.model.pickRepository();
		}

		if (!repository) {
			return;
		}

J
Joao Moreno 已提交
164
		await repository.status();
J
Joao Moreno 已提交
165
	}
J
Joao Moreno 已提交
166

J
Joao Moreno 已提交
167 168 169
	@command('git.openResource')
	async openResource(resource: Resource): Promise<void> {
		await this._openResource(resource);
J
Joao Moreno 已提交
170 171
	}

J
Joao Moreno 已提交
172
	private async _openResource(resource: Resource, preview?: boolean): Promise<void> {
J
Joao Moreno 已提交
173
		const left = this.getLeftResource(resource);
J
Joao Moreno 已提交
174
		const right = this.getRightResource(resource);
J
Joao Moreno 已提交
175 176
		const title = this.getTitle(resource);

J
Joao Moreno 已提交
177 178 179 180 181
		if (!right) {
			// TODO
			console.error('oh no');
			return;
		}
J
Joao Moreno 已提交
182

J
Joao Moreno 已提交
183
		const opts: TextDocumentShowOptions = {
184 185
			preserveFocus: true,
			preview: preview,
J
Joao Moreno 已提交
186
			viewColumn: window.activeTextEditor && window.activeTextEditor.viewColumn || ViewColumn.One
J
Joao Moreno 已提交
187 188
		};

J
Joao Moreno 已提交
189 190 191 192 193 194
		const activeTextEditor = window.activeTextEditor;

		if (activeTextEditor && activeTextEditor.document.uri.toString() === right.toString()) {
			opts.selection = activeTextEditor.selection;
		}

195 196 197 198 199 200
		if (!left) {
			const document = await workspace.openTextDocument(right);
			await window.showTextDocument(document, opts);
			return;
		}

J
Joao Moreno 已提交
201
		return await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
J
Joao Moreno 已提交
202 203 204 205 206 207
	}

	private getLeftResource(resource: Resource): Uri | undefined {
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
208
				return toGitUri(resource.original, 'HEAD');
J
Joao Moreno 已提交
209 210

			case Status.MODIFIED:
J
Joao Moreno 已提交
211
				return toGitUri(resource.resourceUri, '~');
212 213 214

			case Status.DELETED_BY_THEM:
				return toGitUri(resource.resourceUri, '');
J
Joao Moreno 已提交
215
		}
J
Joao Moreno 已提交
216
	}
J
Joao Moreno 已提交
217

J
Joao Moreno 已提交
218
	private getRightResource(resource: Resource): Uri | undefined {
J
Joao Moreno 已提交
219 220 221 222 223
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_ADDED:
			case Status.INDEX_COPIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
224
				return toGitUri(resource.resourceUri, '');
J
Joao Moreno 已提交
225 226

			case Status.INDEX_DELETED:
227
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
228
			case Status.DELETED:
J
Joao Moreno 已提交
229
				return toGitUri(resource.resourceUri, 'HEAD');
J
Joao Moreno 已提交
230 231 232 233

			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
J
Joao Moreno 已提交
234 235 236 237 238 239
				const repository = this.model.getRepository(resource.resourceUri);

				if (!repository) {
					return;
				}

J
Joao Moreno 已提交
240
				const uriString = resource.resourceUri.toString();
J
Joao Moreno 已提交
241
				const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString);
J
Joao Moreno 已提交
242

J
Joao Moreno 已提交
243 244
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
245 246
				}

J
Joao Moreno 已提交
247
				return resource.resourceUri;
J
Joao Moreno 已提交
248

249
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
250
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
251
				return resource.resourceUri;
J
Joao Moreno 已提交
252 253 254 255
		}
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
256
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
257 258 259 260

		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
M
Marc Kassay 已提交
261
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
262 263 264
				return `${basename} (Index)`;

			case Status.MODIFIED:
M
Marc Kassay 已提交
265 266
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
267 268 269 270 271 272
				return `${basename} (Working Tree)`;
		}

		return '';
	}

J
Joao Moreno 已提交
273
	@command('git.clone')
274
	async clone(): Promise<void> {
J
Joao Moreno 已提交
275
		const url = await window.showInputBox({
J
Joao Moreno 已提交
276 277
			prompt: localize('repourl', "Repository URL"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
278 279 280
		});

		if (!url) {
281 282
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
283 284
		}

285
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
286
		const value = config.get<string>('defaultCloneDirectory') || os.homedir();
287

J
Joao Moreno 已提交
288 289
		const parentPath = await window.showInputBox({
			prompt: localize('parent', "Parent Directory"),
J
Joao Moreno 已提交
290
			value,
J
Joao Moreno 已提交
291
			ignoreFocusOut: true
J
Joao Moreno 已提交
292 293 294
		});

		if (!parentPath) {
295 296
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
			return;
J
Joao Moreno 已提交
297 298
		}

J
Joao Moreno 已提交
299
		const clonePromise = this.git.clone(url, parentPath);
J
Joao Moreno 已提交
300 301
		window.setStatusBarMessage(localize('cloning', "Cloning git repository..."), clonePromise);

302
		try {
303 304 305 306 307 308 309 310 311 312
			const repositoryPath = await clonePromise;

			const open = localize('openrepo', "Open Repository");
			const result = await window.showInformationMessage(localize('proposeopen', "Would you like to open the cloned repository?"), open);

			const openFolder = result === open;
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
			if (openFolder) {
				commands.executeCommand('vscode.openFolder', Uri.file(repositoryPath));
			}
313 314
		} catch (err) {
			if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
315 316 317
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'directory_not_empty' });
			} else {
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'error' });
318 319
			}
			throw err;
J
Joao Moreno 已提交
320 321 322
		}
	}

J
Joao Moreno 已提交
323
	@command('git.init')
J
Joao Moreno 已提交
324
	async init(): Promise<void> {
J
Joao Moreno 已提交
325 326
		// TODO@joao
		// await model.init();
J
Joao Moreno 已提交
327 328
	}

J
Joao Moreno 已提交
329 330
	@command('git.openFile')
	async openFile(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
331
		let uris: Uri[] | undefined;
332 333 334

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
335
				uris = [Uri.file(fromGitUri(arg).path)];
336
			} else if (arg.scheme === 'file') {
337
				uris = [arg];
338 339 340 341 342 343
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
344
				resource = this.getSCMResource();
345 346 347
			}

			if (resource) {
348
				uris = [...resourceStates.map(r => r.resourceUri), resource.resourceUri];
349
			}
J
Joao Moreno 已提交
350 351
		}

352
		if (!uris) {
J
Joao Moreno 已提交
353
			return;
J
Joao Moreno 已提交
354 355
		}

356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375
		const preview = uris.length === 1 ? true : false;
		const activeTextEditor = window.activeTextEditor;
		for (const uri of uris) {
			// If the active editor matches the current uri, get its selection
			const selections = activeTextEditor && activeTextEditor.document.uri.toString() === uri.toString()
				? activeTextEditor.selections
				: undefined;

			const opts: TextDocumentShowOptions = {
				preserveFocus: true,
				preview: preview,
				viewColumn: activeTextEditor && activeTextEditor.viewColumn || ViewColumn.One
			};

			const document = await workspace.openTextDocument(uri);
			await window.showTextDocument(document, opts);

			if (selections && window.activeTextEditor) {
				window.activeTextEditor.selections = selections;
			}
J
Joao Moreno 已提交
376
		}
J
Joao Moreno 已提交
377 378
	}

J
Joao Moreno 已提交
379 380
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
381 382 383 384 385
		let resource: Resource | undefined = undefined;

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
386
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
387
		} else {
388
			resource = this.getSCMResource();
D
Duroktar 已提交
389 390 391 392 393 394
		}

		if (!resource) {
			return;
		}

J
Joao Moreno 已提交
395
		const HEAD = this.getLeftResource(resource);
D
Duroktar 已提交
396

J
Joao Moreno 已提交
397 398 399
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
400
		}
J
Joao Moreno 已提交
401 402

		return await commands.executeCommand<void>('vscode.open', HEAD);
D
Duroktar 已提交
403 404
	}

J
Joao Moreno 已提交
405 406
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
407
		let resources: Resource[] | undefined = undefined;
408

409
		if (arg instanceof Uri) {
410
			const resource = this.getSCMResource(arg);
411 412 413
			if (resource !== undefined) {
				resources = [resource];
			}
414
		} else {
415
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
416

417 418 419
			if (arg instanceof Resource) {
				resource = arg;
			} else {
420
				resource = this.getSCMResource();
421 422 423 424 425
			}

			if (resource) {
				resources = [...resourceStates as Resource[], resource];
			}
J
Joao Moreno 已提交
426 427
		}

428
		if (!resources) {
J
Joao Moreno 已提交
429
			return;
J
Joao Moreno 已提交
430
		}
J
Joao Moreno 已提交
431

432 433
		const preview = resources.length === 1 ? undefined : false;
		for (const resource of resources) {
J
Joao Moreno 已提交
434
			await this._openResource(resource, preview);
435
		}
J
Joao Moreno 已提交
436 437
	}

438 439
	@command('git.stage')
	async stage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
440
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
441
			const resource = this.getSCMResource();
442 443 444 445 446 447 448 449

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

450
		const scmResources = resourceStates
J
Joao Moreno 已提交
451
			.filter(s => s instanceof Resource && (s.resourceGroupType === ResourceGroupType.WorkingTree || s.resourceGroupType === ResourceGroupType.Merge)) as Resource[];
452

453
		if (!scmResources.length) {
J
Joao Moreno 已提交
454 455
			return;
		}
J
Joao Moreno 已提交
456

457
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
458
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
459 460
	}

461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476
	@command('git.stageAll')
	async stageAll(group?: SourceControlResourceGroup): Promise<void> {
		let repository: Repository | undefined = undefined;

		if (group) {
			repository = this.model.getRepositoryFromResourceGroup(group);
		}

		if (!repository) {
			repository = await this.model.pickRepository();
		}

		if (!repository) {
			return;
		}

J
Joao Moreno 已提交
477
		await repository.add([]);
J
Joao Moreno 已提交
478 479
	}

J
Joao Moreno 已提交
480 481
	@command('git.stageSelectedRanges', { diff: true })
	async stageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
482 483 484 485 486 487 488 489 490
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
		const modifiedUri = modifiedDocument.uri;

J
Joao Moreno 已提交
491
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
492 493 494
			return;
		}

J
Joao Moreno 已提交
495
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
496
		const originalDocument = await workspace.openTextDocument(originalUri);
497 498 499 500
		const selectedLines = toLineRanges(textEditor.selections, modifiedDocument);
		const selectedDiffs = diffs
			.map(diff => selectedLines.reduce<LineChange | null>((result, range) => result || intersectDiffWithRange(modifiedDocument, diff, range), null))
			.filter(d => !!d) as LineChange[];
J
Joao Moreno 已提交
501 502 503 504 505

		if (!selectedDiffs.length) {
			return;
		}

506 507
		const result = applyLineChanges(originalDocument, modifiedDocument, selectedDiffs);

J
Joao Moreno 已提交
508
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
509
	}
J
Joao Moreno 已提交
510

J
Joao Moreno 已提交
511 512
	@command('git.revertSelectedRanges', { diff: true })
	async revertSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
513 514 515 516 517 518 519 520 521 522 523 524 525
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
		const modifiedUri = modifiedDocument.uri;

		if (modifiedUri.scheme !== 'file') {
			return;
		}

J
Joao Moreno 已提交
526
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549
		const originalDocument = await workspace.openTextDocument(originalUri);
		const selections = textEditor.selections;
		const selectedDiffs = diffs.filter(diff => {
			const modifiedRange = diff.modifiedEndLineNumber === 0
				? new Range(modifiedDocument.lineAt(diff.modifiedStartLineNumber - 1).range.end, modifiedDocument.lineAt(diff.modifiedStartLineNumber).range.start)
				: new Range(modifiedDocument.lineAt(diff.modifiedStartLineNumber - 1).range.start, modifiedDocument.lineAt(diff.modifiedEndLineNumber - 1).range.end);

			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedDiffs.length === diffs.length) {
			return;
		}

		const basename = path.basename(modifiedUri.fsPath);
		const message = localize('confirm revert', "Are you sure you want to revert the selected changes in {0}?", basename);
		const yes = localize('revert', "Revert Changes");
		const pick = await window.showWarningMessage(message, { modal: true }, yes);

		if (pick !== yes) {
			return;
		}

550
		const result = applyLineChanges(originalDocument, modifiedDocument, selectedDiffs);
J
Joao Moreno 已提交
551 552 553 554 555
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
	}

J
Joao Moreno 已提交
556 557
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
558
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
559
			const resource = this.getSCMResource();
560 561 562 563 564 565 566 567

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

568
		const scmResources = resourceStates
J
Joao Moreno 已提交
569
			.filter(s => s instanceof Resource && s.resourceGroupType === ResourceGroupType.Index) as Resource[];
570

571
		if (!scmResources.length) {
J
Joao Moreno 已提交
572 573 574
			return;
		}

575
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
576
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
577 578
	}

579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595
	@command('git.unstageAll')
	async unstageAll(group?: SourceControlResourceGroup): Promise<void> {
		let repository: Repository | undefined = undefined;

		if (group) {
			repository = this.model.getRepositoryFromResourceGroup(group);
		}

		if (!repository) {
			repository = await this.model.pickRepository();
		}

		if (!repository) {
			return;
		}

		await repository.revert([]);
J
Joao Moreno 已提交
596
	}
J
Joao Moreno 已提交
597

J
Joao Moreno 已提交
598 599
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
600 601 602 603 604 605 606 607 608
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
		const modifiedUri = modifiedDocument.uri;

609 610 611 612 613 614 615
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
616 617 618
			return;
		}

J
Joao Moreno 已提交
619
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
620
		const originalDocument = await workspace.openTextDocument(originalUri);
621 622 623 624
		const selectedLines = toLineRanges(textEditor.selections, modifiedDocument);
		const selectedDiffs = diffs
			.map(diff => selectedLines.reduce<LineChange | null>((result, range) => result || intersectDiffWithRange(modifiedDocument, diff, range), null))
			.filter(d => !!d) as LineChange[];
J
Joao Moreno 已提交
625 626 627 628 629

		if (!selectedDiffs.length) {
			return;
		}

630 631
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
632

J
Joao Moreno 已提交
633
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
634 635
	}

J
Joao Moreno 已提交
636 637
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
638
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
639
			const resource = this.getSCMResource();
640 641 642 643 644 645 646 647

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

J
Joao Moreno 已提交
648
		const scmResources = resourceStates
J
Joao Moreno 已提交
649
			.filter(s => s instanceof Resource && s.resourceGroupType === ResourceGroupType.WorkingTree) as Resource[];
650

J
Joao Moreno 已提交
651
		if (!scmResources.length) {
J
Joao Moreno 已提交
652 653
			return;
		}
J
Joao Moreno 已提交
654

J
Joao Moreno 已提交
655
		const untrackedCount = scmResources.reduce((s, r) => s + (r.type === Status.UNTRACKED ? 1 : 0), 0);
J
Joao Moreno 已提交
656 657 658
		let message: string;
		let yes = localize('discard', "Discard Changes");

J
Joao Moreno 已提交
659
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
660
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
661
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
662 663
				yes = localize('delete file', "Delete file");
			} else {
J
Joao Moreno 已提交
664
				message = localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
665 666
			}
		} else {
J
Joao Moreno 已提交
667
			message = localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", scmResources.length);
J
Joao Moreno 已提交
668 669 670 671 672

			if (untrackedCount > 0) {
				message = `${message}\n\n${localize('warn untracked', "This will DELETE {0} untracked files!", untrackedCount)}`;
			}
		}
673

J
Joao Moreno 已提交
674
		const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
675

J
Joao Moreno 已提交
676 677 678 679
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
680
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
681
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
682
	}
J
Joao Moreno 已提交
683

684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699
	@command('git.cleanAll')
	async cleanAll(group?: SourceControlResourceGroup): Promise<void> {
		let repository: Repository | undefined = undefined;

		if (group) {
			repository = this.model.getRepositoryFromResourceGroup(group);
		}

		if (!repository) {
			repository = await this.model.pickRepository();
		}

		if (!repository) {
			return;
		}

J
Joao Moreno 已提交
700 701
		const config = workspace.getConfiguration('git');
		let scope = config.get<string>('discardAllScope') || 'prompt';
J
Joao Moreno 已提交
702
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739

		if (resources.length === 0) {
			return;
		}

		const untrackedCount = resources.reduce((s, r) => s + (r.type === Status.UNTRACKED ? 1 : 0), 0);

		if (scope === 'prompt' && untrackedCount > 0) {
			const message = localize('there are untracked files', "There are untracked files ({0}) which will be DELETED if discarded.\n\nWould you like to delete untracked files when discarding all changes?", untrackedCount);
			const yes = localize('yes', "Yes");
			const always = localize('always', "Always");
			const no = localize('no', "No");
			const never = localize('never', "Never");
			const pick = await window.showWarningMessage(message, { modal: true }, yes, always, no, never);

			if (typeof pick === 'undefined') {
				return;
			} else if (pick === always) {
				await config.update('discardAllScope', 'all', true);
			} else if (pick === never) {
				await config.update('discardAllScope', 'tracked', true);
			}

			if (pick === never || pick === no) {
				scope = 'tracked';
			}
		}

		if (scope === 'tracked') {
			resources = resources.filter(r => r.type !== Status.UNTRACKED && r.type !== Status.IGNORED);
		}

		if (resources.length === 0) {
			return;
		}

		const message = localize('confirm discard all', "Are you sure you want to discard ALL ({0}) changes?\nThis is IRREVERSIBLE!\nYour current working set will be FOREVER LOST.", resources.length);
740
		const yes = localize('discardAll', "Discard ALL Changes");
J
Joao Moreno 已提交
741
		const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
742 743 744 745 746

		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
747
		await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
748 749
	}

J
Joao Moreno 已提交
750
	private async smartCommit(
J
Joao Moreno 已提交
751
		repository: Repository,
752
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
753 754
		opts?: CommitOptions
	): Promise<boolean> {
755 756
		const config = workspace.getConfiguration('git');
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
757
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
758 759
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
760 761

		// no changes, and the user has not configured to commit all in this case
762
		if (!noUnstagedChanges && noStagedChanges && !enableSmartCommit) {
763

J
Joao Moreno 已提交
764 765
			// prompt the user if we want to commit all or not
			const message = localize('no staged changes', "There are no staged changes to commit.\n\nWould you like to automatically stage all your changes and commit them directly?");
766 767 768 769 770
			const yes = localize('yes', "Yes");
			const always = localize('always', "Always");
			const pick = await window.showWarningMessage(message, { modal: true }, yes, always);

			if (pick === always) {
J
Joao Moreno 已提交
771 772 773
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
774 775 776
			}
		}

J
Joao Moreno 已提交
777
		if (!opts) {
778
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
779 780
		}

781 782 783
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

J
Joao Moreno 已提交
784 785
		if (
			// no changes
786
			(noStagedChanges && noUnstagedChanges)
J
Joao Moreno 已提交
787
			// or no staged changes and not `all`
788
			|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
789
		) {
J
Joao Moreno 已提交
790 791 792 793
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
794
		const message = await getCommitMessage();
J
Joao Moreno 已提交
795 796 797 798 799 800

		if (!message) {
			// TODO@joao: show modal dialog to confirm empty message commit
			return false;
		}

J
Joao Moreno 已提交
801
		await repository.commit(message, opts);
J
Joao Moreno 已提交
802 803 804 805

		return true;
	}

J
Joao Moreno 已提交
806
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
807
		const message = scm.inputBox.value;
J
Joao Moreno 已提交
808
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
809 810 811 812 813 814
			if (message) {
				return message;
			}

			return await window.showInputBox({
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
815 816
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
817
			});
J
Joao Moreno 已提交
818 819
		};

J
Joao Moreno 已提交
820
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
821 822

		if (message && didCommit) {
J
Joao Moreno 已提交
823
			scm.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
824
		}
J
Joao Moreno 已提交
825 826
	}

J
Joao Moreno 已提交
827
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
828 829
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
830 831
	}

J
Joao Moreno 已提交
832
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
833
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
834 835 836 837
		if (!scm.inputBox.value) {
			return;
		}

J
Joao Moreno 已提交
838
		const didCommit = await this.smartCommit(repository, async () => scm.inputBox.value);
J
Joao Moreno 已提交
839 840

		if (didCommit) {
J
Joao Moreno 已提交
841
			scm.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
842
		}
J
Joao Moreno 已提交
843 844
	}

J
Joao Moreno 已提交
845
	@command('git.commitStaged', { repository: true })
J
Joao Moreno 已提交
846 847
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
848 849
	}

J
Joao Moreno 已提交
850
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
851 852
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
853 854
	}

J
Joao Moreno 已提交
855
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
856 857
	async commitStagedAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
858 859
	}

J
Joao Moreno 已提交
860
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
861 862
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
863 864
	}

J
Joao Moreno 已提交
865
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
866 867
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
868 869
	}

J
Joao Moreno 已提交
870
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
871 872
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
873 874
	}

J
Joao Moreno 已提交
875
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
876 877
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
878 879 880 881 882

		if (!HEAD || !HEAD.commit) {
			return;
		}

J
Joao Moreno 已提交
883 884
		const commit = await repository.getCommit('HEAD');
		await repository.reset('HEAD~');
J
Joao Moreno 已提交
885
		scm.inputBox.value = commit.message;
J
Joao Moreno 已提交
886 887
	}

J
Joao Moreno 已提交
888
	@command('git.checkout', { repository: true })
J
Joao Moreno 已提交
889
	async checkout(repository: Repository, treeish: string): Promise<void> {
J
Joao Moreno 已提交
890
		if (typeof treeish === 'string') {
J
Joao Moreno 已提交
891
			return await repository.checkout(treeish);
J
Joao Moreno 已提交
892 893
		}

J
Joao Moreno 已提交
894
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
895
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
896 897 898
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
899 900
		const createBranch = new CreateBranchItem();

J
Joao Moreno 已提交
901
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
902 903
			.map(ref => new CheckoutItem(ref));

J
Joao Moreno 已提交
904
		const tags = (includeTags ? repository.refs.filter(ref => ref.type === RefType.Tag) : [])
J
Joao Moreno 已提交
905 906
			.map(ref => new CheckoutTagItem(ref));

J
Joao Moreno 已提交
907
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
908 909
			.map(ref => new CheckoutRemoteHeadItem(ref));

J
Joao Moreno 已提交
910
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
911
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
912
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
913 914 915 916 917

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
918
		await choice.run(repository);
J
Joao Moreno 已提交
919 920
	}

J
Joao Moreno 已提交
921
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
922
	async branch(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
923
		const result = await window.showInputBox({
J
Joao Moreno 已提交
924
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
925 926
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
927
		});
J
Joao Moreno 已提交
928

J
Joao Moreno 已提交
929 930 931
		if (!result) {
			return;
		}
J
Joao Moreno 已提交
932

J
Joao Moreno 已提交
933
		const name = result.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
J
Joao Moreno 已提交
934
		await repository.branch(name);
J
Joao Moreno 已提交
935 936
	}

J
Joao Moreno 已提交
937
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
938
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
939 940
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
941
			run = force => repository.deleteBranch(name, force);
942
		} else {
J
Joao Moreno 已提交
943 944
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
945
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
946

M
Maik Riechert 已提交
947
			const placeHolder = localize('select branch to delete', 'Select a branch to delete');
948
			const choice = await window.showQuickPick<BranchDeleteItem>(heads, { placeHolder });
M
Maik Riechert 已提交
949

M
Maik Riechert 已提交
950
			if (!choice || !choice.branchName) {
951 952
				return;
			}
M
Maik Riechert 已提交
953
			name = choice.branchName;
J
Joao Moreno 已提交
954
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
955 956
		}

957 958 959 960 961 962 963 964 965 966 967 968 969 970 971
		try {
			await run(force);
		} catch (err) {
			if (err.gitErrorCode !== GitErrorCodes.BranchNotFullyMerged) {
				throw err;
			}

			const message = localize('confirm force delete branch', "The branch '{0}' is not fully merged. Delete anyway?", name);
			const yes = localize('delete branch', "Delete Branch");
			const pick = await window.showWarningMessage(message, yes);

			if (pick === yes) {
				await run(true);
			}
		}
M
Maik Riechert 已提交
972 973
	}

J
Joao Moreno 已提交
974
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
975
	async merge(repository: Repository): Promise<void> {
976 977 978 979
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
980
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
981 982
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
983

J
Joao Moreno 已提交
984
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
985 986
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
987 988

		const picks = [...heads, ...remoteHeads];
989 990
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
991 992 993 994 995

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
996
		try {
J
Joao Moreno 已提交
997
			await choice.run(repository);
J
Joao Moreno 已提交
998 999 1000 1001 1002 1003 1004 1005
		} catch (err) {
			if (err.gitErrorCode !== GitErrorCodes.Conflict) {
				throw err;
			}

			const message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
			await window.showWarningMessage(message);
		}
1006 1007
	}

J
Joao Moreno 已提交
1008
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1009
	async createTag(repository: Repository): Promise<void> {
1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021
		const inputTagName = await window.showInputBox({
			placeHolder: localize('tag name', "Tag name"),
			prompt: localize('provide tag name', "Please provide a tag name"),
			ignoreFocusOut: true
		});

		if (!inputTagName) {
			return;
		}

		const inputMessage = await window.showInputBox({
			placeHolder: localize('tag message', "Message"),
J
Joao Moreno 已提交
1022
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1023 1024 1025 1026 1027
			ignoreFocusOut: true
		});

		const name = inputTagName.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
		const message = inputMessage || name;
J
Joao Moreno 已提交
1028
		await repository.tag(name, message);
1029 1030
	}

J
Joao Moreno 已提交
1031
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1032 1033
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057

		if (remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to pull', "Your repository has no remotes configured to pull from."));
			return;
		}

		const picks = remotes.map(r => ({ label: r.name, description: r.url }));
		const placeHolder = localize('pick remote pull repo', "Pick a remote to pull the branch from");
		const pick = await window.showQuickPick(picks, { placeHolder });

		if (!pick) {
			return;
		}

		const branchName = await window.showInputBox({
			placeHolder: localize('branch name', "Branch name"),
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
		});

		if (!branchName) {
			return;
		}

J
Joao Moreno 已提交
1058
		repository.pull(false, pick.label, branchName);
1059 1060
	}

J
Joao Moreno 已提交
1061
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1062 1063
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1064 1065 1066 1067 1068 1069

		if (remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to pull', "Your repository has no remotes configured to pull from."));
			return;
		}

J
Joao Moreno 已提交
1070
		await repository.pull();
J
Joao Moreno 已提交
1071 1072
	}

J
Joao Moreno 已提交
1073
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1074 1075
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1076 1077 1078 1079 1080 1081

		if (remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to pull', "Your repository has no remotes configured to pull from."));
			return;
		}

J
Joao Moreno 已提交
1082
		await repository.pullWithRebase();
J
Joao Moreno 已提交
1083 1084
	}

J
Joao Moreno 已提交
1085
	@command('git.push', { repository: true })
J
Joao Moreno 已提交
1086 1087
	async push(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1088 1089 1090 1091 1092 1093

		if (remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
			return;
		}

J
Joao Moreno 已提交
1094
		await repository.push();
J
Joao Moreno 已提交
1095 1096
	}

J
Joao Moreno 已提交
1097
	@command('git.pushWithTags', { repository: true })
J
Joao Moreno 已提交
1098 1099
	async pushWithTags(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1100 1101 1102 1103 1104 1105

		if (remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
			return;
		}

J
Joao Moreno 已提交
1106
		await repository.pushTags();
1107 1108 1109 1110

		window.showInformationMessage(localize('push with tags success', "Successfully pushed with tags."));
	}

J
Joao Moreno 已提交
1111
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1112 1113
	async pushTo(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1114 1115 1116 1117 1118 1119

		if (remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
			return;
		}

J
Joao Moreno 已提交
1120
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1121 1122 1123 1124
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

J
Joao Moreno 已提交
1125
		const branchName = repository.HEAD.name;
J
Joao Moreno 已提交
1126 1127 1128 1129 1130 1131 1132 1133
		const picks = remotes.map(r => ({ label: r.name, description: r.url }));
		const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
		const pick = await window.showQuickPick(picks, { placeHolder });

		if (!pick) {
			return;
		}

J
Joao Moreno 已提交
1134
		repository.pushTo(pick.label, branchName);
J
Joao Moreno 已提交
1135 1136
	}

J
Joao Moreno 已提交
1137
	@command('git.sync', { repository: true })
J
Joao Moreno 已提交
1138 1139
	async sync(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160

		if (!HEAD || !HEAD.upstream) {
			return;
		}

		const config = workspace.getConfiguration('git');
		const shouldPrompt = config.get<boolean>('confirmSync') === true;

		if (shouldPrompt) {
			const message = localize('sync is unpredictable', "This action will push and pull commits to and from '{0}'.", HEAD.upstream);
			const yes = localize('ok', "OK");
			const neverAgain = localize('never again', "OK, Never Show Again");
			const pick = await window.showWarningMessage(message, { modal: true }, yes, neverAgain);

			if (pick === neverAgain) {
				await config.update('confirmSync', false, true);
			} else if (pick !== yes) {
				return;
			}
		}

J
Joao Moreno 已提交
1161
		await repository.sync();
J
Joao Moreno 已提交
1162 1163
	}

J
Joao Moreno 已提交
1164
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1165 1166
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1167 1168 1169 1170 1171 1172

		if (remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to publish', "Your repository has no remotes configured to publish to."));
			return;
		}

J
Joao Moreno 已提交
1173 1174
		const branchName = repository.HEAD && repository.HEAD.name || '';
		const picks = repository.remotes.map(r => r.name);
J
Joao Moreno 已提交
1175
		const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
J
Joao Moreno 已提交
1176 1177 1178 1179 1180 1181
		const choice = await window.showQuickPick(picks, { placeHolder });

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1182
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1183 1184
	}

J
Joao Moreno 已提交
1185
	@command('git.showOutput')
J
Joao Moreno 已提交
1186 1187 1188 1189
	showOutput(): void {
		this.outputChannel.show();
	}

J
Joao Moreno 已提交
1190
	@command('git.ignore', { repository: true })
J
Joao Moreno 已提交
1191
	async ignore(repository: Repository, ...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
1192 1193
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
			const uri = window.activeTextEditor && window.activeTextEditor.document.uri;
N
NKumar2 已提交
1194

J
Joao Moreno 已提交
1195 1196 1197 1198
			if (!uri) {
				return;
			}

J
Joao Moreno 已提交
1199
			return await repository.ignore([uri]);
J
Joao Moreno 已提交
1200 1201 1202 1203 1204 1205 1206
		}

		const uris = resourceStates
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

		if (!uris.length) {
N
NKumar2 已提交
1207 1208 1209
			return;
		}

J
Joao Moreno 已提交
1210
		await repository.ignore(uris);
N
NKumar2 已提交
1211 1212
	}

J
Joao Moreno 已提交
1213
	@command('git.stash', { repository: true })
J
Joao Moreno 已提交
1214 1215
	async stash(repository: Repository): Promise<void> {
		if (repository.workingTreeGroup.resourceStates.length === 0) {
K
Krzysztof Cieślak 已提交
1216 1217 1218
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1219 1220 1221 1222 1223 1224 1225 1226 1227 1228

		const message = await window.showInputBox({
			prompt: localize('provide stash message', "Optionally provide a stash message"),
			placeHolder: localize('stash message', "Stash message")
		});

		if (typeof message === 'undefined') {
			return;
		}

J
Joao Moreno 已提交
1229
		await repository.createStash(message);
K
Krzysztof Cieślak 已提交
1230 1231
	}

J
Joao Moreno 已提交
1232
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1233 1234
	async stashPop(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1235 1236

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1237 1238 1239 1240
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1241 1242
		const picks = stashes.map(r => ({ label: `#${r.index}:  ${r.description}`, description: '', details: '', id: r.index }));
		const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
K
Krzysztof Cieślak 已提交
1243 1244 1245 1246 1247
		const choice = await window.showQuickPick(picks, { placeHolder });

		if (!choice) {
			return;
		}
J
Joao Moreno 已提交
1248

J
Joao Moreno 已提交
1249
		await repository.popStash(choice.id);
K
Krzysztof Cieślak 已提交
1250 1251
	}

J
Joao Moreno 已提交
1252
	@command('git.stashPopLatest', { repository: true })
J
Joao Moreno 已提交
1253 1254
	async stashPopLatest(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1255 1256

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1257 1258 1259 1260
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1261
		await repository.popStash();
J
Joao Moreno 已提交
1262
	}
K
Krzysztof Cieślak 已提交
1263

J
Joao Moreno 已提交
1264
	private createCommand(id: string, key: string, method: Function, options: CommandOptions): (...args: any[]) => any {
1265
		const result = (...args) => {
J
Joao Moreno 已提交
1266 1267 1268 1269 1270 1271 1272
			// if (!skipModelCheck && !this.model) {
			// 	window.showInformationMessage(localize('disabled', "Git is either disabled or not supported in this workspace"));
			// 	return;
			// }

			let result: Promise<any>;

J
Joao Moreno 已提交
1273
			if (!options.repository) {
J
Joao Moreno 已提交
1274 1275
				result = Promise.resolve(method.apply(this, args));
			} else {
1276 1277 1278 1279
				console.log(args[0]);
				// if (args[0] instanceof SourceControlResourceGroup) {
				// }

J
Joao Moreno 已提交
1280 1281
				result = this.model.pickRepository().then(repository => {
					if (!repository) {
J
Joao Moreno 已提交
1282 1283 1284
						return Promise.reject(localize('modelnotfound', "Git model not found"));
					}

J
Joao Moreno 已提交
1285
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1286
				});
J
Joao Moreno 已提交
1287 1288
			}

J
Joao Moreno 已提交
1289 1290
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1291 1292 1293 1294
			return result.catch(async err => {
				let message: string;

				switch (err.gitErrorCode) {
1295
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1296 1297
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1298 1299 1300
					case GitErrorCodes.PushRejected:
						message = localize('cant push', "Can't push refs to remote. Run 'Pull' first to integrate your changes.");
						break;
J
Joao Moreno 已提交
1301
					default:
1302 1303 1304
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1305
							.split(/[\r\n]/)
1306 1307 1308 1309 1310 1311
							.filter(line => !!line)
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329

						break;
				}

				if (!message) {
					console.error(err);
					return;
				}

				const outputChannel = this.outputChannel as OutputChannel;
				const openOutputChannelChoice = localize('open git log', "Open Git Log");
				const choice = await window.showErrorMessage(message, openOutputChannelChoice);

				if (choice === openOutputChannelChoice) {
					outputChannel.show();
				}
			});
		};
1330 1331 1332 1333 1334

		// patch this object, so people can call methods directly
		this[key] = result;

		return result;
J
Joao Moreno 已提交
1335 1336
	}

1337 1338
	// TODO@Joao: possibly remove? do we really need to return resources?
	private getSCMResource(uri?: Uri): Resource | undefined {
1339
		uri = uri ? uri : window.activeTextEditor && window.activeTextEditor.document.uri;
J
Joao Moreno 已提交
1340 1341

		if (!uri) {
1342
			return undefined;
J
Joao Moreno 已提交
1343 1344 1345
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1346 1347
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1348 1349 1350 1351
		}

		if (uri.scheme === 'file') {
			const uriString = uri.toString();
J
Joao Moreno 已提交
1352
			const repository = this.model.getRepository(uri);
1353

J
Joao Moreno 已提交
1354
			if (!repository) {
1355 1356
				return undefined;
			}
J
Joao Moreno 已提交
1357

J
Joao Moreno 已提交
1358 1359
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1360 1361 1362
		}
	}

J
Joao Moreno 已提交
1363
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394
	private runByRepository<T>(resources: Uri[], fn: (repository: Repository, resources: Uri[]) => Promise<T>): Promise<T[]>;
	private async runByRepository<T>(arg: Uri | Uri[], fn: (repository: Repository, resources: any) => Promise<T>): Promise<T[]> {
		const resources = arg instanceof Uri ? [arg] : arg;
		const isSingleResource = arg instanceof Uri;

		const groups = resources.reduce((result, resource) => {
			const repository = this.model.getRepository(resource);

			// TODO@Joao: what should happen?
			if (!repository) {
				console.warn('Could not find git repository for ', resource);
				return result;
			}

			const tuple = result.filter(p => p[0] === repository)[0];

			if (tuple) {
				tuple.resources.push(resource);
			} else {
				result.push({ repository, resources: [resource] });
			}

			return result;
		}, [] as { repository: Repository, resources: Uri[] }[]);

		const promises = groups
			.map(({ repository, resources }) => fn(repository as Repository, isSingleResource ? resources[0] : resources));

		return Promise.all(promises);
	}

J
Joao Moreno 已提交
1395 1396 1397
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
Joao Moreno 已提交
1398
}