commands.ts 36.9 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';

8
import { Uri, commands, scm, 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';
10
import { Model, Resource, Status, CommitOptions, WorkingTreeGroup, IndexGroup, MergeGroup } from './model';
J
Joao Moreno 已提交
11
import { toGitUri, fromGitUri } from './uri';
12
import { applyLineChanges, intersectDiffWithRange, toLineRanges, invertLineChange } from './staging';
J
Joao Moreno 已提交
13
import * as path from 'path';
J
Joao Moreno 已提交
14
import * as os from 'os';
J
Joao Moreno 已提交
15
import TelemetryReporter from 'vscode-extension-telemetry';
J
Joao Moreno 已提交
16 17 18
import * as nls from 'vscode-nls';

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

J
Joao Moreno 已提交
20 21 22 23 24 25 26
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 已提交
27
	constructor(protected ref: Ref) { }
J
Joao Moreno 已提交
28 29 30 31 32 33 34 35 36 37 38 39 40 41

	async run(model: Model): Promise<void> {
		const ref = this.treeish;

		if (!ref) {
			return;
		}

		await model.checkout(ref);
	}
}

class CheckoutTagItem extends CheckoutItem {

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

class CheckoutRemoteHeadItem extends CheckoutItem {

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

	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 已提交
63 64
class BranchDeleteItem implements QuickPickItem {

65 66 67
	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 已提交
68 69
	get description(): string { return this.shortCommit; }

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

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

80 81 82 83 84 85
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 已提交
86 87

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

J
Joao Moreno 已提交
92 93 94 95 96 97 98 99 100 101
class CreateBranchItem implements QuickPickItem {

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

	async run(model: Model): Promise<void> {
		await commands.executeCommand('git.branch');
	}
}

102 103 104 105 106 107 108 109 110
interface Command {
	commandId: string;
	key: string;
	method: Function;
	skipModelCheck: boolean;
	requiresDiffInformation: boolean;
}

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

112
function command(commandId: string, skipModelCheck = false, requiresDiffInformation = false): Function {
J
Joao Moreno 已提交
113
	return (target: any, key: string, descriptor: any) => {
J
Joao Moreno 已提交
114 115 116 117
		if (!(typeof descriptor.value === 'function')) {
			throw new Error('not supported');
		}

118
		Commands.push({ commandId, key, method: descriptor.value, skipModelCheck, requiresDiffInformation });
J
Joao Moreno 已提交
119 120
	};
}
J
Joao Moreno 已提交
121

J
Joao Moreno 已提交
122
export class CommandCenter {
J
Joao Moreno 已提交
123

J
Joao Moreno 已提交
124
	private model: Model;
J
Joao Moreno 已提交
125
	private disposables: Disposable[];
J
Joao Moreno 已提交
126

J
Joao Moreno 已提交
127
	constructor(
J
Joao Moreno 已提交
128
		private git: Git,
J
Joao Moreno 已提交
129
		model: Model | undefined,
J
Joao Moreno 已提交
130 131
		private outputChannel: OutputChannel,
		private telemetryReporter: TelemetryReporter
J
Joao Moreno 已提交
132
	) {
J
Joao Moreno 已提交
133 134 135 136
		if (model) {
			this.model = model;
		}

J
Joao Moreno 已提交
137
		this.disposables = Commands
138 139 140 141 142 143 144 145 146
			.map(({ commandId, key, method, skipModelCheck, requiresDiffInformation }) => {
				const command = this.createCommand(commandId, key, method, skipModelCheck);

				if (requiresDiffInformation) {
					return commands.registerDiffInformationCommand(commandId, command);
				} else {
					return commands.registerCommand(commandId, command);
				}
			});
J
Joao Moreno 已提交
147 148
	}

J
Joao Moreno 已提交
149
	@command('git.refresh')
J
Joao Moreno 已提交
150
	async refresh(): Promise<void> {
J
Joao Moreno 已提交
151
		await this.model.status();
J
Joao Moreno 已提交
152
	}
J
Joao Moreno 已提交
153

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

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

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

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

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

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

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

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

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

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

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

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

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

			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
J
Joao Moreno 已提交
221 222
				const uriString = resource.resourceUri.toString();
				const [indexStatus] = this.model.indexGroup.resources.filter(r => r.resourceUri.toString() === uriString);
J
Joao Moreno 已提交
223

J
Joao Moreno 已提交
224 225
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
226 227
				}

J
Joao Moreno 已提交
228
				return resource.resourceUri;
J
Joao Moreno 已提交
229

230
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
231
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
232
				return resource.resourceUri;
J
Joao Moreno 已提交
233 234 235 236
		}
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
237
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
238 239 240 241

		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
M
Marc Kassay 已提交
242
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
243 244 245
				return `${basename} (Index)`;

