commands.ts 40.8 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, Disposable, window, workspace, QuickPickItem, OutputChannel, Range, WorkspaceEdit, Position, LineChange, SourceControlResourceState, TextDocumentShowOptions, ViewColumn, ProgressLocation } 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
	@command('git.refresh', { repository: true })
	async refresh(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
150
		await repository.status();
J
Joao Moreno 已提交
151
	}
J
Joao Moreno 已提交
152

J
Joao Moreno 已提交
153 154
	@command('git.openResource')
	async openResource(resource: Resource): Promise<void> {
J
Joao Moreno 已提交
155
		await this._openResource(resource, undefined, true);
J
Joao Moreno 已提交
156 157
	}

J
Joao Moreno 已提交
158
	private async _openResource(resource: Resource, preview?: boolean, preserveFocus?: boolean): Promise<void> {
J
Joao Moreno 已提交
159
		const left = this.getLeftResource(resource);
J
Joao Moreno 已提交
160
		const right = this.getRightResource(resource);
J
Joao Moreno 已提交
161 162
		const title = this.getTitle(resource);

J
Joao Moreno 已提交
163 164 165 166 167
		if (!right) {
			// TODO
			console.error('oh no');
			return;
		}
J
Joao Moreno 已提交
168

J
Joao Moreno 已提交
169
		const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
170 171
			preserveFocus,
			preview,
J
Joao Moreno 已提交
172
			viewColumn: window.activeTextEditor && window.activeTextEditor.viewColumn || ViewColumn.One
J
Joao Moreno 已提交
173 174
		};

J
Joao Moreno 已提交
175 176 177 178 179 180
		const activeTextEditor = window.activeTextEditor;

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

181 182 183 184 185 186
		if (!left) {
			const document = await workspace.openTextDocument(right);
			await window.showTextDocument(document, opts);
			return;
		}

J
Joao Moreno 已提交
187
		return await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
J
Joao Moreno 已提交
188 189 190 191 192 193
	}

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

			case Status.MODIFIED:
J
Joao Moreno 已提交
197
				return toGitUri(resource.resourceUri, '~');
198 199 200

			case Status.DELETED_BY_THEM:
				return toGitUri(resource.resourceUri, '');
J
Joao Moreno 已提交
201
		}
J
Joao Moreno 已提交
202
	}
J
Joao Moreno 已提交
203

J
Joao Moreno 已提交
204
	private getRightResource(resource: Resource): Uri | undefined {
J
Joao Moreno 已提交
205 206 207 208 209
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_ADDED:
			case Status.INDEX_COPIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
210
				return toGitUri(resource.resourceUri, '');
J
Joao Moreno 已提交
211 212

			case Status.INDEX_DELETED:
213
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
214
			case Status.DELETED:
J
Joao Moreno 已提交
215
				return toGitUri(resource.resourceUri, 'HEAD');
J
Joao Moreno 已提交
216 217 218 219

			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
J
Joao Moreno 已提交
220 221 222 223 224 225
				const repository = this.model.getRepository(resource.resourceUri);

				if (!repository) {
					return;
				}

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

J
Joao Moreno 已提交
229 230
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
231 232
				}

J
Joao Moreno 已提交
233
				return resource.resourceUri;
J
Joao Moreno 已提交
234

235
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
236
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
237
				return resource.resourceUri;
J
Joao Moreno 已提交
238 239 240 241
		}
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
242
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
243 244 245 246

		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
M
Marc Kassay 已提交
247
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
248 249 250
				return `${basename} (Index)`;

			case Status.MODIFIED:
M
Marc Kassay 已提交
251 252
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
253 254 255 256 257 258
				return `${basename} (Working Tree)`;
		}

		return '';
	}

J
Joao Moreno 已提交
259
	@command('git.clone')
