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

'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 已提交
155
		await this._openResource(resource, undefined, true, false);
J
Joao Moreno 已提交
156 157
	}

J
Joao 已提交
158
	private async _openResource(resource: Resource, preview?: boolean, preserveFocus?: boolean, preserveSelection?: 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
		const activeTextEditor = window.activeTextEditor;

J
Joao 已提交
177
		if (preserveSelection && activeTextEditor && activeTextEditor.document.uri.fsPath === right.fsPath) {
J
Joao Moreno 已提交
178 179 180
			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 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330
		const value = workspace.workspaceFolders && workspace.workspaceFolders.length > 0
			? workspace.workspaceFolders[0].uri.fsPath
			: os.homedir();

		const path = await window.showInputBox({
			placeHolder: localize('path to init', "Folder path"),
			prompt: localize('provide path', "Please provide a folder path to initialize a Git repository"),
			value,
			ignoreFocusOut: true
		});

		if (!path) {
			return;
		}

		await this.git.init(path);
		await this.model.tryOpenRepository(path);
J
Joao Moreno 已提交
331 332
	}

J
Joao Moreno 已提交
333 334
	@command('git.openFile')
	async openFile(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
335
		const preserveFocus = arg instanceof Resource;
J
Joao Moreno 已提交
336

337
		let uris: Uri[] | undefined;
338 339 340

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
341
				uris = [Uri.file(fromGitUri(arg).path)];
342
			} else if (arg.scheme === 'file') {
343
				uris = [arg];
344 345 346 347 348 349
			}
		} else {
			let resource = arg;

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

			if (resource) {
354
				uris = [...resourceStates.map(r => r.resourceUri), resource.resourceUri];
355
			}
J
Joao Moreno 已提交
356 357
		}

358
		if (!uris) {
J
Joao Moreno 已提交
359
			return;
J
Joao Moreno 已提交
360 361
		}

362 363 364 365
		const preview = uris.length === 1 ? true : false;
		const activeTextEditor = window.activeTextEditor;
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
366
				preserveFocus,
367 368 369 370
				preview: preview,
				viewColumn: activeTextEditor && activeTextEditor.viewColumn || ViewColumn.One
			};

B
Benjamin Pasero 已提交
371
			if (activeTextEditor && activeTextEditor.document.uri.fsPath === uri.fsPath) {
B
Benjamin Pasero 已提交
372 373 374
				opts.selection = activeTextEditor.selection;
			}

375 376
			const document = await workspace.openTextDocument(uri);
			await window.showTextDocument(document, opts);
J
Joao Moreno 已提交
377
		}
J
Joao Moreno 已提交
378 379
	}

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

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

		if (!resource) {
			return;
		}

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

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

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

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

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

420 421 422
			if (arg instanceof Resource) {
				resource = arg;
			} else {
423
				resource = this.getSCMResource();
424 425 426 427 428
			}

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

431
		if (!resources) {
J
Joao Moreno 已提交
432
			return;
J
Joao Moreno 已提交
433
		}
J
Joao Moreno 已提交
434

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

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

453 454 455
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
		const mergeConflicts = selection.filter(s => s.resourceGroupType === ResourceGroupType.Merge);

456 457
		if (mergeConflicts.length > 0) {
			const message = mergeConflicts.length > 1
458 459 460
				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", mergeConflicts.length)
				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(mergeConflicts[0].resourceUri.fsPath));

461 462 463 464 465 466 467 468
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

469 470 471 472
		const workingTree = selection
			.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);

		const scmResources = [...workingTree, ...mergeConflicts];
473

474
		if (!scmResources.length) {
J
Joao Moreno 已提交
475 476
			return;
		}
J
Joao Moreno 已提交
477

478
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
479
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
480 481
	}

J
Joao Moreno 已提交
482 483
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499
		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
		const mergeConflicts = resources.filter(s => s.resourceGroupType === ResourceGroupType.Merge);

		if (mergeConflicts.length > 0) {
			const message = mergeConflicts.length > 1
				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", mergeConflicts.length)
				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(mergeConflicts[0].resourceUri.fsPath));

			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
500
		await repository.add([]);
J
Joao Moreno 已提交
501 502
	}

J
Joao Moreno 已提交
503 504
	@command('git.stageSelectedRanges', { diff: true })
	async stageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