			case Status.MODIFIED:
M
Marc Kassay 已提交
246 247
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
248 249 250 251 252 253
				return `${basename} (Working Tree)`;
		}

		return '';
	}

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

		if (!url) {
262 263
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
264 265
		}

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

J
Joao Moreno 已提交
269 270
		const parentPath = await window.showInputBox({
			prompt: localize('parent', "Parent Directory"),
J
Joao Moreno 已提交
271
			value,
J
Joao Moreno 已提交
272
			ignoreFocusOut: true
J
Joao Moreno 已提交
273 274 275
		});

		if (!parentPath) {
276 277
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
			return;
J
Joao Moreno 已提交
278 279
		}

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

J
Joao Moreno 已提交
282

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

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

J
Joao Moreno 已提交
307 308 309 310 311
	@command('git.init')
	async init(): Promise<void> {
		await this.model.init();
	}

J
Joao Moreno 已提交
312
	@command('git.openFile')
313 314
	async openFile(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
		let uris: Uri[] | undefined;
315 316 317

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
318
				uris = [Uri.file(fromGitUri(arg).path)];
319
			} else if (arg.scheme === 'file') {
320
				uris = [arg];
321 322 323 324 325 326 327 328 329 330
			}
		} else {
			let resource = arg;

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

			if (resource) {
331
				uris = [...resourceStates.map(r => r.resourceUri), resource.resourceUri];
332
			}
J
Joao Moreno 已提交
333 334
		}

335
		if (!uris) {
J
Joao Moreno 已提交
336
			return;
J
Joao Moreno 已提交
337 338
		}

339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358
		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 已提交
359
		}
J
Joao Moreno 已提交
360 361
	}

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

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
			resource = this.getSCMResource(arg);
		} else {
			resource = this.getSCMResource();
		}

		if (!resource) {
			return;
		}

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

J
Joao Moreno 已提交
380 381 382
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
383
		}
J
Joao Moreno 已提交
384 385

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

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

392 393 394 395 396 397 398 399
		if (arg instanceof Uri) {
			const resource = this.getSCMResource(arg);
			if (resource !== undefined) {
				resources = [resource];
			}
		}
		else {
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
400

401 402 403 404 405 406 407 408 409
			if (arg instanceof Resource) {
				resource = arg;
			} else {
				resource = this.getSCMResource();
			}

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

412
		if (!resources) {
J
Joao Moreno 已提交
413
			return;
J
Joao Moreno 已提交
414
		}
J
Joao Moreno 已提交
415

416 417 418 419
		const preview = resources.length === 1 ? undefined : false;
		for (const resource of resources) {
			await this._openResource(resource, preview);
		}
J
Joao Moreno 已提交
420 421
	}

J
Joao Moreno 已提交
422
	@command('git.stage')
423
	async stage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
424
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
425
			const resource = this.getSCMResource();
426 427 428 429 430 431 432 433

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

434 435 436
		const resources = resourceStates
			.filter(s => s instanceof Resource && (s.resourceGroup instanceof WorkingTreeGroup || s.resourceGroup instanceof MergeGroup)) as Resource[];

437
		if (!resources.length) {
J
Joao Moreno 已提交
438 439
			return;
		}
