commands.ts 41.3 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> {
J
Joao Moreno 已提交
335 336
		const preserveFocus = !!arg;

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 366 367 368 369 370
		const preview = uris.length === 1 ? true : false;
		const activeTextEditor = window.activeTextEditor;
		for (const uri of uris) {
			// If the active editor matches the current uri, get its selection
			const selections = activeTextEditor && activeTextEditor.document.uri.toString() === uri.toString()
				? activeTextEditor.selections
				: undefined;

			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
371
				preserveFocus,
372 373 374 375 376 377 378 379 380 381
				preview: preview,
				viewColumn: activeTextEditor && activeTextEditor.viewColumn || ViewColumn.One
			};

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

			if (selections && window.activeTextEditor) {
				window.activeTextEditor.selections = selections;
			}
J
Joao Moreno 已提交
382
		}
J
Joao Moreno 已提交
383 384
	}

J
Joao Moreno 已提交
385 386
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
387 388 389 390 391
		let resource: Resource | undefined = undefined;

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
392
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
393
		} else {
394
			resource = this.getSCMResource();
D
Duroktar 已提交
395 396 397 398 399 400
		}

		if (!resource) {
			return;
		}

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

J
Joao Moreno 已提交
403 404 405
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
406
		}
J
Joao Moreno 已提交
407 408

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

J
Joao Moreno 已提交
411 412
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
413
		const preserveFocus = !!arg;
414
		let resources: Resource[] | undefined = undefined;
415

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

424 425 426
			if (arg instanceof Resource) {
				resource = arg;
			} else {
427
				resource = this.getSCMResource();
428 429 430 431 432
			}

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

435
		if (!resources) {
J
Joao Moreno 已提交
436
			return;
J
Joao Moreno 已提交
437
		}
J
Joao Moreno 已提交
438

439 440
		const preview = resources.length === 1 ? undefined : false;
		for (const resource of resources) {
J
Joao Moreno 已提交
441
			await this._openResource(resource, preview, preserveFocus);
442
		}
J
Joao Moreno 已提交
443 444
	}

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

460
		if (!scmResources.length) {
J
Joao Moreno 已提交
461 462
			return;
		}
J
Joao Moreno 已提交
463

464
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
465
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
466 467
	}

J
Joao Moreno 已提交
468 469
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
470
		await repository.add([]);
J
Joao Moreno 已提交
471 472
	}

J
Joao Moreno 已提交
473 474
	@command('git.stageSelectedRanges', { diff: true })
	async stageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
475 476 477 478 479 480 481 482 483
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

J
Joao Moreno 已提交
484
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
485 486 487
			return;
		}

J
Joao Moreno 已提交
488
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
489
		const originalDocument = await workspace.openTextDocument(originalUri);
490 491 492 493
		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 已提交
494 495 496 497 498

		if (!selectedDiffs.length) {
			return;
		}

499 500
		const result = applyLineChanges(originalDocument, modifiedDocument, selectedDiffs);

J
Joao Moreno 已提交
501
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
502
	}
J
Joao Moreno 已提交
503

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

		if (!textEditor) {
			return;
		}

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

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

J
Joao Moreno 已提交
519
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542
		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;
		}

543
		const result = applyLineChanges(originalDocument, modifiedDocument, selectedDiffs);
J
Joao Moreno 已提交
544 545 546 547 548
		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 已提交
549 550
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
551
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
552
			const resource = this.getSCMResource();
553 554 555 556 557 558 559 560

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

564
		if (!scmResources.length) {
J
Joao Moreno 已提交
565 566 567
			return;
		}

568
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
569
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
570 571
	}

J
Joao Moreno 已提交
572 573
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
574
		await repository.revert([]);
J
Joao Moreno 已提交
575
	}
J
Joao Moreno 已提交
576

J
Joao Moreno 已提交
577 578
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
579 580 581 582 583 584 585 586 587
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

588 589 590 591 592 593 594
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
595 596 597
			return;
		}