505 506 507 508 509 510 511 512 513
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

J
Joao Moreno 已提交
514
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
515 516 517
			return;
		}

J
Joao Moreno 已提交
518
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
519
		const originalDocument = await workspace.openTextDocument(originalUri);
520 521 522 523
		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 已提交
524 525 526 527 528

		if (!selectedDiffs.length) {
			return;
		}

529 530
		const result = applyLineChanges(originalDocument, modifiedDocument, selectedDiffs);

J
Joao Moreno 已提交
531
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
532
	}
J
Joao Moreno 已提交
533

J
Joao Moreno 已提交
534 535
	@command('git.revertSelectedRanges', { diff: true })
	async revertSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
536 537 538 539 540 541 542 543 544 545 546 547 548
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

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

J
Joao Moreno 已提交
549
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572
		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;
		}

573
		const result = applyLineChanges(originalDocument, modifiedDocument, selectedDiffs);
J
Joao Moreno 已提交
574 575 576 577 578
		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 已提交
579 580
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
581
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
582
			const resource = this.getSCMResource();
583 584 585 586 587 588 589 590

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

594
		if (!scmResources.length) {
J
Joao Moreno 已提交
595 596 597
			return;
		}

598
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
599
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
600 601
	}

J
Joao Moreno 已提交
602 603
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
604
		await repository.revert([]);
J
Joao Moreno 已提交
605
	}
J
Joao Moreno 已提交
606

J
Joao Moreno 已提交
607 608
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
609 610 611 612 613 614 615 616 617
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

618 619 620 621 622 623 624
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
625 626 627
			return;
		}

J
Joao Moreno 已提交
628
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
629
		const originalDocument = await workspace.openTextDocument(originalUri);
630 631 632 633
		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 已提交
634 635 636 637 638

		if (!selectedDiffs.length) {
			return;
		}

639 640
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
641

J
Joao Moreno 已提交
642
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
643 644
	}

J
Joao Moreno 已提交
645 646
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
647
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
648
			const resource = this.getSCMResource();
649 650 651 652 653 654 655 656

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
660
		if (!scmResources.length) {
J
Joao Moreno 已提交
661 662
			return;
		}
J
Joao Moreno 已提交
663

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

J
Joao Moreno 已提交
668
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
669
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
670
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
671 672
				yes = localize('delete file', "Delete file");
			} else {
J
Joao Moreno 已提交
673
				message = localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
674 675
			}
		} else {
J
Joao Moreno 已提交
676
			message = localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", scmResources.length);
J
Joao Moreno 已提交
677 678 679 680 681

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

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

J
Joao Moreno 已提交
685 686 687 688
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
689
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
690
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
691
	}
J
Joao Moreno 已提交
692

J
Joao Moreno 已提交
693 694
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
695
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
696 697 698 699 700

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

J
Joao Moreno 已提交
701 702
		const trackedResources = resources.filter(r => r.type !== Status.UNTRACKED && r.type !== Status.IGNORED);
		const untrackedResources = resources.filter(r => r.type === Status.UNTRACKED || r.type === Status.IGNORED);
J
Joao Moreno 已提交
703

J
Joao Moreno 已提交
704 705 706 707 708 709
		if (untrackedResources.length === 0) {
			const message = resources.length === 1
				? localize('confirm discard all single', "Are you sure you want to discard changes in {0}?", path.basename(resources[0].resourceUri.fsPath))
				: localize('confirm discard all', "Are you sure you want to discard ALL changes in {0} files?\nThis is IRREVERSIBLE!\nYour current working set will be FOREVER LOST.", resources.length);
			const yes = resources.length === 1
				? localize('discardAll multiple', "Discard 1 File")
J
Joao Moreno 已提交
710
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
711
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
712

J
Joao Moreno 已提交
713
			if (pick !== yes) {
J
Joao Moreno 已提交
714 715 716
				return;
			}

J
Joao 已提交
717
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
718 719 720 721 722 723 724 725
			return;
		} else if (resources.length === 1) {
			const message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(resources[0].resourceUri.fsPath));
			const yes = localize('delete file', "Delete file");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

			if (pick !== yes) {
				return;
J
Joao Moreno 已提交
726 727
			}