J
Joao Moreno 已提交
440

441
		return await this.model.add(...resources);
J
Joao Moreno 已提交
442 443
	}

J
Joao Moreno 已提交
444
	@command('git.stageAll')
J
Joao Moreno 已提交
445
	async stageAll(): Promise<void> {
J
Joao Moreno 已提交
446 447 448
		return await this.model.add();
	}

449 450
	@command('git.stageSelectedRanges', false, true)
	async stageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
451 452 453 454 455 456 457 458 459
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

J
Joao Moreno 已提交
460
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
461 462 463
			return;
		}

J
Joao Moreno 已提交
464
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
465
		const originalDocument = await workspace.openTextDocument(originalUri);
466 467 468 469
		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 已提交
470 471 472 473 474

		if (!selectedDiffs.length) {
			return;
		}

475 476
		const result = applyLineChanges(originalDocument, modifiedDocument, selectedDiffs);

J
Joao Moreno 已提交
477
		await this.model.stage(modifiedUri, result);
J
Joao Moreno 已提交
478
	}
J
Joao Moreno 已提交
479

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

		if (!textEditor) {
			return;
		}

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

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

J
Joao Moreno 已提交
495
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518
		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;
		}

519
		const result = applyLineChanges(originalDocument, modifiedDocument, selectedDiffs);
J
Joao Moreno 已提交
520 521 522 523 524
		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 已提交
525
	@command('git.unstage')
526
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
527
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
528
			const resource = this.getSCMResource();
529 530 531 532 533 534 535 536

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

537 538 539
		const resources = resourceStates
			.filter(s => s instanceof Resource && s.resourceGroup instanceof IndexGroup) as Resource[];

540
		if (!resources.length) {
J
Joao Moreno 已提交
541 542 543
			return;
		}

544
		return await this.model.revertFiles(...resources);
J
Joao Moreno 已提交
545 546
	}

J
Joao Moreno 已提交
547
	@command('git.unstageAll')
J
Joao Moreno 已提交
548
	async unstageAll(): Promise<void> {
J
Joao Moreno 已提交
549
		return await this.model.revertFiles();
J
Joao Moreno 已提交
550
	}
J
Joao Moreno 已提交
551

552 553
	@command('git.unstageSelectedRanges', false, true)
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
554 555 556 557 558 559 560 561 562
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

563 564 565 566 567 568 569
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
570 571 572
			return;
		}

J
Joao Moreno 已提交
573
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
574
		const originalDocument = await workspace.openTextDocument(originalUri);
575 576 577 578
		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 已提交
579 580 581 582 583

		if (!selectedDiffs.length) {
			return;
		}

584 585
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
586 587 588 589

		await this.model.stage(modifiedUri, result);
	}

J
Joao Moreno 已提交
590
	@command('git.clean')
591
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
592
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
593
			const resource = this.getSCMResource();
594 595 596 597 598 599 600 601

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

602 603 604
		const resources = resourceStates
			.filter(s => s instanceof Resource && s.resourceGroup instanceof WorkingTreeGroup) as Resource[];

605
		if (!resources.length) {
J
Joao Moreno 已提交
606 607
			return;
		}
J
Joao Moreno 已提交
608

J
Joao Moreno 已提交
609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626
		const untrackedCount = resources.reduce((s, r) => s + (r.type === Status.UNTRACKED ? 1 : 0), 0);
		let message: string;
		let yes = localize('discard', "Discard Changes");

		if (resources.length === 1) {
			if (untrackedCount > 0) {
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(resources[0].resourceUri.fsPath));
				yes = localize('delete file', "Delete file");
			} else {
				message = localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(resources[0].resourceUri.fsPath));
			}
		} else {
			message = localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", resources.length);

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

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

J
Joao Moreno 已提交
630 631 632 633
		if (pick !== yes) {
			return;
		}

634
		await this.model.clean(...resources);
J
Joao Moreno 已提交
635
	}
J
Joao Moreno 已提交
636