J
Joao Moreno 已提交
598
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
599
		const originalDocument = await workspace.openTextDocument(originalUri);
600 601 602 603
		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 已提交
604 605 606 607 608

		if (!selectedDiffs.length) {
			return;
		}

609 610
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
611

J
Joao Moreno 已提交
612
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
613 614
	}

J
Joao Moreno 已提交
615 616
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
617
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
618
			const resource = this.getSCMResource();
619 620 621 622 623 624 625 626

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
630
		if (!scmResources.length) {
J
Joao Moreno 已提交
631 632
			return;
		}
J
Joao Moreno 已提交
633

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

J
Joao Moreno 已提交
638
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
639
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
640
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
641 642
				yes = localize('delete file', "Delete file");
			} else {
J
Joao Moreno 已提交
643
				message = localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
644 645
			}
		} else {
J
Joao Moreno 已提交
646
			message = localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", scmResources.length);
J
Joao Moreno 已提交
647 648 649 650 651

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

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

J
Joao Moreno 已提交
655 656 657 658
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
659
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
660
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
661
	}
J
Joao Moreno 已提交
662

J
Joao Moreno 已提交
663 664
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
665 666
		const config = workspace.getConfiguration('git');
		let scope = config.get<string>('discardAllScope') || 'prompt';
J
Joao Moreno 已提交
667
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704

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

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

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

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

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

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

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

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

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

J
Joao Moreno 已提交
712
		await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
713 714
	}

J
Joao Moreno 已提交
715
	private async smartCommit(
J
Joao Moreno 已提交
716
		repository: Repository,
717
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
718 719
		opts?: CommitOptions
	): Promise<boolean> {
720 721
		const config = workspace.getConfiguration('git');
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
722
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
723 724
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
725 726

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

J
Joao Moreno 已提交
729 730
			// 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?");
731 732 733 734 735
			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 已提交
736 737 738
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
739 740 741
			}
		}

J
Joao Moreno 已提交
742
		if (!opts) {
743
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
744 745
		}

746 747 748
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

J
Joao Moreno 已提交
749 750
		if (
			// no changes
751
			(noStagedChanges && noUnstagedChanges)
J
Joao Moreno 已提交
752
			// or no staged changes and not `all`
753
			|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
754
		) {
J
Joao Moreno 已提交
755 756 757 758
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
759
		const message = await getCommitMessage();
J
Joao Moreno 已提交
760 761 762 763 764

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
765
		await repository.commit(message, opts);
J
Joao Moreno 已提交
766 767 768 769

		return true;
	}

J
Joao Moreno 已提交
770
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
771
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
772
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
773 774 775 776 777 778
			if (message) {
				return message;
			}

			return await window.showInputBox({
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
779 780
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
781
			});
J
Joao Moreno 已提交
782 783
		};

J
Joao Moreno 已提交
784
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
785 786

		if (message && didCommit) {
J
Joao Moreno 已提交
787
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
788
		}
J
Joao Moreno 已提交
789 790
	}

J
Joao Moreno 已提交
791
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
792 793
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
794 795
	}

J
Joao Moreno 已提交
796
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
797
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
798
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
799 800 801
			return;
		}

J
Joao Moreno 已提交
802
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
803 804

		if (didCommit) {
J
Joao Moreno 已提交
805
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
806
		}
J
Joao Moreno 已提交
807 808
	}

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

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

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

J
Joao Moreno 已提交
824
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
825 826
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
827 828
	}

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

J
Joao Moreno 已提交
834
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
835 836
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
837 838
	}

J
Joao Moreno 已提交
839
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
840 841
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
842 843 844 845 846

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

J
Joao Moreno 已提交
847 848
		const commit = await repository.getCommit('HEAD');
		await repository.reset('HEAD~');
J
Joao Moreno 已提交
849
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
850 851
	}

J
Joao Moreno 已提交
852
	@command('git.checkout', { repository: true })
