commands.ts 48.5 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, TextEditor } 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';
J
Joao Moreno 已提交
13
import { grep } from './util';
14
import { applyLineChanges, intersectDiffWithRange, toLineRanges, invertLineChange } from './staging';
J
Joao Moreno 已提交
15
import * as path from 'path';
J
Joao Moreno 已提交
16
import * as os from 'os';
J
Joao Moreno 已提交
17
import TelemetryReporter from 'vscode-extension-telemetry';
J
Joao Moreno 已提交
18 19 20
import * as nls from 'vscode-nls';

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

J
Joao Moreno 已提交
22 23 24 25 26 27 28
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 已提交
29
	constructor(protected ref: Ref) { }
J
Joao Moreno 已提交
30

J
Joao Moreno 已提交
31
	async run(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
32 33 34 35 36 37
		const ref = this.treeish;

		if (!ref) {
			return;
		}

J
Joao Moreno 已提交
38
		await repository.checkout(ref);
J
Joao Moreno 已提交
39 40 41 42 43
	}
}

class CheckoutTagItem extends CheckoutItem {

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

class CheckoutRemoteHeadItem extends CheckoutItem {

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

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

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

72
	constructor(private ref: Ref) { }
M
Maik Riechert 已提交
73

J
Joao Moreno 已提交
74
	async run(repository: Repository, force?: boolean): Promise<void> {
75
		if (!this.branchName) {
M
Maik Riechert 已提交
76 77
			return;
		}
J
Joao Moreno 已提交
78
		await repository.deleteBranch(this.branchName, force);
M
Maik Riechert 已提交
79 80 81
	}
}

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

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

J
Joao Moreno 已提交
94 95
class CreateBranchItem implements QuickPickItem {

J
Joao Moreno 已提交
96 97
	constructor(private cc: CommandCenter) { }

J
Joao Moreno 已提交
98 99 100
	get label(): string { return localize('create branch', '$(plus) Create new branch'); }
	get description(): string { return ''; }

J
Joao Moreno 已提交
101
	async run(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
102
		await this.cc.branch(repository);
J
Joao Moreno 已提交
103 104 105
	}
}

J
Joao Moreno 已提交
106
interface CommandOptions {
J
Joao Moreno 已提交
107
	repository?: boolean;
J
Joao Moreno 已提交
108 109 110
	diff?: boolean;
}

111 112 113 114
interface Command {
	commandId: string;
	key: string;
	method: Function;
J
Joao Moreno 已提交
115
	options: CommandOptions;
116 117 118
}

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

J
Joao Moreno 已提交
120
function command(commandId: string, options: CommandOptions = {}): Function {
J
Joao Moreno 已提交
121
	return (target: any, key: string, descriptor: any) => {
J
Joao Moreno 已提交
122 123 124 125
		if (!(typeof descriptor.value === 'function')) {
			throw new Error('not supported');
		}

J
Joao Moreno 已提交
126
		Commands.push({ commandId, key, method: descriptor.value, options });
J
Joao Moreno 已提交
127 128
	};
}
J
Joao Moreno 已提交
129

J
Joao Moreno 已提交
130
export class CommandCenter {
J
Joao Moreno 已提交
131 132