J
Joao 已提交
728
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
729 730 731 732
		} else if (trackedResources.length === 0) {
			const message = localize('confirm delete multiple', "Are you sure you want to DELETE {0} files?", resources.length);
			const yes = localize('delete files', "Delete Files");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
733

J
Joao Moreno 已提交
734 735 736
			if (pick !== yes) {
				return;
			}
J
Joao Moreno 已提交
737

J
Joao 已提交
738
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
739

J
Joao Moreno 已提交
740 741 742 743
		} else { // resources.length > 1 && untrackedResources.length > 0 && trackedResources.length > 0
			const untrackedMessage = untrackedResources.length === 1
				? localize('there are untracked files single', "The following untracked file will be DELETED FROM DISK if discarded: {0}.", path.basename(untrackedResources[0].resourceUri.fsPath))
				: localize('there are untracked files', "There are {0} untracked files which will be DELETED FROM DISK if discarded.", untrackedResources.length);
J
Joao Moreno 已提交
744

J
Joao Moreno 已提交
745 746 747 748 749
			const message = localize('confirm discard all 2', "{0}\n\nThis is IRREVERSIBLE, your current working set will be FOREVER LOST.", untrackedMessage, resources.length);

			const yesTracked = trackedResources.length === 1
				? localize('yes discard tracked', "Discard 1 Tracked File", trackedResources.length)
				: localize('yes discard tracked multiple', "Discard {0} Tracked Files", trackedResources.length);
J
Joao Moreno 已提交
750

J
Joao Moreno 已提交
751
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
752 753 754 755 756 757 758 759
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

			if (pick === yesTracked) {
				resources = trackedResources;
			} else if (pick !== yesAll) {
				return;
			}

J
Joao 已提交
760
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
761
		}
J
Joao Moreno 已提交
762 763
	}

J
Joao Moreno 已提交
764
	private async smartCommit(
J
Joao Moreno 已提交
765
		repository: Repository,
766
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
767 768
		opts?: CommitOptions
	): Promise<boolean> {
769 770
		const config = workspace.getConfiguration('git');
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
771
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
772 773
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
774 775

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

J
Joao Moreno 已提交
778 779
			// 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?");
780 781 782 783 784
			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 已提交
785 786 787
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
788 789 790
			}
		}

J
Joao Moreno 已提交
791
		if (!opts) {
792
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
793 794
		}

795 796 797
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

J
Joao Moreno 已提交
798 799
		if (
			// no changes
800
			(noStagedChanges && noUnstagedChanges)
J
Joao Moreno 已提交
801
			// or no staged changes and not `all`
802
			|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
803
		) {
J
Joao Moreno 已提交
804 805 806 807
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
808
		const message = await getCommitMessage();
J
Joao Moreno 已提交
809 810 811 812 813

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
814
		await repository.commit(message, opts);
J
Joao Moreno 已提交
815 816 817 818

		return true;
	}

J
Joao Moreno 已提交
819
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
820
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
821
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
822 823 824 825 826 827
			if (message) {
				return message;
			}

			return await window.showInputBox({
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
828 829
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
830
			});
J
Joao Moreno 已提交
831 832
		};

J
Joao Moreno 已提交
833
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
834 835

		if (message && didCommit) {
J
Joao Moreno 已提交
836
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
837
		}
J
Joao Moreno 已提交
838 839
	}

J
Joao Moreno 已提交
840
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
841 842
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
843 844
	}

J
Joao Moreno 已提交
845
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
846
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
847
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
848 849 850
			return;
		}

J
Joao Moreno 已提交
851
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
852 853

		if (didCommit) {
J
Joao Moreno 已提交
854
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
855
		}
J
Joao Moreno 已提交
856 857
	}

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

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

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

J
Joao Moreno 已提交
873
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
874 875
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
876 877
	}

J
Joao Moreno 已提交
878
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
879 880
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
881 882
	}

J
Joao Moreno 已提交
883
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
884 885
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
886 887
	}

J
Joao Moreno 已提交
888
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
889 890
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
891 892 893 894 895

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

J
Joao Moreno 已提交
896 897
		const commit = await repository.getCommit('HEAD');
		await repository.reset('HEAD~');
J
Joao Moreno 已提交
898
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
899 900
	}