J
Joao Moreno 已提交
853
	async checkout(repository: Repository, treeish: string): Promise<void> {
J
Joao Moreno 已提交
854
		if (typeof treeish === 'string') {
J
Joao Moreno 已提交
855
			return await repository.checkout(treeish);
J
Joao Moreno 已提交
856 857
		}

J
Joao Moreno 已提交
858
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
859
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
860 861 862
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
863 864
		const createBranch = new CreateBranchItem();

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

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

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

J
Joao Moreno 已提交
874
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
875
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
876
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
877 878 879 880 881

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
882
		await choice.run(repository);
J
Joao Moreno 已提交
883 884
	}

J
Joao Moreno 已提交
885
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
886
	async branch(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
887
		const result = await window.showInputBox({
J
Joao Moreno 已提交
888
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
889 890
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
891
		});
J
Joao Moreno 已提交
892

J
Joao Moreno 已提交
893 894 895
		if (!result) {
			return;
		}
J
Joao Moreno 已提交
896

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

J
Joao Moreno 已提交
901
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
902
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
903 904
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
905
			run = force => repository.deleteBranch(name, force);
906
		} else {
J
Joao Moreno 已提交
907 908
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
909
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
910

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

M
Maik Riechert 已提交
914
			if (!choice || !choice.branchName) {
915 916
				return;
			}
M
Maik Riechert 已提交
917
			name = choice.branchName;
J
Joao Moreno 已提交
918
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
919 920
		}

921 922 923 924 925 926 927 928 929 930 931 932 933 934 935
		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 已提交
936 937
	}

J
Joao Moreno 已提交
938
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
939
	async merge(repository: Repository): Promise<void> {
940 941 942 943
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
944
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
945 946
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
947

J
Joao Moreno 已提交
948
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
949 950
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
951 952

		const picks = [...heads, ...remoteHeads];
953 954
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
955 956 957 958 959

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
960
		try {
J
Joao Moreno 已提交
961
			await choice.run(repository);
J
Joao Moreno 已提交
962 963 964 965 966 967 968 969
		} 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);
		}
970 971
	}

J
Joao Moreno 已提交
972
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
973
	async createTag(repository: Repository): Promise<void> {
974 975 976 977 978 979 980 981 982 983 984 985
		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 已提交
986
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
987 988 989 990 991
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
995
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
996 997
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021

		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 已提交
1022
		repository.pull(false, pick.label, branchName);
1023 1024
	}

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

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

J
Joao Moreno 已提交
1034
		await repository.pull();
J
Joao Moreno 已提交
1035 1036
	}

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

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

J
Joao Moreno 已提交
1046
		await repository.pullWithRebase();
J
Joao Moreno 已提交
1047 1048
	}

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

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

J
Joao Moreno 已提交
1058
		await repository.push();
J
Joao Moreno 已提交
1059 1060
	}

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

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

J
Joao Moreno 已提交
1070
		await repository.pushTags();
1071 1072 1073 1074

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

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

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

J
Joao Moreno 已提交
1084
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1085 1086 1087 1088
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

J
Joao Moreno 已提交
1089
		const branchName = repository.HEAD.name;
J
Joao Moreno 已提交
1090 1091 1092 1093 1094 1095 1096 1097
		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 已提交
1098
		repository.pushTo(pick.label, branchName);
J
Joao Moreno 已提交
1099 1100
	}

J
Joao Moreno 已提交
1101
	@command('git.sync', { repository: true })
J
Joao Moreno 已提交
1102 1103
	async sync(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124

		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 已提交
1125
		await repository.sync();
J
Joao Moreno 已提交
1126 1127
	}

J
Joao Moreno 已提交
1128
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1129 1130
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1131 1132 1133 1134 1135 1136

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

J
Joao Moreno 已提交
1137 1138
		const branchName = repository.HEAD && repository.HEAD.name || '';
		const picks = repository.remotes.map(r => r.name);
J
Joao Moreno 已提交
1139
		const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
J
Joao Moreno 已提交
1140 1141 1142 1143 1144 1145
		const choice = await window.showQuickPick(picks, { placeHolder });

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1146
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1147 1148
	}