	private disposables: Disposable[];
J
Joao Moreno 已提交
133

J
Joao Moreno 已提交
134
	constructor(
J
Joao Moreno 已提交
135
		private git: Git,
J
Joao Moreno 已提交
136
		private model: Model,
J
Joao Moreno 已提交
137 138
		private outputChannel: OutputChannel,
		private telemetryReporter: TelemetryReporter
J
Joao Moreno 已提交
139
	) {
J
Joao Moreno 已提交
140 141
		this.disposables = Commands.map(({ commandId, key, method, options }) => {
			const command = this.createCommand(commandId, key, method, options);
142

J
Joao Moreno 已提交
143
			if (options.diff) {
J
Joao Moreno 已提交
144 145 146 147 148
				return commands.registerDiffInformationCommand(commandId, command);
			} else {
				return commands.registerCommand(commandId, command);
			}
		});
J
Joao Moreno 已提交
149 150
	}

J
Joao Moreno 已提交
151 152
	@command('git.refresh', { repository: true })
	async refresh(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
153
		await repository.status();
J
Joao Moreno 已提交
154
	}
J
Joao Moreno 已提交
155

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

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

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

J
Joao Moreno 已提交
172
		const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
173 174
			preserveFocus,
			preview,
175
			viewColumn: ViewColumn.Active
J
Joao Moreno 已提交
176 177
		};

J
Joao Moreno 已提交
178 179
		const activeTextEditor = window.activeTextEditor;

180 181 182
		// Check if active text editor has same path as other editor. we cannot compare via
		// URI.toString() here because the schemas can be different. Instead we just go by path.
		if (preserveSelection && activeTextEditor && activeTextEditor.document.uri.path === right.path) {
J
Joao Moreno 已提交
183 184 185
			opts.selection = activeTextEditor.selection;
		}

186
		if (!left) {
J
Joao Moreno 已提交
187 188 189 190 191 192 193
			if (right.scheme === 'git') {
				const repository = this.model.getRepository(right);

				if (repository) {
					const { path, ref } = fromGitUri(right);

					if (/png$/i.test(path)) {
J
Joao Moreno 已提交
194
						const contents = await repository.buffer(ref, path);
B
Benjamin Pasero 已提交
195
						const uri = Uri.parse(`data:image/png;label:${'Label'};description:${'Description'};base64,${contents.toString('base64')}`); // TODO@JOao
J
Joao Moreno 已提交
196 197 198 199 200 201 202

						await commands.executeCommand<void>('vscode.open', uri, opts);
						return;
					}
				}
			}

203
			await commands.executeCommand<void>('vscode.open', right, opts);
J
Joao Moreno 已提交
204

205 206 207
			return;
		}

J
Joao Moreno 已提交
208
		return await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
J
Joao Moreno 已提交
209 210 211 212 213 214
	}

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

			case Status.MODIFIED:
J
Joao Moreno 已提交
218
				return toGitUri(resource.resourceUri, '~');
219 220 221

			case Status.DELETED_BY_THEM:
				return toGitUri(resource.resourceUri, '');
J
Joao Moreno 已提交
222
		}
J
Joao Moreno 已提交
223
	}
J
Joao Moreno 已提交
224

J
Joao Moreno 已提交
225
	private getRightResource(resource: Resource): Uri | undefined {
J
Joao Moreno 已提交
226 227 228 229 230
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_ADDED:
			case Status.INDEX_COPIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
231
				return toGitUri(resource.resourceUri, '');
J
Joao Moreno 已提交
232 233

			case Status.INDEX_DELETED:
234
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
235
			case Status.DELETED:
J
Joao Moreno 已提交
236
				return toGitUri(resource.resourceUri, 'HEAD');
J
Joao Moreno 已提交
237 238 239 240

			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
J
Joao Moreno 已提交
241 242 243 244 245 246
				const repository = this.model.getRepository(resource.resourceUri);

				if (!repository) {
					return;
				}

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

J
Joao Moreno 已提交
250 251
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
252 253
				}

J
Joao Moreno 已提交
254
				return resource.resourceUri;
J
Joao Moreno 已提交
255

256
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
257
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
258
				return resource.resourceUri;
J
Joao Moreno 已提交
259 260 261 262
		}
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
263
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
264 265 266 267

		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
M
Marc Kassay 已提交
268
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
269 270 271
				return `${basename} (Index)`;

			case Status.MODIFIED:
M
Marc Kassay 已提交
272 273
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
274 275 276 277 278 279
				return `${basename} (Working Tree)`;
		}

		return '';
	}

J
Joao Moreno 已提交
280
	@command('git.clone')