J
Joao Moreno 已提交
637
	@command('git.cleanAll')
J
Joao Moreno 已提交
638
	async cleanAll(): Promise<void> {
J
Joao Moreno 已提交
639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678
		const config = workspace.getConfiguration('git');
		let scope = config.get<string>('discardAllScope') || 'prompt';
		let resources = this.model.workingTreeGroup.resources;

		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);
679
		const yes = localize('discardAll', "Discard ALL Changes");
J
Joao Moreno 已提交
680
		const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
681 682 683 684 685

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

J
Joao Moreno 已提交
686
		await this.model.clean(...resources);
J
Joao Moreno 已提交
687 688
	}

J
Joao Moreno 已提交
689
	private async smartCommit(
690
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
691 692
		opts?: CommitOptions
	): Promise<boolean> {
693 694
		const config = workspace.getConfiguration('git');
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
695
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
696
		const noStagedChanges = this.model.indexGroup.resources.length === 0;
697
		const noUnstagedChanges = this.model.workingTreeGroup.resources.length === 0;
698 699

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

J
Joao Moreno 已提交
702 703
			// 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?");
704 705 706 707 708
			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 已提交
709 710 711
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
712 713 714
			}
		}

J
Joao Moreno 已提交
715
		if (!opts) {
716
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
717 718
		}

719 720 721
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

J
Joao Moreno 已提交
722 723
		if (
			// no changes
724
			(noStagedChanges && noUnstagedChanges)
J
Joao Moreno 已提交
725
			// or no staged changes and not `all`
726
			|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
727
		) {
J
Joao Moreno 已提交
728 729 730 731
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
732
		const message = await getCommitMessage();
J
Joao Moreno 已提交
733 734 735 736 737 738

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

J
Joao Moreno 已提交
739
		await this.model.commit(message, opts);
J
Joao Moreno 已提交
740 741 742 743

		return true;
	}

J
Joao Moreno 已提交
744
	private async commitWithAnyInput(opts?: CommitOptions): Promise<void> {
745
		const message = scm.inputBox.value;
J
Joao Moreno 已提交
746
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
747 748 749 750 751 752
			if (message) {
				return message;
			}

			return await window.showInputBox({
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
753 754
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
755
			});
J
Joao Moreno 已提交
756 757 758
		};

		const didCommit = await this.smartCommit(getCommitMessage, opts);
J
Joao Moreno 已提交
759 760

		if (message && didCommit) {
J
Joao Moreno 已提交
761
			scm.inputBox.value = await this.model.getCommitTemplate();
J
Joao Moreno 已提交
762
		}
J
Joao Moreno 已提交
763 764
	}

J
Joao Moreno 已提交
765
	@command('git.commit')
J
Joao Moreno 已提交
766 767 768 769
	async commit(): Promise<void> {
		await this.commitWithAnyInput();
	}

J
Joao Moreno 已提交
770
	@command('git.commitWithInput')
J
Joao Moreno 已提交
771
	async commitWithInput(): Promise<void> {
J
Joao Moreno 已提交
772 773 774 775
		if (!scm.inputBox.value) {
			return;
		}

J
Joao Moreno 已提交
776
		const didCommit = await this.smartCommit(async () => scm.inputBox.value);
J
Joao Moreno 已提交
777 778

		if (didCommit) {
J
Joao Moreno 已提交
779
			scm.inputBox.value = await this.model.getCommitTemplate();
J
Joao Moreno 已提交
780
		}
J
Joao Moreno 已提交
781 782
	}

J
Joao Moreno 已提交
783
	@command('git.commitStaged')
J
Joao Moreno 已提交
784
	async commitStaged(): Promise<void> {
J
Joao Moreno 已提交
785
		await this.commitWithAnyInput({ all: false });
J
Joao Moreno 已提交
786 787
	}

J
Joao Moreno 已提交
788
	@command('git.commitStagedSigned')
J
Joao Moreno 已提交
789
	async commitStagedSigned(): Promise<void> {
J
Joao Moreno 已提交
790
		await this.commitWithAnyInput({ all: false, signoff: true });
J
Joao Moreno 已提交
791 792
	}