260
	async clone(): Promise<void> {
J
Joao Moreno 已提交
261
		const url = await window.showInputBox({
J
Joao Moreno 已提交
262 263
			prompt: localize('repourl', "Repository URL"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
264 265 266
		});

		if (!url) {
267 268
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
269 270
		}

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

J
Joao Moreno 已提交
274 275
		const parentPath = await window.showInputBox({
			prompt: localize('parent', "Parent Directory"),
J
Joao Moreno 已提交
276
			value,
J
Joao Moreno 已提交
277
			ignoreFocusOut: true
J
Joao Moreno 已提交
278 279 280
		});

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

J
Joao Moreno 已提交
285
		const clonePromise = this.git.clone(url, parentPath);
M
Maryam Archie 已提交
286

J
Joao Moreno 已提交
287

288
		try {
M
Maryam Archie 已提交
289 290 291
			window.withProgress({ location: ProgressLocation.SourceControl, title: localize('cloning', "Cloning git repository...") }, () => clonePromise);
			window.withProgress({ location: ProgressLocation.Window, title: localize('cloning', "Cloning git repository...") }, () => clonePromise);

292 293 294 295 296 297 298 299 300 301
			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));
			}
302 303
		} catch (err) {
			if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
304 305 306
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'directory_not_empty' });
			} else {
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'error' });
307 308
			}
			throw err;
J
Joao Moreno 已提交
309 310 311
		}
	}

J
Joao Moreno 已提交
312
	@command('git.init')
J
Joao Moreno 已提交
313
	async init(): Promise<void> {
J
Joao Moreno 已提交
314 315
		// TODO@joao
		// await model.init();
J
Joao Moreno 已提交
316 317
	}

J
Joao Moreno 已提交
318 319
	@command('git.openFile')
	async openFile(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
320 321
		const preserveFocus = !!arg;

322
		let uris: Uri[] | undefined;
323 324 325

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
326
				uris = [Uri.file(fromGitUri(arg).path)];
327
			} else if (arg.scheme === 'file') {
328
				uris = [arg];
329 330 331 332 333 334
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
335
				resource = this.getSCMResource();
336 337 338
			}

			if (resource) {
339
				uris = [...resourceStates.map(r => r.resourceUri), resource.resourceUri];
340
			}
J
Joao Moreno 已提交
341 342
		}

343
		if (!uris) {
J
Joao Moreno 已提交
344
			return;
J
Joao Moreno 已提交
345 346
		}

347 348 349 350 351 352 353 354 355
		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 = {
J
Joao Moreno 已提交
356
				preserveFocus,
357 358 359 360 361 362 363 364 365 366
				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 已提交
367
		}
J
Joao Moreno 已提交
368 369
	}

J
Joao Moreno 已提交
370 371
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
372 373 374 375 376
		let resource: Resource | undefined = undefined;

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
377
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
378
		} else {
379
			resource = this.getSCMResource();
D
Duroktar 已提交
380 381 382 383 384 385
		}

		if (!resource) {
			return;
		}

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

J
Joao Moreno 已提交
388 389 390
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
391
		}
J
Joao Moreno 已提交
392 393

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

J
Joao Moreno 已提交
396 397
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
398
		const preserveFocus = !!arg;
399
		let resources: Resource[] | undefined = undefined;
400

401
		if (arg instanceof Uri) {
402
			const resource = this.getSCMResource(arg);
403 404 405
			if (resource !== undefined) {
				resources = [resource];
			}
406
		} else {
407
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
408

409 410 411
			if (arg instanceof Resource) {
				resource = arg;
			} else {
412
				resource = this.getSCMResource();
413 414 415 416 417
			}

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

420
		if (!resources) {
J
Joao Moreno 已提交
421
			return;
J
Joao Moreno 已提交
422
		}
J
Joao Moreno 已提交
423

424 425
		const preview = resources.length === 1 ? undefined : false;
		for (const resource of resources) {
J
Joao Moreno 已提交
426
			await this._openResource(resource, preview, preserveFocus);
427
		}
J
Joao Moreno 已提交
428 429
	}

