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

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

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

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

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

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

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

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

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

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

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

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

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

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

				if (!repository) {
					return;
				}

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

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

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

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

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

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

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

		return '';
	}

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

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

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

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

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

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

J
Joao Moreno 已提交
287

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

292 293 294 295 296 297 298 299 300 301
			const repositoryPath = await clonePromise;

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

			const openFolder = result === open;
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
			if (openFolder) {
				commands.executeCommand('vscode.openFolder', Uri.file(repositoryPath));
			}
302 303
		} catch (err) {
			if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
304 305 306
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'directory_not_empty' });
			} else {
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'error' });
307 308
			}
			throw err;
J
Joao Moreno 已提交
309 310 311
		}
	}

J
Joao Moreno 已提交
312
	@command('git.init')
J
Joao Moreno 已提交
313
	async init(): Promise<void> {
J
Joao Moreno 已提交
314 315 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 372 373 374
			if (activeTextEditor && activeTextEditor.document.uri.toString() === uri.toString()) {
				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;
409
		let resources: Resource[] | undefined = undefined;
410

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

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

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

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

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

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

455 456
		if (mergeConflicts.length > 0) {
			const message = mergeConflicts.length > 1
457 458 459
				? 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));

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

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

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

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

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

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

J
Joao Moreno 已提交
481 482
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498
		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 已提交
499
		await repository.add([]);
J
Joao Moreno 已提交
500 501
	}

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

		if (!textEditor) {
			return;
		}

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

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

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

		if (!selectedDiffs.length) {
			return;
		}

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

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

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

		if (!textEditor) {
			return;
		}

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

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

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

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

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

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

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

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

		if (!textEditor) {
			return;
		}

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

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

		const { ref } = fromGitUri(modifiedUri);

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

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

		if (!selectedDiffs.length) {
			return;
		}

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

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

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

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

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

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

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

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

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

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

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

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

J
Joao Moreno 已提交
700 701
		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 已提交
702

J
Joao Moreno 已提交
703 704 705 706 707 708
		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 已提交
709
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
710
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
711

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

J
Joao 已提交
716
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
717 718 719 720 721 722 723 724
			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 已提交
725 726
			}

J
Joao 已提交
727
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
728 729 730 731
		} 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 已提交
732

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

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

J
Joao Moreno 已提交
739 740 741 742
		} 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 已提交
743

J
Joao Moreno 已提交
744 745 746 747 748
			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 已提交
749

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

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

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

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

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

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

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

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

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

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

		if (!message) {
			return false;
		}

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

		return true;
	}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

		if (!choice) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

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

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

		if (!choice) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

		if (!choice) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

J
Joao Moreno 已提交
1295
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1296
					if (!repository) {
J
Joao Moreno 已提交
1297 1298 1299
						return Promise.reject(localize('modelnotfound', "Git model not found"));
					}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

J
Joao Moreno 已提交
1377
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
1378 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
	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 已提交
1408 1409 1410
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
Joao Moreno 已提交
1411
}