K
Krzysztof Cieślak 已提交
793 794 795 796 797
	@command('git.commitStagedAmend')
	async commitStagedAmend(): Promise<void> {
		await this.commitWithAnyInput({ all: false, amend: true });
	}

J
Joao Moreno 已提交
798
	@command('git.commitAll')
J
Joao Moreno 已提交
799
	async commitAll(): Promise<void> {
J
Joao Moreno 已提交
800
		await this.commitWithAnyInput({ all: true });
J
Joao Moreno 已提交
801 802
	}

J
Joao Moreno 已提交
803
	@command('git.commitAllSigned')
J
Joao Moreno 已提交
804
	async commitAllSigned(): Promise<void> {
J
Joao Moreno 已提交
805
		await this.commitWithAnyInput({ all: true, signoff: true });
J
Joao Moreno 已提交
806 807
	}

K
Krzysztof Cieślak 已提交
808 809 810 811 812
	@command('git.commitAllAmend')
	async commitAllAmend(): Promise<void> {
		await this.commitWithAnyInput({ all: true, amend: true });
	}

J
Joao Moreno 已提交
813
	@command('git.undoCommit')
J
Joao Moreno 已提交
814
	async undoCommit(): Promise<void> {
J
Joao Moreno 已提交
815 816 817 818 819 820 821 822 823
		const HEAD = this.model.HEAD;

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

		const commit = await this.model.getCommit('HEAD');
		await this.model.reset('HEAD~');
		scm.inputBox.value = commit.message;
J
Joao Moreno 已提交
824 825
	}

J
Joao Moreno 已提交
826
	@command('git.checkout')
J
Joao Moreno 已提交
827 828 829 830 831
	async checkout(treeish: string): Promise<void> {
		if (typeof treeish === 'string') {
			return await this.model.checkout(treeish);
		}

J
Joao Moreno 已提交
832
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
833
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
834 835 836
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
837 838
		const createBranch = new CreateBranchItem();

J
Joao Moreno 已提交
839 840 841 842 843 844 845 846 847
		const heads = this.model.refs.filter(ref => ref.type === RefType.Head)
			.map(ref => new CheckoutItem(ref));

		const tags = (includeTags ? this.model.refs.filter(ref => ref.type === RefType.Tag) : [])
			.map(ref => new CheckoutTagItem(ref));

		const remoteHeads = (includeRemotes ? this.model.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
			.map(ref => new CheckoutRemoteHeadItem(ref));

J
Joao Moreno 已提交
848
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
849
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
850
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
851 852 853 854 855 856

		if (!choice) {
			return;
		}

		await choice.run(this.model);
J
Joao Moreno 已提交
857 858
	}

J
Joao Moreno 已提交
859
	@command('git.branch')
J
Joao Moreno 已提交
860 861
	async branch(): Promise<void> {
		const result = await window.showInputBox({
J
Joao Moreno 已提交
862
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
863 864
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
865
		});
J
Joao Moreno 已提交
866

J
Joao Moreno 已提交
867 868 869
		if (!result) {
			return;
		}
J
Joao Moreno 已提交
870

J
Joao Moreno 已提交
871 872
		const name = result.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
		await this.model.branch(name);
J
Joao Moreno 已提交
873 874
	}

M
Maik Riechert 已提交
875
	@command('git.deleteBranch')
876 877 878 879 880 881 882 883
	async deleteBranch(name: string, force?: boolean): Promise<void> {
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
			run = force => this.model.deleteBranch(name, force);
		} else {
			const currentHead = this.model.HEAD && this.model.HEAD.name;
			const heads = this.model.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
884

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

M
Maik Riechert 已提交
888
			if (!choice || !choice.branchName) {
889 890
				return;
			}
M
Maik Riechert 已提交
891
			name = choice.branchName;
892
			run = force => choice.run(this.model, force);
M
Maik Riechert 已提交
893 894
		}

895 896 897 898 899 900 901 902 903 904 905 906 907 908 909
		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 已提交
910 911
	}