430 431
	@command('git.stage')
	async stage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
432
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
433
			const resource = this.getSCMResource();
434 435 436 437 438 439 440 441

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

445
		if (!scmResources.length) {
J
Joao Moreno 已提交
446 447
			return;
		}
J
Joao Moreno 已提交
448

449
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
450
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
451 452
	}

J
Joao Moreno 已提交
453 454
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
455
		await repository.add([]);
J
Joao Moreno 已提交
456 457
	}

J
Joao Moreno 已提交
458 459
	@command('git.stageSelectedRanges', { diff: true })
	async stageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
460 461 462 463 464 465 466 467 468
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

J
Joao Moreno 已提交
469
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
470 471 472
			return;
		}

J
Joao Moreno 已提交
473
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
474
		const originalDocument = await workspace.openTextDocument(originalUri);
475 476 477 478
		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 已提交
479 480 481 482 483

		if (!selectedDiffs.length) {
			return;
		}

484 485
		const result = applyLineChanges(originalDocument, modifiedDocument, selectedDiffs);

J
Joao Moreno 已提交
486
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
487
	}
J
Joao Moreno 已提交
488

J
Joao Moreno 已提交
489 490
	@command('git.revertSelectedRanges', { diff: true })
	async revertSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
491 492 493 494 495 496 497 498 499 500 501 502 503
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

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

J
Joao Moreno 已提交
504
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527
		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;
		}

528
		const result = applyLineChanges(originalDocument, modifiedDocument, selectedDiffs);
J
Joao Moreno 已提交
529 530 531 532 533
		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 已提交
534 535
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
536
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
537
			const resource = this.getSCMResource();
538 539 540 541 542 543 544 545

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

549
		if (!scmResources.length) {
J
Joao Moreno 已提交
550 551 552
			return;
		}

553
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
554
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
555 556
	}

J
Joao Moreno 已提交
557 558
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
559
		await repository.revert([]);
J
Joao Moreno 已提交
560
	}
J
Joao Moreno 已提交
561

J
Joao Moreno 已提交
562 563
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
564 565 566 567 568 569 570 571 572
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

573 574 575 576 577 578 579
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
580 581 582
			return;
		}

J
Joao Moreno 已提交
583
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
584
		const originalDocument = await workspace.openTextDocument(originalUri);
585 586 587 588
		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 已提交
589 590 591 592 593

		if (!selectedDiffs.length) {
			return;
		}

594 595
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
596

J
Joao Moreno 已提交
597
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
598 599
	}

J
Joao Moreno 已提交
600 601
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
602
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
603
			const resource = this.getSCMResource();
604 605 606 607 608 609 610 611

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
615
		if (!scmResources.length) {
J
Joao Moreno 已提交
616 617
			return;
		}
J
Joao Moreno 已提交
618

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

J
Joao Moreno 已提交
623
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
624
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
625
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
626 627
				yes = localize('delete file', "Delete file");
			} else {
J
Joao Moreno 已提交
628
				message = localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
629 630
			}
		} else {
J
Joao Moreno 已提交
631
			message = localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", scmResources.length);
J
Joao Moreno 已提交
632 633 634 635 636

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

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

J
Joao Moreno 已提交
640 641 642 643
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
644
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
645
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
646
	}
J
Joao Moreno 已提交
647

J
Joao Moreno 已提交
648 649
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
650 651
		const config = workspace.getConfiguration('git');
		let scope = config.get<string>('discardAllScope') || 'prompt';
J
Joao Moreno 已提交
652
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689

		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);
690
		const yes = localize('discardAll', "Discard ALL Changes");
J
Joao Moreno 已提交
691
		const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
692 693 694 695 696

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

J
Joao Moreno 已提交
697
		await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
698 699
	}