J
Joao Moreno 已提交
901
	@command('git.checkout', { repository: true })
J
Joao Moreno 已提交
902
	async checkout(repository: Repository, treeish: string): Promise<void> {
J
Joao Moreno 已提交
903
		if (typeof treeish === 'string') {
J
Joao Moreno 已提交
904
			return await repository.checkout(treeish);
J
Joao Moreno 已提交
905 906
		}

J
Joao Moreno 已提交
907
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
908
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
909 910 911
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
912 913
		const createBranch = new CreateBranchItem();

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

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

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

J
Joao Moreno 已提交
923
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
924
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
925
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
926 927 928 929 930

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
931
		await choice.run(repository);
J
Joao Moreno 已提交
932 933
	}

J
Joao Moreno 已提交
934
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
935
	async branch(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
936
		const result = await window.showInputBox({
J
Joao Moreno 已提交
937
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
938 939
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
940
		});
J
Joao Moreno 已提交
941

J
Joao Moreno 已提交
942 943 944
		if (!result) {
			return;
		}
J
Joao Moreno 已提交
945

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

J
Joao Moreno 已提交
950
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
951
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
952 953
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
954
			run = force => repository.deleteBranch(name, force);
955
		} else {
J
Joao Moreno 已提交
956 957
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
958
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
959

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

M
Maik Riechert 已提交
963
			if (!choice || !choice.branchName) {
964 965
				return;
			}
M
Maik Riechert 已提交
966
			name = choice.branchName;
J
Joao Moreno 已提交
967
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
968 969
		}

970 971 972 973 974 975 976 977 978 979 980 981 982 983 984
		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 已提交
985 986
	}

J
Joao Moreno 已提交
987
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
988
	async merge(repository: Repository): Promise<void> {
989 990 991 992
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
993
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
994 995
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
996

J
Joao Moreno 已提交
997
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
998 999
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1000 1001

		const picks = [...heads, ...remoteHeads];
1002 1003
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1004 1005 1006 1007 1008

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1009
		try {
J
Joao Moreno 已提交
1010
			await choice.run(repository);
J
Joao Moreno 已提交
1011 1012 1013 1014 1015 1016 1017 1018
		} 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);
		}
1019 1020
	}

J
Joao Moreno 已提交
1021
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1022
	async createTag(repository: Repository): Promise<void> {
1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034
		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 已提交
1035
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1036 1037 1038 1039 1040
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
1044
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1045 1046
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070

		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 已提交
1071
		repository.pull(false, pick.label, branchName);
1072 1073
	}

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

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

J
Joao Moreno 已提交
1083
		await repository.pull();
J
Joao Moreno 已提交
1084 1085
	}

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

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

J
Joao Moreno 已提交
1095
		await repository.pullWithRebase();
J
Joao Moreno 已提交
1096 1097
	}

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

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

J
Joao Moreno 已提交
1107
		await repository.push();
J
Joao Moreno 已提交
1108 1109
	}

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

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

J
Joao Moreno 已提交
1119
		await repository.pushTags();
1120 1121 1122 1123

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

J
Joao Moreno 已提交
1124
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1125 1126
	async pushTo(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1127 1128 1129 1130 1131 1132

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

J
Joao Moreno 已提交
1133
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1134 1135 1136 1137
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

J
Joao Moreno 已提交
1138
		const branchName = repository.HEAD.name;
J
Joao Moreno 已提交
1139 1140 1141 1142 1143 1144 1145 1146
		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 已提交
1147
		repository.pushTo(pick.label, branchName);
J
Joao Moreno 已提交
1148 1149
	}

J
Joao Moreno 已提交
1150
	@command('git.sync', { repository: true })
J
Joao Moreno 已提交
1151 1152
	async sync(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173

		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 已提交
1174
		await repository.sync();
J
Joao Moreno 已提交
1175 1176
	}

J
Joao Moreno 已提交
1177
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1178 1179
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1180 1181 1182 1183 1184 1185

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

J
Joao Moreno 已提交
1186 1187
		const branchName = repository.HEAD && repository.HEAD.name || '';
		const picks = repository.remotes.map(r => r.name);
J
Joao Moreno 已提交
1188
		const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