912 913 914 915 916 917 918
	@command('git.merge')
	async merge(): Promise<void> {
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

		const heads = this.model.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
919 920
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
921 922

		const remoteHeads = (includeRemotes ? this.model.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
923 924
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
925 926

		const picks = [...heads, ...remoteHeads];
927 928
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
929 930 931 932 933

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
934 935 936 937 938 939 940 941 942 943
		try {
			await choice.run(this.model);
		} 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);
		}
944 945
	}

946 947 948 949 950 951 952 953 954 955 956 957 958 959
	@command('git.createTag')
	async createTag(): Promise<void> {
		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 已提交
960
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
961 962 963 964 965 966 967 968
			ignoreFocusOut: true
		});

		const name = inputTagName.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
		const message = inputMessage || name;
		await this.model.tag(name, message);
	}

J
Joao Moreno 已提交
969
	@command('git.pullFrom')
970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998
	async pullFrom(): Promise<void> {
		const remotes = this.model.remotes;

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

		this.model.pull(false, pick.label, branchName);
	}

J
Joao Moreno 已提交
999
	@command('git.pull')
J
Joao Moreno 已提交
1000
	async pull(): Promise<void> {
J
Joao Moreno 已提交
1001 1002 1003 1004 1005 1006 1007 1008
		const remotes = this.model.remotes;

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

		await this.model.pull();
J
Joao Moreno 已提交
1009 1010
	}

J
Joao Moreno 已提交
1011
	@command('git.pullRebase')
J
Joao Moreno 已提交
1012
	async pullRebase(): Promise<void> {
J
Joao Moreno 已提交
1013 1014 1015 1016 1017 1018 1019
		const remotes = this.model.remotes;

		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 this.model.pullWithRebase();
J
Joao Moreno 已提交
1021 1022
	}

J
Joao Moreno 已提交
1023
	@command('git.push')
J
Joao Moreno 已提交
1024
	async push(): Promise<void> {
J
Joao Moreno 已提交
1025 1026 1027 1028 1029 1030 1031 1032
		const remotes = this.model.remotes;

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

		await this.model.push();
J
Joao Moreno 已提交
1033 1034
	}

1035 1036 1037 1038 1039 1040 1041 1042 1043
	@command('git.pushWithTags')
	async pushWithTags(): Promise<void> {
		const remotes = this.model.remotes;

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

1044
		await this.model.pushTags();
1045 1046 1047 1048

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

J
Joao Moreno 已提交
1049
	@command('git.pushTo')
J
Joao Moreno 已提交
1050
	async pushTo(): Promise<void> {
J
Joao Moreno 已提交
1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071
		const remotes = this.model.remotes;

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

		if (!this.model.HEAD || !this.model.HEAD.name) {
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

		const branchName = this.model.HEAD.name;
		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 已提交
1072
		this.model.pushTo(pick.label, branchName);
J
Joao Moreno 已提交
1073 1074
	}

J
Joao Moreno 已提交
1075
	@command('git.sync')
J
Joao Moreno 已提交
1076
	async sync(): Promise<void> {
J
Joao Moreno 已提交
1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098
		const HEAD = this.model.HEAD;

		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 已提交
1099 1100 1101
		await this.model.sync();
	}

J
Joao Moreno 已提交
1102
	@command('git.publish')
J
Joao Moreno 已提交
1103
	async publish(): Promise<void> {
J
Joao Moreno 已提交
1104 1105 1106 1107 1108 1109 1110
		const remotes = this.model.remotes;

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

J
Joao Moreno 已提交
1111 1112
		const branchName = this.model.HEAD && this.model.HEAD.name || '';
		const picks = this.model.remotes.map(r => r.name);
J
Joao Moreno 已提交
1113
		const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
J
Joao Moreno 已提交
1114 1115 1116 1117 1118 1119
		const choice = await window.showQuickPick(picks, { placeHolder });

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1120
		await this.model.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1121 1122
	}

J
Joao Moreno 已提交
1123
	@command('git.showOutput')
J
Joao Moreno 已提交
1124 1125 1126 1127
	showOutput(): void {
		this.outputChannel.show();
	}

N
NKumar2 已提交
1128 1129
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
1130 1131
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
			const uri = window.activeTextEditor && window.activeTextEditor.document.uri;
N
NKumar2 已提交
1132

J
Joao Moreno 已提交
1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144
			if (!uri) {
				return;
			}

			return await this.model.ignore([uri]);
		}

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

		if (!uris.length) {
N
NKumar2 已提交
1145 1146 1147
			return;
		}

J
Joao Moreno 已提交
1148
		await this.model.ignore(uris);
N
NKumar2 已提交
1149 1150
	}