281 282 283 284 285 286 287
	async clone(url?: string): Promise<void> {
		if (!url) {
			url = await window.showInputBox({
				prompt: localize('repourl', "Repository URL"),
				ignoreFocusOut: true
			});
		}
J
Joao Moreno 已提交
288 289

		if (!url) {
K
kieferrm 已提交
290
			/* __GDPR__
K
kieferrm 已提交
291 292 293 294
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
295 296
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
297 298
		}

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

J
Joao Moreno 已提交
302 303
		const parentPath = await window.showInputBox({
			prompt: localize('parent', "Parent Directory"),
J
Joao Moreno 已提交
304
			value,
J
Joao Moreno 已提交
305
			ignoreFocusOut: true
J
Joao Moreno 已提交
306 307 308
		});

		if (!parentPath) {
K
kieferrm 已提交
309
			/* __GDPR__
K
kieferrm 已提交
310 311 312 313
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
314 315
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
			return;
J
Joao Moreno 已提交
316 317
		}

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

J
Joao Moreno 已提交
320

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

325 326 327 328 329 330
			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;
K
kieferrm 已提交
331
			/* __GDPR__
K
kieferrm 已提交
332 333 334 335 336
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
					"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
				}
			*/
337 338 339 340
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
			if (openFolder) {
				commands.executeCommand('vscode.openFolder', Uri.file(repositoryPath));
			}
341 342
		} catch (err) {
			if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
K
kieferrm 已提交
343
				/* __GDPR__
K
kieferrm 已提交
344 345 346 347
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
348 349
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'directory_not_empty' });
			} else {
K
kieferrm 已提交
350
				/* __GDPR__
K
kieferrm 已提交
351 352 353 354
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
355
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'error' });
356 357
			}
			throw err;
J
Joao Moreno 已提交
358 359 360
		}
	}

J
Joao Moreno 已提交
361
	@command('git.init')
J
Joao Moreno 已提交
362
	async init(): Promise<void> {
J
Joao Moreno 已提交
363 364 365 366 367 368 369 370 371 372 373
		const homeUri = Uri.file(os.homedir());
		const defaultUri = workspace.workspaceFolders && workspace.workspaceFolders.length > 0
			? Uri.file(workspace.workspaceFolders[0].uri.fsPath)
			: homeUri;

		const result = await window.showOpenDialog({
			canSelectFiles: false,
			canSelectFolders: true,
			canSelectMany: false,
			defaultUri,
			openLabel: localize('init repo', "Initialize Repository")
J
Joao Moreno 已提交
374 375
		});

J
Joao Moreno 已提交
376
		if (!result || result.length === 0) {
J
Joao Moreno 已提交
377 378 379
			return;
		}

J
Joao Moreno 已提交
380 381 382 383 384 385 386 387 388 389 390 391
		const uri = result[0];

		if (homeUri.toString().startsWith(uri.toString())) {
			const yes = localize('create repo', "Initialize Repository");
			const answer = await window.showWarningMessage(localize('are you sure', "This will create a Git repository in '{0}'. Are you sure you want to continue?", uri.fsPath), yes);

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

		const path = uri.fsPath;
J
Joao Moreno 已提交
392 393
		await this.git.init(path);
		await this.model.tryOpenRepository(path);
J
Joao Moreno 已提交
394 395
	}

J
Joao Moreno 已提交
396 397 398 399 400
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

405
		let uris: Uri[] | undefined;
406 407 408

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
409
				uris = [Uri.file(fromGitUri(arg).path)];
410
			} else if (arg.scheme === 'file') {
411
				uris = [arg];
412 413 414 415 416 417
			}
		} else {
			let resource = arg;

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

			if (resource) {
422
				uris = [...resourceStates.map(r => r.resourceUri), resource.resourceUri];
423
			}
J
Joao Moreno 已提交
424 425
		}

426
		if (!uris) {
J
Joao Moreno 已提交
427
			return;
J
Joao Moreno 已提交
428 429
		}

430 431 432 433
		const preview = uris.length === 1 ? true : false;
		const activeTextEditor = window.activeTextEditor;
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
434
				preserveFocus,
435
				preview,
436
				viewColumn: ViewColumn.Active
437 438
			};

439 440 441
			// Check if active text editor has same path as other editor. we cannot compare via
			// URI.toString() here because the schemas can be different. Instead we just go by path.
			if (activeTextEditor && activeTextEditor.document.uri.path === uri.path) {
B
Benjamin Pasero 已提交
442 443 444
				opts.selection = activeTextEditor.selection;
			}

445
			await commands.executeCommand<void>('vscode.open', uri, opts);
J
Joao Moreno 已提交
446
		}
J
Joao Moreno 已提交
447 448
	}

J
Joao Moreno 已提交
449 450
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
451 452 453 454 455
		let resource: Resource | undefined = undefined;

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
456
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
457
		} else {
458
			resource = this.getSCMResource();
D
Duroktar 已提交
459 460 461 462 463 464
		}

		if (!resource) {
			return;
		}

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

J
Joao Moreno 已提交
467 468 469
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
470
		}
J
Joao Moreno 已提交
471 472

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

J
Joao Moreno 已提交
475 476
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
477
		const preserveFocus = arg instanceof Resource;
J
Joao 已提交
478
		const preserveSelection = arg instanceof Uri || !arg;
479
		let resources: Resource[] | undefined = undefined;
480

481
		if (arg instanceof Uri) {
482
			const resource = this.getSCMResource(arg);
483 484 485
			if (resource !== undefined) {
				resources = [resource];
			}
486
		} else {
487
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
488

489 490 491
			if (arg instanceof Resource) {
				resource = arg;
			} else {
492
				resource = this.getSCMResource();
493 494 495 496 497
			}

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

500
		if (!resources) {
J
Joao Moreno 已提交
501
			return;
J
Joao Moreno 已提交
502
		}
J
Joao Moreno 已提交
503

504 505
		const preview = resources.length === 1 ? undefined : false;
		for (const resource of resources) {
J
Joao 已提交
506
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
507
		}
J
Joao Moreno 已提交
508 509
	}

510 511
	@command('git.stage')
	async stage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
512
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
513
			const resource = this.getSCMResource();
514 515 516 517 518 519 520 521

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

522
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
523 524 525 526 527 528 529 530 531 532 533 534 535 536
		const merge = selection.filter(s => s.resourceGroupType === ResourceGroupType.Merge);
		const bothModified = merge.filter(s => s.type === Status.BOTH_MODIFIED);
		const promises = bothModified.map(s => grep(s.resourceUri.fsPath, /^<{7}|^={7}|^>{7}/));
		const unresolvedBothModified = await Promise.all<boolean>(promises);
		const resolvedConflicts = bothModified.filter((s, i) => !unresolvedBothModified[i]);
		const unresolvedConflicts = [
			...merge.filter(s => s.type !== Status.BOTH_MODIFIED),
			...bothModified.filter((s, i) => unresolvedBothModified[i])
		];

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

538 539 540 541 542 543 544 545
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
546 547
		const workingTree = selection.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
		const scmResources = [...workingTree, ...resolvedConflicts, ...unresolvedConflicts];
548

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

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

J
Joao Moreno 已提交
557 558
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574
		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 已提交
575
		await repository.add([]);
J
Joao Moreno 已提交
576 577
	}

J
Joao Moreno 已提交
578
	@command('git.stageChange')
J
Joao Moreno 已提交
579 580 581 582 583 584 585 586
	async stageChange(uri: Uri, changes: LineChange[], index: number): Promise<void> {
		const textEditor = window.visibleTextEditors.filter(e => e.document.uri.toString() === uri.toString())[0];

		if (!textEditor) {
			return;
		}

		await this._stageChanges(textEditor, [changes[index]]);
J
Joao Moreno 已提交
587 588
	}

J
Joao Moreno 已提交
589
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
590
	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
591 592 593 594 595 596 597
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
598 599 600 601
		const selectedLines = toLineRanges(textEditor.selections, modifiedDocument);
		const selectedChanges = changes
			.map(diff => selectedLines.reduce<LineChange | null>((result, range) => result || intersectDiffWithRange(modifiedDocument, diff, range), null))
			.filter(d => !!d) as LineChange[];
J
Joao Moreno 已提交
602

J
Joao Moreno 已提交
603
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
604 605 606
			return;
		}

J
Joao Moreno 已提交
607 608
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
609

J
Joao Moreno 已提交
610
	private async _stageChanges(textEditor: TextEditor, changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
611 612 613
		const modifiedDocument = textEditor.document;
		const modifiedUri = modifiedDocument.uri;

J
Joao Moreno 已提交
614
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
615 616 617
			return;
		}

J
Joao Moreno 已提交
618
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
619
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
620
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
621

J
Joao Moreno 已提交
622
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
623
	}
J
Joao Moreno 已提交
624

J
Joao Moreno 已提交
625
	@command('git.revertChange')
J
Joao Moreno 已提交
626 627 628 629
	async revertChange(uri: Uri, changes: LineChange[], index: number): Promise<void> {
		const textEditor = window.visibleTextEditors.filter(e => e.document.uri.toString() === uri.toString())[0];

		if (!textEditor) {
J
Joao Moreno 已提交
630 631 632
			return;
		}

J
Joao Moreno 已提交
633
		await this._revertChanges(textEditor, [...changes.slice(0, index), ...changes.slice(index + 1)]);
J
Joao Moreno 已提交
634
	}
J
Joao Moreno 已提交
635

J
Joao Moreno 已提交
636
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
637
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
638 639 640 641 642 643 644
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
645 646 647 648 649
		const selections = textEditor.selections;
		const selectedChanges = changes.filter(change => {
			const modifiedRange = change.modifiedEndLineNumber === 0
				? new Range(modifiedDocument.lineAt(change.modifiedStartLineNumber - 1).range.end, modifiedDocument.lineAt(change.modifiedStartLineNumber).range.start)
				: new Range(modifiedDocument.lineAt(change.modifiedStartLineNumber - 1).range.start, modifiedDocument.lineAt(change.modifiedEndLineNumber - 1).range.end);
J
Joao Moreno 已提交
650

J
Joao Moreno 已提交
651 652 653 654
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
655 656 657
			return;
		}

J
Joao Moreno 已提交
658 659
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
660

J
Joao Moreno 已提交
661 662 663
	private async _revertChanges(textEditor: TextEditor, changes: LineChange[]): Promise<void> {
		const modifiedDocument = textEditor.document;
		const modifiedUri = modifiedDocument.uri;
J
Joao Moreno 已提交
664

J
Joao Moreno 已提交
665
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
666 667 668
			return;
		}

J
Joao Moreno 已提交
669 670
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
671 672 673 674 675 676 677 678 679
		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;
		}

J
Joao Moreno 已提交
680
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
681 682 683
		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 已提交
684
		await modifiedDocument.save();
J
Joao Moreno 已提交
685 686
	}

J
Joao Moreno 已提交
687 688
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
689
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
690
			const resource = this.getSCMResource();
691 692 693 694 695 696 697 698

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

702
		if (!scmResources.length) {
J
Joao Moreno 已提交
703 704 705
			return;
		}

706
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
707
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
708 709
	}

J
Joao Moreno 已提交
710 711
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
712
		await repository.revert([]);
J
Joao Moreno 已提交
713
	}
J
Joao Moreno 已提交
714

J
Joao Moreno 已提交
715 716
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
717 718 719 720 721 722 723 724 725
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

726 727 728 729 730 731 732
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
733 734 735
			return;
		}

J
Joao Moreno 已提交
736
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
737
		const originalDocument = await workspace.openTextDocument(originalUri);
738 739 740 741
		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 已提交
742 743 744 745 746

		if (!selectedDiffs.length) {
			return;
		}

747 748
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
749

J
Joao Moreno 已提交
750
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
751 752
	}

J
Joao Moreno 已提交
753 754
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
755
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
756
			const resource = this.getSCMResource();
757 758 759 760 761 762 763 764

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
768
		if (!scmResources.length) {
J
Joao Moreno 已提交
769 770
			return;
		}
J
Joao Moreno 已提交
771

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

J
Joao Moreno 已提交
776
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
777
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
778
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
779 780
				yes = localize('delete file', "Delete file");
			} else {
J
Joao Moreno 已提交
781
				message = localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
782 783
			}
		} else {
J
Joao Moreno 已提交
784
			message = localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", scmResources.length);
J
Joao Moreno 已提交
785 786 787 788 789

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

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

J
Joao Moreno 已提交
793 794 795 796
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
797
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
798
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
799
	}
J
Joao Moreno 已提交
800

J
Joao Moreno 已提交
801 802
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
803
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
804 805 806 807 808

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

J
Joao Moreno 已提交
809 810
		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 已提交
811

J
Joao Moreno 已提交
812 813 814 815 816 817
		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 已提交
818
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
819
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
820

J
Joao Moreno 已提交
821
			if (pick !== yes) {
J
Joao Moreno 已提交
822 823 824
				return;
			}

J
Joao 已提交
825
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
826 827 828 829 830 831 832 833
			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 已提交
834 835
			}

J
Joao 已提交
836
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
837 838 839 840
		} 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 已提交
841

J
Joao Moreno 已提交
842 843 844
			if (pick !== yes) {
				return;
			}
J
Joao Moreno 已提交
845

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

J
Joao Moreno 已提交
848 849 850 851
		} 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 已提交
852

J
Joao Moreno 已提交
853 854 855 856 857
			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 已提交
858

J
Joao Moreno 已提交
859
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
860 861 862 863 864 865 866 867
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
868
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
869
		}
J
Joao Moreno 已提交
870 871
	}

J
Joao Moreno 已提交
872
	private async smartCommit(
J
Joao Moreno 已提交
873
		repository: Repository,
874
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
875 876
		opts?: CommitOptions
	): Promise<boolean> {
877 878
		const config = workspace.getConfiguration('git');
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
879
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
880 881
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
882 883

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

J
Joao Moreno 已提交
886 887
			// 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?");
888 889 890 891 892
			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 已提交
893 894 895
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
896 897 898
			}
		}

J
Joao Moreno 已提交
899
		if (!opts) {
900
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
901 902
		}

903 904 905
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

J
Joao Moreno 已提交
906 907
		if (
			// no changes
908
			(noStagedChanges && noUnstagedChanges)
J
Joao Moreno 已提交
909
			// or no staged changes and not `all`
910
			|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
911
		) {
J
Joao Moreno 已提交
912 913 914 915
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
916
		const message = await getCommitMessage();
J
Joao Moreno 已提交
917 918 919 920 921

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
922
		await repository.commit(message, opts);
J
Joao Moreno 已提交
923 924 925 926

		return true;
	}

J
Joao Moreno 已提交
927
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
928
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
929
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
930 931 932 933 934 935
			if (message) {
				return message;
			}

			return await window.showInputBox({
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
936 937
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
938
			});
J
Joao Moreno 已提交
939 940
		};

J
Joao Moreno 已提交
941
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
942 943

		if (message && didCommit) {
J
Joao Moreno 已提交
944
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
945
		}
J
Joao Moreno 已提交
946 947
	}

J
Joao Moreno 已提交
948
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
949 950
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
951 952
	}

J
Joao Moreno 已提交
953
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
954
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
955
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
956 957 958
			return;
		}

J
Joao Moreno 已提交
959
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
960 961

		if (didCommit) {
J
Joao Moreno 已提交
962
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
963
		}
J
Joao Moreno 已提交
964 965
	}

J
Joao Moreno 已提交
966
	@command('git.commitStaged', { repository: true })
J
Joao Moreno 已提交
967 968
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
969 970
	}

J
Joao Moreno 已提交
971
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
972 973
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
974 975
	}

J
Joao Moreno 已提交
976
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
977 978
	async commitStagedAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
979 980
	}

J
Joao Moreno 已提交
981
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
982 983
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
984 985
	}

J
Joao Moreno 已提交
986
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
987 988
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
989 990
	}

J
Joao Moreno 已提交
991
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
992 993
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
994 995
	}

J
Joao Moreno 已提交
996
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
997 998
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
999 1000 1001 1002 1003

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

J
Joao Moreno 已提交
1004 1005
		const commit = await repository.getCommit('HEAD');
		await repository.reset('HEAD~');
J
Joao Moreno 已提交
1006
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1007 1008
	}

J
Joao Moreno 已提交
1009
	@command('git.checkout', { repository: true })
J
Joao Moreno 已提交
1010
	async checkout(repository: Repository, treeish: string): Promise<void> {
J
Joao Moreno 已提交
1011
		if (typeof treeish === 'string') {
J
Joao Moreno 已提交
1012
			return await repository.checkout(treeish);
J
Joao Moreno 已提交
1013 1014
		}

J
Joao Moreno 已提交
1015
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1016
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
1017 1018 1019
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1020
		const createBranch = new CreateBranchItem(this);
J
Joao Moreno 已提交
1021

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

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

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

J
Joao Moreno 已提交
1031
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
1032
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
1033
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
1034 1035 1036 1037 1038

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1039
		await choice.run(repository);
J
Joao Moreno 已提交
1040 1041
	}

J
Joao Moreno 已提交
1042
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1043
	async branch(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1044
		const result = await window.showInputBox({
J
Joao Moreno 已提交
1045
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
1046 1047
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
1048
		});
J
Joao Moreno 已提交
1049

J
Joao Moreno 已提交
1050 1051 1052
		if (!result) {
			return;
		}
J
Joao Moreno 已提交
1053

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

J
Joao Moreno 已提交
1058
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1059
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1060 1061
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1062
			run = force => repository.deleteBranch(name, force);
1063
		} else {
J
Joao Moreno 已提交
1064 1065
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1066
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1067

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

M
Maik Riechert 已提交
1071
			if (!choice || !choice.branchName) {
1072 1073
				return;
			}
M
Maik Riechert 已提交
1074
			name = choice.branchName;
J
Joao Moreno 已提交
1075
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1076 1077
		}

1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092
		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 已提交
1093 1094
	}

J
Joao Moreno 已提交
1095
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1096
	async merge(repository: Repository): Promise<void> {
1097 1098 1099 1100
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1101
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1102 1103
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1104

J
Joao Moreno 已提交
1105
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1106 1107
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1108 1109

		const picks = [...heads, ...remoteHeads];
1110 1111
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1112 1113 1114 1115 1116

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1117
		try {
J
Joao Moreno 已提交
1118
			await choice.run(repository);
J
Joao Moreno 已提交
1119 1120 1121 1122 1123 1124 1125 1126
		} 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);
		}
1127 1128
	}

J
Joao Moreno 已提交
1129
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1130
	async createTag(repository: Repository): Promise<void> {
1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142
		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 已提交
1143
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1144 1145 1146 1147 1148
			ignoreFocusOut: true
		});

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

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

		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 已提交
1179
		repository.pull(false, pick.label, branchName);
1180 1181
	}

J
Joao Moreno 已提交
1182
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1183 1184
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1185 1186 1187 1188 1189 1190

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

J
Joao Moreno 已提交
1191
		await repository.pull();
J
Joao Moreno 已提交
1192 1193
	}

J
Joao Moreno 已提交
1194
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1195 1196
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1197 1198 1199 1200 1201 1202

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

J
Joao Moreno 已提交
1203
		await repository.pullWithRebase();
J
Joao Moreno 已提交
1204 1205
	}

J
Joao Moreno 已提交
1206
	@command('git.push', { repository: true })
J
Joao Moreno 已提交
1207 1208
	async push(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1209 1210 1211 1212 1213 1214

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

J
Joao Moreno 已提交
1215
		await repository.push();
J
Joao Moreno 已提交
1216 1217
	}

J
Joao Moreno 已提交
1218
	@command('git.pushWithTags', { repository: true })
J
Joao Moreno 已提交
1219 1220
	async pushWithTags(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1221 1222 1223 1224 1225 1226

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

J
Joao Moreno 已提交
1227
		await repository.pushTags();
1228 1229 1230 1231

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

J
Joao Moreno 已提交
1232
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1233 1234
	async pushTo(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1235 1236 1237 1238 1239 1240

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

J
Joao Moreno 已提交
1241
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1242 1243 1244 1245
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

J
Joao Moreno 已提交
1246
		const branchName = repository.HEAD.name;
J
Joao Moreno 已提交
1247 1248 1249 1250 1251 1252 1253 1254
		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 已提交
1255
		repository.pushTo(pick.label, branchName);
J
Joao Moreno 已提交
1256 1257
	}

J
Joao Moreno 已提交
1258
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1259
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280

		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 已提交
1281 1282 1283 1284 1285 1286 1287 1288 1289 1290
		if (rebase) {
			await repository.syncRebase();
		} else {
			await repository.sync();
		}
	}

	@command('git.sync', { repository: true })
	sync(repository: Repository): Promise<void> {
		return this._sync(repository, false);
J
Joao Moreno 已提交
1291 1292
	}

J
Joao 已提交
1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305
	@command('git._syncAll')
	async syncAll(): Promise<void> {
		await Promise.all(this.model.repositories.map(async repository => {
			const HEAD = repository.HEAD;

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

			await repository.sync();
		}));
	}

1306
	@command('git.syncRebase', { repository: true })
J
Joao Moreno 已提交
1307 1308
	syncRebase(repository: Repository): Promise<void> {
		return this._sync(repository, true);
J
Joao Moreno 已提交
1309 1310
	}

J
Joao Moreno 已提交
1311
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1312 1313
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1314 1315 1316 1317 1318 1319

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

J
Joao Moreno 已提交
1320
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1321 1322 1323 1324 1325 1326
		const selectRemote = async () => {
			const picks = repository.remotes.map(r => r.name);
			const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
			return await window.showQuickPick(picks, { placeHolder });
		};
		const choice = remotes.length === 1 ? remotes[0].name : await selectRemote();
J
Joao Moreno 已提交
1327 1328 1329 1330 1331

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1332
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1333 1334
	}

J
Joao Moreno 已提交
1335
	@command('git.showOutput')
J
Joao Moreno 已提交
1336 1337 1338 1339
	showOutput(): void {
		this.outputChannel.show();
	}

1340 1341
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
1342
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
1343
			const resource = this.getSCMResource();
N
NKumar2 已提交
1344

1345
			if (!resource) {
J
Joao Moreno 已提交
1346 1347 1348
				return;
			}

1349
			resourceStates = [resource];
J
Joao Moreno 已提交
1350 1351
		}

1352
		const resources = resourceStates
J
Joao Moreno 已提交
1353 1354 1355
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1356
		if (!resources.length) {
N
NKumar2 已提交
1357 1358 1359
			return;
		}

1360
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
1361 1362
	}

J
Joao Moreno 已提交
1363
	@command('git.stash', { repository: true })
J
Joao Moreno 已提交
1364 1365
	async stash(repository: Repository): Promise<void> {
		if (repository.workingTreeGroup.resourceStates.length === 0) {
K
Krzysztof Cieślak 已提交
1366 1367 1368
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1369 1370 1371 1372 1373 1374 1375 1376 1377 1378

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

J
Joao Moreno 已提交
1382
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1383 1384
	async stashPop(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1385 1386

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1387 1388 1389 1390
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1391 1392
		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 已提交
1393 1394 1395 1396 1397
		const choice = await window.showQuickPick(picks, { placeHolder });

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

J
Joao Moreno 已提交
1399
		await repository.popStash(choice.id);
K
Krzysztof Cieślak 已提交
1400 1401
	}

J
Joao Moreno 已提交
1402
	@command('git.stashPopLatest', { repository: true })
J
Joao Moreno 已提交
1403 1404
	async stashPopLatest(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1405 1406

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1407 1408 1409 1410
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1411
		await repository.popStash();
J
Joao Moreno 已提交
1412
	}
K
Krzysztof Cieślak 已提交
1413

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

J
Joao Moreno 已提交
1418
			if (!options.repository) {
J
Joao Moreno 已提交
1419 1420
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1421 1422
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1423 1424 1425 1426 1427 1428 1429 1430 1431
				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();
				}
1432

J
Joao Moreno 已提交
1433
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1434
					if (!repository) {
J
Joao 已提交
1435
						return Promise.resolve();
J
Joao Moreno 已提交
1436 1437
					}

J
Joao Moreno 已提交
1438
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1439
				});
J
Joao Moreno 已提交
1440 1441
			}

K
kieferrm 已提交
1442
			/* __GDPR__
K
kieferrm 已提交
1443 1444 1445 1446
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
1447 1448
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1449 1450 1451 1452
			return result.catch(async err => {
				let message: string;

				switch (err.gitErrorCode) {
1453
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1454 1455
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1456 1457 1458
					case GitErrorCodes.PushRejected:
						message = localize('cant push', "Can't push refs to remote. Run 'Pull' first to integrate your changes.");
						break;
J
Joao Moreno 已提交
1459
					default:
1460 1461 1462
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1463
							.split(/[\r\n]/)
J
João Moreno 已提交
1464
							.filter((line: string) => !!line)
1465 1466 1467 1468 1469
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487

						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();
				}
			});
		};
1488 1489

		// patch this object, so people can call methods directly
1490
		(this as any)[key] = result;
1491 1492

		return result;
J
Joao Moreno 已提交
1493 1494
	}

1495
	private getSCMResource(uri?: Uri): Resource | undefined {
1496
		uri = uri ? uri : window.activeTextEditor && window.activeTextEditor.document.uri;
J
Joao Moreno 已提交
1497 1498

		if (!uri) {
1499
			return undefined;
J
Joao Moreno 已提交
1500 1501 1502
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1503 1504
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1505 1506 1507 1508
		}

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

J
Joao Moreno 已提交
1511
			if (!repository) {
1512 1513
				return undefined;
			}
J
Joao Moreno 已提交
1514

J
Joao Moreno 已提交
1515 1516
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1517 1518 1519
		}
	}

J
Joao Moreno 已提交
1520
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533
	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;
			}

J
Joao Moreno 已提交
1534
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550

			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 已提交
1551 1552 1553
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
1554
}