J
Joao Moreno 已提交
700
	private async smartCommit(
J
Joao Moreno 已提交
701
		repository: Repository,
702
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
703 704
		opts?: CommitOptions
	): Promise<boolean> {
705 706
		const config = workspace.getConfiguration('git');
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
707
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
708 709
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
710 711

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

J
Joao Moreno 已提交
714 715
			// 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?");
716 717 718 719 720
			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 已提交
721 722 723
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
724 725 726
			}
		}

J
Joao Moreno 已提交
727
		if (!opts) {
728
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
729 730
		}

731 732 733
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

J
Joao Moreno 已提交
734 735
		if (
			// no changes
736
			(noStagedChanges && noUnstagedChanges)
J
Joao Moreno 已提交
737
			// or no staged changes and not `all`
738
			|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
739
		) {
J
Joao Moreno 已提交
740 741 742 743
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
744
		const message = await getCommitMessage();
J
Joao Moreno 已提交
745 746 747 748 749 750

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

J
Joao Moreno 已提交
751
		await repository.commit(message, opts);
J
Joao Moreno 已提交
752 753 754 755

		return true;
	}

J
Joao Moreno 已提交
756
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
757
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
758
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
759 760 761 762 763 764
			if (message) {
				return message;
			}

			return await window.showInputBox({
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
765 766
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
767
			});
J
Joao Moreno 已提交
768 769
		};

J
Joao Moreno 已提交
770
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
771 772

		if (message && didCommit) {
J
Joao Moreno 已提交
773
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
774
		}
J
Joao Moreno 已提交
775 776
	}

J
Joao Moreno 已提交
777
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
778 779
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
780 781
	}

J
Joao Moreno 已提交
782
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
783
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
784
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
785 786 787
			return;
		}

J
Joao Moreno 已提交
788
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
789 790

		if (didCommit) {
J
Joao Moreno 已提交
791
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
792
		}
J
Joao Moreno 已提交
793 794
	}

J
Joao Moreno 已提交
795
	@command('git.commitStaged', { repository: true })
J
Joao Moreno 已提交
796 797
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
798 799
	}

J
Joao Moreno 已提交
800
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
801 802
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
803 804
	}

J
Joao Moreno 已提交
805
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
806 807
	async commitStagedAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
808 809
	}

J
Joao Moreno 已提交
810
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
811 812
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
813 814
	}

J
Joao Moreno 已提交
815
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
816 817
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
818 819
	}

J
Joao Moreno 已提交
820
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
821 822
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
823 824
	}

J
Joao Moreno 已提交
825
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
826 827
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
828 829 830 831 832

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

J
Joao Moreno 已提交
833 834
		const commit = await repository.getCommit('HEAD');
		await repository.reset('HEAD~');
J
Joao Moreno 已提交
835
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
836 837
	}

J
Joao Moreno 已提交
838
	@command('git.checkout', { repository: true })
J
Joao Moreno 已提交
839
	async checkout(repository: Repository, treeish: string): Promise<void> {
J
Joao Moreno 已提交
840
		if (typeof treeish === 'string') {
J
Joao Moreno 已提交
841
			return await repository.checkout(treeish);
J
Joao Moreno 已提交
842 843
		}

J
Joao Moreno 已提交
844
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
845
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
846 847 848
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
849 850
		const createBranch = new CreateBranchItem();

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

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

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

J
Joao Moreno 已提交
860
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
861
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
862
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
863 864 865 866 867

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
868
		await choice.run(repository);
J
Joao Moreno 已提交
869 870
	}

J
Joao Moreno 已提交
871
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
872
	async branch(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
873
		const result = await window.showInputBox({
J
Joao Moreno 已提交
874
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
875 876
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
877
		});
J
Joao Moreno 已提交
878

J
Joao Moreno 已提交
879 880 881
		if (!result) {
			return;
		}
J
Joao Moreno 已提交
882

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

J
Joao Moreno 已提交
887
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
888
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
889 890
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
891
			run = force => repository.deleteBranch(name, force);
892
		} else {
J
Joao Moreno 已提交
893 894
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
895
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
896

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

M
Maik Riechert 已提交
900
			if (!choice || !choice.branchName) {
901 902
				return;
			}
M
Maik Riechert 已提交
903
			name = choice.branchName;
J
Joao Moreno 已提交
904
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
905 906
		}