K
Krzysztof Cieślak 已提交
1151
	@command('git.stash')
J
Joao Moreno 已提交
1152 1153
	async stash(): Promise<void> {
		if (this.model.workingTreeGroup.resources.length === 0) {
K
Krzysztof Cieślak 已提交
1154 1155 1156
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167

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

		await this.model.createStash(message);
K
Krzysztof Cieślak 已提交
1168 1169 1170 1171
	}

	@command('git.stashPop')
	async stashPop(): Promise<void> {
J
Joao Moreno 已提交
1172 1173 1174
		const stashes = await this.model.getStashes();

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1175 1176 1177 1178
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1179 1180
		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 已提交
1181 1182 1183 1184 1185
		const choice = await window.showQuickPick(picks, { placeHolder });

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

		await this.model.popStash(choice.id);
K
Krzysztof Cieślak 已提交
1188 1189 1190 1191
	}

	@command('git.stashPopLatest')
	async stashPopLatest(): Promise<void> {
J
Joao Moreno 已提交
1192 1193 1194
		const stashes = await this.model.getStashes();

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1195 1196 1197 1198
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

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

J
Joao Moreno 已提交
1202
	private createCommand(id: string, key: string, method: Function, skipModelCheck: boolean): (...args: any[]) => any {
1203
		const result = (...args) => {
J
Joao Moreno 已提交
1204
			if (!skipModelCheck && !this.model) {
J
Joao Moreno 已提交
1205 1206 1207 1208
				window.showInformationMessage(localize('disabled', "Git is either disabled or not supported in this workspace"));
				return;
			}

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

J
Joao Moreno 已提交
1211 1212 1213 1214 1215 1216
			const result = Promise.resolve(method.apply(this, args));

			return result.catch(async err => {
				let message: string;

				switch (err.gitErrorCode) {
1217
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1218 1219
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1220 1221 1222
					case GitErrorCodes.PushRejected:
						message = localize('cant push', "Can't push refs to remote. Run 'Pull' first to integrate your changes.");
						break;
J
Joao Moreno 已提交
1223
					default:
1224 1225 1226
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1227
							.split(/[\r\n]/)
1228 1229 1230 1231 1232 1233
							.filter(line => !!line)
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251

						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();
				}
			});
		};
1252 1253 1254 1255 1256

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

		return result;
J
Joao Moreno 已提交
1257 1258
	}

1259 1260
	private getSCMResource(uri?: Uri): Resource | undefined {
		uri = uri ? uri : window.activeTextEditor && window.activeTextEditor.document.uri;
J
Joao Moreno 已提交
1261 1262

		if (!uri) {
1263
			return undefined;
J
Joao Moreno 已提交
1264 1265 1266
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1267 1268
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1269 1270 1271 1272 1273
		}

		if (uri.scheme === 'file') {
			const uriString = uri.toString();

J
Joao Moreno 已提交
1274 1275
			return this.model.workingTreeGroup.resources.filter(r => r.resourceUri.toString() === uriString)[0]
				|| this.model.indexGroup.resources.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1276 1277 1278
		}
	}

J
Joao Moreno 已提交
1279 1280 1281
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
Joao Moreno 已提交
1282
}