J
Joao Moreno 已提交
1149
	@command('git.showOutput')
J
Joao Moreno 已提交
1150 1151 1152 1153
	showOutput(): void {
		this.outputChannel.show();
	}

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

J
Joao Moreno 已提交
1159 1160 1161 1162
			if (!uri) {
				return;
			}

J
Joao Moreno 已提交
1163
			return await repository.ignore([uri]);
J
Joao Moreno 已提交
1164 1165 1166 1167 1168 1169 1170
		}

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

		if (!uris.length) {
N
NKumar2 已提交
1171 1172 1173
			return;
		}

J
Joao Moreno 已提交
1174
		await repository.ignore(uris);
N
NKumar2 已提交
1175 1176
	}

J
Joao Moreno 已提交
1177
	@command('git.stash', { repository: true })
J
Joao Moreno 已提交
1178 1179
	async stash(repository: Repository): Promise<void> {
		if (repository.workingTreeGroup.resourceStates.length === 0) {
K
Krzysztof Cieślak 已提交
1180 1181 1182
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1183 1184 1185 1186 1187 1188 1189 1190 1191 1192

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

J
Joao Moreno 已提交
1196
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1197 1198
	async stashPop(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1199 1200

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1201 1202 1203 1204
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1205 1206
		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 已提交
1207 1208 1209 1210 1211
		const choice = await window.showQuickPick(picks, { placeHolder });

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

J
Joao Moreno 已提交
1213
		await repository.popStash(choice.id);
K
Krzysztof Cieślak 已提交
1214 1215
	}

J
Joao Moreno 已提交
1216
	@command('git.stashPopLatest', { repository: true })
J
Joao Moreno 已提交
1217 1218
	async stashPopLatest(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1219 1220

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1221 1222 1223 1224
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1225
		await repository.popStash();
J
Joao Moreno 已提交
1226
	}
K
Krzysztof Cieślak 已提交
1227

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

J
Joao Moreno 已提交
1232
			if (!options.repository) {
J
Joao Moreno 已提交
1233 1234
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1235 1236
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1237 1238 1239 1240 1241 1242 1243 1244 1245
				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();
				}
1246

J
Joao Moreno 已提交
1247
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1248
					if (!repository) {
J
Joao Moreno 已提交
1249 1250 1251
						return Promise.reject(localize('modelnotfound', "Git model not found"));
					}

J
Joao Moreno 已提交
1252
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1253
				});
J
Joao Moreno 已提交
1254 1255
			}

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

J
Joao Moreno 已提交
1258 1259 1260 1261
			return result.catch(async err => {
				let message: string;

				switch (err.gitErrorCode) {
1262
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1263 1264
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1265 1266 1267
					case GitErrorCodes.PushRejected:
						message = localize('cant push', "Can't push refs to remote. Run 'Pull' first to integrate your changes.");
						break;
J
Joao Moreno 已提交
1268
					default:
1269 1270 1271
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1272
							.split(/[\r\n]/)
1273 1274 1275 1276 1277 1278
							.filter(line => !!line)
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296

						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();
				}
			});
		};
1297 1298 1299 1300 1301

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

		return result;
J
Joao Moreno 已提交
1302 1303
	}

1304
	private getSCMResource(uri?: Uri): Resource | undefined {
1305
		uri = uri ? uri : window.activeTextEditor && window.activeTextEditor.document.uri;
J
Joao Moreno 已提交
1306 1307

		if (!uri) {
1308
			return undefined;
J
Joao Moreno 已提交
1309 1310 1311
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1312 1313
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1314 1315 1316 1317
		}

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

J
Joao Moreno 已提交
1320
			if (!repository) {
1321 1322
				return undefined;
			}
J
Joao Moreno 已提交
1323

J
Joao Moreno 已提交
1324 1325
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1326 1327 1328
		}
	}

J
Joao Moreno 已提交
1329
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359
	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 已提交
1360 1361 1362
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
Joao Moreno 已提交
1363
}