907 908 909 910 911 912 913 914 915 916 917 918 919 920 921
		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 已提交
922 923
	}

J
Joao Moreno 已提交
924
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
925
	async merge(repository: Repository): Promise<void> {
926 927 928 929
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
930
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
931 932
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
933

J
Joao Moreno 已提交
934
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
935 936
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
937 938

		const picks = [...heads, ...remoteHeads];
939 940
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
941 942 943 944 945

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
946
		try {
J
Joao Moreno 已提交
947
			await choice.run(repository);
J
Joao Moreno 已提交
948 949 950 951 952 953 954 955
		} 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);
		}
956 957
	}

J
Joao Moreno 已提交
958
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
959
	async createTag(repository: Repository): Promise<void> {
960 961 962 963 964 965 966 967 968 969 970 971
		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 已提交
972
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
973 974 975 976 977
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
981
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
982 983
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007

		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 已提交
1008
		repository.pull(false, pick.label, branchName);
1009 1010
	}

J
Joao Moreno 已提交
1011
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1012 1013
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1014 1015 1016 1017 1018 1019

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

J
Joao Moreno 已提交
1020
		await repository.pull();
J
Joao Moreno 已提交
1021 1022
	}

J
Joao Moreno 已提交
1023
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1024 1025
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1026 1027 1028 1029 1030 1031

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

J
Joao Moreno 已提交
1032
		await repository.pullWithRebase();
J
Joao Moreno 已提交
1033 1034
	}

J
Joao Moreno 已提交
1035
	@command('git.push', { repository: true })
J
Joao Moreno 已提交
1036 1037
	async push(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1038 1039 1040 1041 1042 1043

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

J
Joao Moreno 已提交
1044
		await repository.push();
J
Joao Moreno 已提交
1045 1046
	}

J
Joao Moreno 已提交
1047
	@command('git.pushWithTags', { repository: true })
J
Joao Moreno 已提交
1048 1049
	async pushWithTags(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1050 1051 1052 1053 1054 1055

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

J
Joao Moreno 已提交
1056
		await repository.pushTags();
1057 1058 1059 1060

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

J
Joao Moreno 已提交
1061
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1062 1063
	async pushTo(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 push', "Your repository has no remotes configured to push to."));
			return;
		}

J
Joao Moreno 已提交
1070
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1071 1072 1073 1074
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

J
Joao Moreno 已提交
1075
		const branchName = repository.HEAD.name;
J
Joao Moreno 已提交
1076 1077 1078 1079 1080 1081 1082 1083
		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 已提交
1084
		repository.pushTo(pick.label, branchName);
J
Joao Moreno 已提交
1085 1086
	}

J
Joao Moreno 已提交
1087
	@command('git.sync', { repository: true })
J
Joao Moreno 已提交
1088 1089
	async sync(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110

		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 已提交
1111
		await repository.sync();
J
Joao Moreno 已提交
1112 1113
	}

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

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

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

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1132
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1133 1134
	}

J
Joao Moreno 已提交
1135
	@command('git.showOutput')
J
Joao Moreno 已提交
1136 1137 1138 1139
	showOutput(): void {
		this.outputChannel.show();
	}

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

J
Joao Moreno 已提交
1145 1146 1147 1148
			if (!uri) {
				return;
			}

J
Joao Moreno 已提交
1149
			return await repository.ignore([uri]);
J
Joao Moreno 已提交
1150 1151 1152 1153 1154 1155 1156
		}

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

		if (!uris.length) {
N
NKumar2 已提交
1157 1158 1159
			return;
		}