J
Joao Moreno 已提交
1189 1190 1191 1192 1193 1194
		const choice = await window.showQuickPick(picks, { placeHolder });

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1195
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1196 1197
	}

J
Joao Moreno 已提交
1198
	@command('git.showOutput')
J
Joao Moreno 已提交
1199 1200 1201 1202
	showOutput(): void {
		this.outputChannel.show();
	}

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

J
Joao Moreno 已提交
1208 1209 1210 1211
			if (!uri) {
				return;
			}

J
Joao Moreno 已提交
1212
			return await repository.ignore([uri]);
J
Joao Moreno 已提交
1213 1214 1215 1216 1217 1218 1219
		}

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

		if (!uris.length) {
N
NKumar2 已提交
1220 1221 1222
			return;
		}

J
Joao Moreno 已提交
1223
		await repository.ignore(uris);
N
NKumar2 已提交
1224 1225
	}

J
Joao Moreno 已提交
1226
	@command('git.stash', { repository: true })
J
Joao Moreno 已提交
1227 1228
	async stash(repository: Repository): Promise<void> {
		if (repository.workingTreeGroup.resourceStates.length === 0) {
K
Krzysztof Cieślak 已提交
1229 1230 1231
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1232 1233 1234 1235 1236 1237 1238 1239 1240 1241

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

J
Joao Moreno 已提交
1245
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1246 1247
	async stashPop(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1248 1249

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1250 1251 1252 1253
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1254 1255
		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 已提交
1256 1257 1258 1259 1260
		const choice = await window.showQuickPick(picks, { placeHolder });

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

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

J
Joao Moreno 已提交
1265
	@command('git.stashPopLatest', { repository: true })
J
Joao Moreno 已提交
1266 1267
	async stashPopLatest(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1268 1269

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1270 1271 1272 1273
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1274
		await repository.popStash();
J
Joao Moreno 已提交
1275
	}
K
Krzysztof Cieślak 已提交
1276

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

J
Joao Moreno 已提交
1281
			if (!options.repository) {
J
Joao Moreno 已提交
1282 1283
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1284 1285
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1286 1287 1288 1289 1290 1291 1292 1293 1294
				let repositoryPromise: Promise<Repository | undefined>;

				if (repository) {
					repositoryPromise = Promise.resolve(repository);
				} else if (this.model.repositories.length === 1) {
					repositoryPromise = Promise.resolve(this.model.repositories[0]);
				} else {
					repositoryPromise = this.model.pickRepository();
				}
1295

J
Joao Moreno 已提交
1296
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1297
					if (!repository) {
J
Joao 已提交
1298
						return Promise.resolve();
J
Joao Moreno 已提交
1299 1300
					}

J
Joao Moreno 已提交
1301
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1302
				});
J
Joao Moreno 已提交
1303 1304
			}

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

J
Joao Moreno 已提交
1307 1308 1309 1310
			return result.catch(async err => {
				let message: string;

				switch (err.gitErrorCode) {
1311
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1312 1313
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1314 1315 1316
					case GitErrorCodes.PushRejected:
						message = localize('cant push', "Can't push refs to remote. Run 'Pull' first to integrate your changes.");
						break;
J
Joao Moreno 已提交
1317
					default:
1318 1319 1320
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1321
							.split(/[\r\n]/)
1322 1323 1324 1325 1326 1327
							.filter(line => !!line)
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345

						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();
				}
			});
		};
1346 1347 1348 1349 1350

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

		return result;
J
Joao Moreno 已提交
1351 1352
	}

1353
	private getSCMResource(uri?: Uri): Resource | undefined {
1354
		uri = uri ? uri : window.activeTextEditor && window.activeTextEditor.document.uri;
J
Joao Moreno 已提交
1355 1356

		if (!uri) {
1357
			return undefined;
J
Joao Moreno 已提交
1358 1359 1360
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1361 1362
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1363 1364 1365 1366
		}

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

J
Joao Moreno 已提交
1369
			if (!repository) {
1370 1371
				return undefined;
			}
J
Joao Moreno 已提交
1372

J
Joao Moreno 已提交
1373 1374
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1375 1376 1377
		}
	}

J
Joao Moreno 已提交
1378
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408
	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);

			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 已提交
1409 1410 1411
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
Joao Moreno 已提交
1412
}