J
Joao Moreno 已提交
1160
		await repository.ignore(uris);
N
NKumar2 已提交
1161 1162
	}

J
Joao Moreno 已提交
1163
	@command('git.stash', { repository: true })
J
Joao Moreno 已提交
1164 1165
	async stash(repository: Repository): Promise<void> {
		if (repository.workingTreeGroup.resourceStates.length === 0) {
K
Krzysztof Cieślak 已提交
1166 1167 1168
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1169 1170 1171 1172 1173 1174 1175 1176 1177 1178

		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 已提交
1179
		await repository.createStash(message);
K
Krzysztof Cieślak 已提交
1180 1181
	}

J
Joao Moreno 已提交
1182
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1183 1184
	async stashPop(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1185 1186

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1187 1188 1189 1190
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1191 1192
		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 已提交
1193 1194 1195 1196 1197
		const choice = await window.showQuickPick(picks, { placeHolder });

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

J
Joao Moreno 已提交
1199
		await repository.popStash(choice.id);
K
Krzysztof Cieślak 已提交
1200 1201
	}

J
Joao Moreno 已提交
1202
	@command('git.stashPopLatest', { repository: true })
J
Joao Moreno 已提交
1203 1204
	async stashPopLatest(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1205 1206

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1207 1208 1209 1210
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1211
		await repository.popStash();
J
Joao Moreno 已提交
1212
	}
K
Krzysztof Cieślak 已提交
1213

J
Joao Moreno 已提交
1214
	private createCommand(id: string, key: string, method: Function, options: CommandOptions): (...args: any[]) => any {
1215
		const result = (...args) => {
J
Joao Moreno 已提交
1216 1217
			let result: Promise<any>;

J
Joao Moreno 已提交
1218
			if (!options.repository) {
J
Joao Moreno 已提交
1219 1220
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1221 1222 1223
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
				const repositoryPromise = repository ? Promise.resolve(repository) : this.model.pickRepository();
1224

J
Joao Moreno 已提交
1225
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1226
					if (!repository) {
J
Joao Moreno 已提交
1227 1228 1229
						return Promise.reject(localize('modelnotfound', "Git model not found"));
					}

J
Joao Moreno 已提交
1230
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1231
				});
J
Joao Moreno 已提交
1232 1233
			}

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

J
Joao Moreno 已提交
1236 1237 1238 1239
			return result.catch(async err => {
				let message: string;

				switch (err.gitErrorCode) {
1240
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1241 1242
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1243 1244 1245
					case GitErrorCodes.PushRejected:
						message = localize('cant push', "Can't push refs to remote. Run 'Pull' first to integrate your changes.");
						break;
J
Joao Moreno 已提交
1246
					default:
1247 1248 1249
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1250
							.split(/[\r\n]/)
1251 1252 1253 1254 1255 1256
							.filter(line => !!line)
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274

						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();
				}
			});
		};
1275 1276 1277 1278 1279

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

		return result;
J
Joao Moreno 已提交
1280 1281
	}

1282 1283
	// TODO@Joao: possibly remove? do we really need to return resources?
	private getSCMResource(uri?: Uri): Resource | undefined {
1284
		uri = uri ? uri : window.activeTextEditor && window.activeTextEditor.document.uri;
J
Joao Moreno 已提交
1285 1286

		if (!uri) {
1287
			return undefined;
J
Joao Moreno 已提交
1288 1289 1290
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1291 1292
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1293 1294 1295 1296
		}

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

J
Joao Moreno 已提交
1299
			if (!repository) {
1300 1301
				return undefined;
			}
J
Joao Moreno 已提交
1302

J
Joao Moreno 已提交
1303 1304
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1305 1306 1307
		}
	}

J
Joao Moreno 已提交
1308
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339
	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 已提交
1340 1341 1342
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
Joao Moreno 已提交
1343
}