commands.ts 51.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, CancellationTokenSource, StatusBarAlignment } 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 131 132 133 134 135 136 137 138
const ImageMimetypes = [
	'image/png',
	'image/gif',
	'image/jpeg',
	'image/webp',
	'image/tiff',
	'image/bmp'
];

J
Joao Moreno 已提交
139
export class CommandCenter {
J
Joao Moreno 已提交
140 141

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

J
Joao Moreno 已提交
143
	constructor(
J
Joao Moreno 已提交
144
		private git: Git,
J
Joao Moreno 已提交
145
		private model: Model,
J
Joao Moreno 已提交
146 147
		private outputChannel: OutputChannel,
		private telemetryReporter: TelemetryReporter
J
Joao Moreno 已提交
148
	) {
J
Joao Moreno 已提交
149 150
		this.disposables = Commands.map(({ commandId, key, method, options }) => {
			const command = this.createCommand(commandId, key, method, options);
151

J
Joao Moreno 已提交
152
			if (options.diff) {
J
Joao Moreno 已提交
153 154 155 156 157
				return commands.registerDiffInformationCommand(commandId, command);
			} else {
				return commands.registerCommand(commandId, command);
			}
		});
J
Joao Moreno 已提交
158 159
	}

J
Joao Moreno 已提交
160 161
	@command('git.refresh', { repository: true })
	async refresh(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
162
		await repository.status();
J
Joao Moreno 已提交
163
	}
J
Joao Moreno 已提交
164

J
Joao Moreno 已提交
165 166
	@command('git.openResource')
	async openResource(resource: Resource): Promise<void> {
J
Joao 已提交
167
		await this._openResource(resource, undefined, true, false);
J
Joao Moreno 已提交
168 169
	}

J
Joao 已提交
170
	private async _openResource(resource: Resource, preview?: boolean, preserveFocus?: boolean, preserveSelection?: boolean): Promise<void> {
J
Joao Moreno 已提交
171 172
		const left = await this.getLeftResource(resource);
		const right = await this.getRightResource(resource);
J
Joao Moreno 已提交
173 174
		const title = this.getTitle(resource);

J
Joao Moreno 已提交
175 176 177 178 179
		if (!right) {
			// TODO
			console.error('oh no');
			return;
		}
J
Joao Moreno 已提交
180

J
Joao Moreno 已提交
181
		const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
182 183
			preserveFocus,
			preview,
184
			viewColumn: ViewColumn.Active
J
Joao Moreno 已提交
185 186
		};

J
Joao Moreno 已提交
187 188
		const activeTextEditor = window.activeTextEditor;

189 190 191
		// 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 已提交
192 193 194
			opts.selection = activeTextEditor.selection;
		}

195
		if (!left) {
J
Joao Moreno 已提交
196 197 198 199 200
			await commands.executeCommand<void>('vscode.open', right, opts);
		} else {
			await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
		}
	}
J
Joao Moreno 已提交
201

J
Joao Moreno 已提交
202 203
	private async getURI(uri: Uri, ref: string): Promise<Uri | undefined> {
		const repository = this.model.getRepository(uri);
J
Joao Moreno 已提交
204

J
Joao Moreno 已提交
205 206 207
		if (!repository) {
			return toGitUri(uri, ref);
		}
J
Joao Moreno 已提交
208

J
Joao Moreno 已提交
209
		try {
J
Joao Moreno 已提交
210 211 212 213 214 215
			if (ref === '~') {
				const uriString = uri.toString();
				const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.original.toString() === uriString);
				ref = indexStatus ? '' : 'HEAD';
			}

J
Joao Moreno 已提交
216 217
			const { size, object } = await repository.lstree(ref, uri.fsPath);

J
Joao Moreno 已提交
218
			if (size > 1000000) { // 1 MB
J
Joao Moreno 已提交
219
				return Uri.parse(`data:;label:${path.basename(uri.fsPath)};description:${ref},`);
J
Joao Moreno 已提交
220 221
			}

J
Joao Moreno 已提交
222
			const { mimetype, encoding } = await repository.detectObjectType(object);
J
Joao Moreno 已提交
223

J
Joao Moreno 已提交
224 225 226
			if (mimetype === 'text/plain') {
				return toGitUri(uri, ref);
			}
227

J
Joao Moreno 已提交
228 229 230 231 232 233 234 235 236 237
			if (ImageMimetypes.indexOf(mimetype) > -1) {
				const contents = await repository.buffer(ref, uri.fsPath);
				return Uri.parse(`data:${mimetype};label:${path.basename(uri.fsPath)};description:${ref};size:${size};base64,${contents.toString('base64')}`);
			}

			return Uri.parse(`data:;label:${path.basename(uri.fsPath)};description:${ref},`);

		} catch (err) {
			return toGitUri(uri, ref);
		}
J
Joao Moreno 已提交
238 239
	}

J
Joao Moreno 已提交
240
	private async getLeftResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
241 242 243
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
244
				return this.getURI(resource.original, 'HEAD');
J
Joao Moreno 已提交
245 246

			case Status.MODIFIED:
J
Joao Moreno 已提交
247
				return this.getURI(resource.resourceUri, '~');
248 249

			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
250
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
251
		}
J
Joao Moreno 已提交
252
	}
J
Joao Moreno 已提交
253

J
Joao Moreno 已提交
254
	private async getRightResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
255 256 257 258 259
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_ADDED:
			case Status.INDEX_COPIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
260
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
261 262

			case Status.INDEX_DELETED:
263
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
264
			case Status.DELETED:
J
Joao Moreno 已提交
265
				return this.getURI(resource.resourceUri, 'HEAD');
J
Joao Moreno 已提交
266 267 268 269

			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
J
Joao Moreno 已提交
270 271 272 273 274 275
				const repository = this.model.getRepository(resource.resourceUri);

				if (!repository) {
					return;
				}

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

J
Joao Moreno 已提交
279 280
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
281 282
				}

J
Joao Moreno 已提交
283
				return resource.resourceUri;
J
Joao Moreno 已提交
284

285
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
286
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
287
				return resource.resourceUri;
J
Joao Moreno 已提交
288 289 290 291
		}
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
292
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
293 294 295 296

		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
M
Marc Kassay 已提交
297
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
298 299 300
				return `${basename} (Index)`;

			case Status.MODIFIED:
M
Marc Kassay 已提交
301 302
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
303 304 305 306 307 308
				return `${basename} (Working Tree)`;
		}

		return '';
	}

J
Joao Moreno 已提交
309 310
	private static cloneId = 0;

J
Joao Moreno 已提交
311
	@command('git.clone')
312 313 314 315 316 317 318
	async clone(url?: string): Promise<void> {
		if (!url) {
			url = await window.showInputBox({
				prompt: localize('repourl', "Repository URL"),
				ignoreFocusOut: true
			});
		}
J
Joao Moreno 已提交
319 320

		if (!url) {
K
kieferrm 已提交
321
			/* __GDPR__
K
kieferrm 已提交
322 323 324 325
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
326 327
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
328 329
		}

330
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
331 332
		let value = config.get<string>('defaultCloneDirectory') || os.homedir();
		value = value.replace(/^~/, os.homedir());
333

J
Joao Moreno 已提交
334 335
		const parentPath = await window.showInputBox({
			prompt: localize('parent', "Parent Directory"),
J
Joao Moreno 已提交
336
			value,
J
Joao Moreno 已提交
337
			ignoreFocusOut: true
J
Joao Moreno 已提交
338 339 340
		});

		if (!parentPath) {
K
kieferrm 已提交
341
			/* __GDPR__
K
kieferrm 已提交
342 343 344 345
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
346 347
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
			return;
J
Joao Moreno 已提交
348 349
		}

J
Joao Moreno 已提交
350 351 352 353 354 355 356 357 358
		const tokenSource = new CancellationTokenSource();
		const cancelCommandId = `cancelClone${CommandCenter.cloneId++}`;
		const commandDisposable = commands.registerCommand(cancelCommandId, () => tokenSource.cancel());

		const statusBarItem = window.createStatusBarItem(StatusBarAlignment.Left);
		statusBarItem.text = localize('cancel', "$(sync~spin) Cloning repository... Click to cancel");
		statusBarItem.tooltip = localize('cancel tooltip', "Cancel clone");
		statusBarItem.command = cancelCommandId;
		statusBarItem.show();
M
Maryam Archie 已提交
359

J
Joao Moreno 已提交
360
		const clonePromise = this.git.clone(url, parentPath, tokenSource.token);
J
Joao Moreno 已提交
361

362
		try {
M
Maryam Archie 已提交
363
			window.withProgress({ location: ProgressLocation.SourceControl, title: localize('cloning', "Cloning git repository...") }, () => clonePromise);
J
Joao Moreno 已提交
364
			// window.withProgress({ location: ProgressLocation.Window, title: localize('cloning', "Cloning git repository...") }, () => clonePromise);
M
Maryam Archie 已提交
365

366 367 368 369 370 371
			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 已提交
372
			/* __GDPR__
K
kieferrm 已提交
373 374 375 376 377
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
					"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
				}
			*/
378 379 380 381
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
			if (openFolder) {
				commands.executeCommand('vscode.openFolder', Uri.file(repositoryPath));
			}
382 383
		} catch (err) {
			if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
K
kieferrm 已提交
384
				/* __GDPR__
K
kieferrm 已提交
385 386 387 388
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
389
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'directory_not_empty' });
J
Joao Moreno 已提交
390 391
			} else if (/Cancelled/i.test(err && (err.message || err.stderr || ''))) {
				return;
392
			} else {
K
kieferrm 已提交
393
				/* __GDPR__
K
kieferrm 已提交
394 395 396 397
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
398
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'error' });
399
			}
J
Joao Moreno 已提交
400

401
			throw err;
J
Joao Moreno 已提交
402 403 404
		} finally {
			commandDisposable.dispose();
			statusBarItem.dispose();
J
Joao Moreno 已提交
405 406 407
		}
	}

J
Joao Moreno 已提交
408
	@command('git.init')
J
Joao Moreno 已提交
409
	async init(): Promise<void> {
J
Joao Moreno 已提交
410 411 412 413 414 415 416 417 418 419 420
		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 已提交
421 422
		});

J
Joao Moreno 已提交
423
		if (!result || result.length === 0) {
J
Joao Moreno 已提交
424 425 426
			return;
		}

J
Joao Moreno 已提交
427 428 429 430 431 432 433 434 435 436 437 438
		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 已提交
439 440
		await this.git.init(path);
		await this.model.tryOpenRepository(path);
J
Joao Moreno 已提交
441 442
	}

J
Joao Moreno 已提交
443 444 445 446 447
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

452
		let uris: Uri[] | undefined;
453 454 455

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
456
				uris = [Uri.file(fromGitUri(arg).path)];
457
			} else if (arg.scheme === 'file') {
458
				uris = [arg];
459 460 461 462 463 464
			}
		} else {
			let resource = arg;

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

			if (resource) {
469
				uris = [...resourceStates.map(r => r.resourceUri), resource.resourceUri];
470
			}
J
Joao Moreno 已提交
471 472
		}

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

477 478 479 480
		const preview = uris.length === 1 ? true : false;
		const activeTextEditor = window.activeTextEditor;
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
481
				preserveFocus,
482
				preview,
483
				viewColumn: ViewColumn.Active
484 485
			};

486 487 488
			// 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 已提交
489 490 491
				opts.selection = activeTextEditor.selection;
			}

492
			await commands.executeCommand<void>('vscode.open', uri, opts);
J
Joao Moreno 已提交
493
		}
J
Joao Moreno 已提交
494 495
	}

J
Joao Moreno 已提交
496 497
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
498 499 500 501 502
		let resource: Resource | undefined = undefined;

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
503
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
504
		} else {
505
			resource = this.getSCMResource();
D
Duroktar 已提交
506 507 508 509 510 511
		}

		if (!resource) {
			return;
		}

J
Joao Moreno 已提交
512
		const HEAD = await this.getLeftResource(resource);
D
Duroktar 已提交
513

J
Joao Moreno 已提交
514 515 516
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
517
		}
J
Joao Moreno 已提交
518 519

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

J
Joao Moreno 已提交
522 523
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
524
		const preserveFocus = arg instanceof Resource;
J
Joao 已提交
525
		const preserveSelection = arg instanceof Uri || !arg;
526
		let resources: Resource[] | undefined = undefined;
527

528
		if (arg instanceof Uri) {
529
			const resource = this.getSCMResource(arg);
530 531 532
			if (resource !== undefined) {
				resources = [resource];
			}
533
		} else {
534
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
535

536 537 538
			if (arg instanceof Resource) {
				resource = arg;
			} else {
539
				resource = this.getSCMResource();
540 541 542 543 544
			}

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

547
		if (!resources) {
J
Joao Moreno 已提交
548
			return;
J
Joao Moreno 已提交
549
		}
J
Joao Moreno 已提交
550

551 552
		const preview = resources.length === 1 ? undefined : false;
		for (const resource of resources) {
J
Joao 已提交
553
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
554
		}
J
Joao Moreno 已提交
555 556
	}

557 558
	@command('git.stage')
	async stage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
559
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
560
			const resource = this.getSCMResource();
561 562 563 564 565 566 567 568

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

569
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
570 571 572 573 574 575 576 577 578 579 580 581 582 583
		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));
584

585 586 587 588 589 590 591 592
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

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

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

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

J
Joao Moreno 已提交
604 605
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621
		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 已提交
622
		await repository.add([]);
J
Joao Moreno 已提交
623 624
	}

J
Joao Moreno 已提交
625
	@command('git.stageChange')
J
Joao Moreno 已提交
626 627 628 629 630 631 632 633
	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 已提交
634 635
	}

J
Joao Moreno 已提交
636
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
637
	async stageSelectedChanges(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
		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 已提交
649

J
Joao Moreno 已提交
650
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
651 652 653
			return;
		}

J
Joao Moreno 已提交
654 655
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
656

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

J
Joao Moreno 已提交
661
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
662 663 664
			return;
		}

J
Joao Moreno 已提交
665
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
666
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
667
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
668

J
Joao Moreno 已提交
669
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
670
	}
J
Joao Moreno 已提交
671

J
Joao Moreno 已提交
672
	@command('git.revertChange')
J
Joao Moreno 已提交
673 674 675 676
	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 已提交
677 678 679
			return;
		}

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

J
Joao Moreno 已提交
683
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
684
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
685 686 687 688 689 690 691
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
692 693 694 695 696
		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 已提交
697

J
Joao Moreno 已提交
698 699 700 701
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
702 703 704
			return;
		}

J
Joao Moreno 已提交
705 706
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
707

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

J
Joao Moreno 已提交
712
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
713 714 715
			return;
		}

J
Joao Moreno 已提交
716 717
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
718 719 720 721 722 723 724 725 726
		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 已提交
727
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
728 729 730
		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 已提交
731
		await modifiedDocument.save();
J
Joao Moreno 已提交
732 733
	}

J
Joao Moreno 已提交
734 735
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
736
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
737
			const resource = this.getSCMResource();
738 739 740 741 742 743 744 745

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

749
		if (!scmResources.length) {
J
Joao Moreno 已提交
750 751 752
			return;
		}

753
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
754
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
755 756
	}

J
Joao Moreno 已提交
757 758
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
759
		await repository.revert([]);
J
Joao Moreno 已提交
760
	}
J
Joao Moreno 已提交
761

J
Joao Moreno 已提交
762 763
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
764 765 766 767 768 769 770 771 772
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

773 774 775 776 777 778 779
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
780 781 782
			return;
		}

J
Joao Moreno 已提交
783
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
784
		const originalDocument = await workspace.openTextDocument(originalUri);
785 786 787 788
		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 已提交
789 790 791 792 793

		if (!selectedDiffs.length) {
			return;
		}

794 795
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
796

J
Joao Moreno 已提交
797
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
798 799
	}

J
Joao Moreno 已提交
800 801
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
802
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
803
			const resource = this.getSCMResource();
804 805 806 807 808 809 810 811

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
815
		if (!scmResources.length) {
J
Joao Moreno 已提交
816 817
			return;
		}
J
Joao Moreno 已提交
818

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

J
Joao Moreno 已提交
823
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
824
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
825
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
826 827
				yes = localize('delete file', "Delete file");
			} else {
J
Joao Moreno 已提交
828
				message = localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
829 830
			}
		} else {
J
Joao Moreno 已提交
831
			message = localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", scmResources.length);
J
Joao Moreno 已提交
832 833 834 835 836

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

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

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

J
Joao Moreno 已提交
844
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
845
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
846
	}
J
Joao Moreno 已提交
847

J
Joao Moreno 已提交
848 849
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
850
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
851 852 853 854 855

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

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

J
Joao Moreno 已提交
859 860 861 862 863 864
		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 已提交
865
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
866
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
867

J
Joao Moreno 已提交
868
			if (pick !== yes) {
J
Joao Moreno 已提交
869 870 871
				return;
			}

J
Joao 已提交
872
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
873 874 875 876 877 878 879 880
			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 已提交
881 882
			}

J
Joao 已提交
883
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
884 885 886 887
		} 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 已提交
888

J
Joao Moreno 已提交
889 890 891
			if (pick !== yes) {
				return;
			}
J
Joao Moreno 已提交
892

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

J
Joao Moreno 已提交
895 896 897 898
		} 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 已提交
899

J
Joao Moreno 已提交
900 901 902 903 904
			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 已提交
905

J
Joao Moreno 已提交
906
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
907 908 909 910 911 912 913 914
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
915
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
916
		}
J
Joao Moreno 已提交
917 918
	}

J
Joao Moreno 已提交
919
	private async smartCommit(
J
Joao Moreno 已提交
920
		repository: Repository,
921
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
922 923
		opts?: CommitOptions
	): Promise<boolean> {
924 925
		const config = workspace.getConfiguration('git');
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
926
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
927 928
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
929 930

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

J
Joao Moreno 已提交
933 934
			// 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?");
935 936 937 938 939
			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 已提交
940 941 942
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
943 944 945
			}
		}

J
Joao Moreno 已提交
946
		if (!opts) {
947
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
948 949
		}

950 951 952
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

J
Joao Moreno 已提交
953 954
		if (
			// no changes
955
			(noStagedChanges && noUnstagedChanges)
J
Joao Moreno 已提交
956
			// or no staged changes and not `all`
957
			|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
958
		) {
J
Joao Moreno 已提交
959 960 961 962
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
963
		const message = await getCommitMessage();
J
Joao Moreno 已提交
964 965 966 967 968

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
969
		await repository.commit(message, opts);
J
Joao Moreno 已提交
970 971 972 973

		return true;
	}

J
Joao Moreno 已提交
974
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
975
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
976
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
977 978 979 980 981 982
			if (message) {
				return message;
			}

			return await window.showInputBox({
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
983 984
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
985
			});
J
Joao Moreno 已提交
986 987
		};

J
Joao Moreno 已提交
988
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
989 990

		if (message && didCommit) {
J
Joao Moreno 已提交
991
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
992
		}
J
Joao Moreno 已提交
993 994
	}

J
Joao Moreno 已提交
995
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
996 997
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
998 999
	}

J
Joao Moreno 已提交
1000
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
1001
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1002
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
1003 1004 1005
			return;
		}

J
Joao Moreno 已提交
1006
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1007 1008

		if (didCommit) {
J
Joao Moreno 已提交
1009
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1010
		}
J
Joao Moreno 已提交
1011 1012
	}

J
Joao Moreno 已提交
1013
	@command('git.commitStaged', { repository: true })
J
Joao Moreno 已提交
1014 1015
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
1016 1017
	}

J
Joao Moreno 已提交
1018
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
1019 1020
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
1021 1022
	}

J
Joao Moreno 已提交
1023
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
1024 1025
	async commitStagedAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
1026 1027
	}

J
Joao Moreno 已提交
1028
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
1029 1030
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
1031 1032
	}

J
Joao Moreno 已提交
1033
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1034 1035
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1036 1037
	}

J
Joao Moreno 已提交
1038
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
1039 1040
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
1041 1042
	}

J
Joao Moreno 已提交
1043
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
1044 1045
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1046 1047 1048 1049 1050

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

J
Joao Moreno 已提交
1051 1052
		const commit = await repository.getCommit('HEAD');
		await repository.reset('HEAD~');
J
Joao Moreno 已提交
1053
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1054 1055
	}

J
Joao Moreno 已提交
1056
	@command('git.checkout', { repository: true })
J
Joao Moreno 已提交
1057
	async checkout(repository: Repository, treeish: string): Promise<void> {
J
Joao Moreno 已提交
1058
		if (typeof treeish === 'string') {
J
Joao Moreno 已提交
1059
			return await repository.checkout(treeish);
J
Joao Moreno 已提交
1060 1061
		}

J
Joao Moreno 已提交
1062
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1063
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
1064 1065 1066
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1067
		const createBranch = new CreateBranchItem(this);
J
Joao Moreno 已提交
1068

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

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

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

J
Joao Moreno 已提交
1078
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
1079
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
1080
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
1081 1082 1083 1084 1085

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1086
		await choice.run(repository);
J
Joao Moreno 已提交
1087 1088
	}

J
Joao Moreno 已提交
1089
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1090
	async branch(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1091
		const result = await window.showInputBox({
J
Joao Moreno 已提交
1092
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
1093 1094
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
1095
		});
J
Joao Moreno 已提交
1096

J
Joao Moreno 已提交
1097 1098 1099
		if (!result) {
			return;
		}
J
Joao Moreno 已提交
1100

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

J
Joao Moreno 已提交
1105
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1106
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1107 1108
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1109
			run = force => repository.deleteBranch(name, force);
1110
		} else {
J
Joao Moreno 已提交
1111 1112
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1113
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1114

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

M
Maik Riechert 已提交
1118
			if (!choice || !choice.branchName) {
1119 1120
				return;
			}
M
Maik Riechert 已提交
1121
			name = choice.branchName;
J
Joao Moreno 已提交
1122
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1123 1124
		}

1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139
		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 已提交
1140 1141
	}

1142 1143
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
J
Justin Horner 已提交
1144 1145 1146 1147 1148 1149 1150 1151
		const placeHolder = localize('provide branch name', "Please provide a branch name");
		const name = await window.showInputBox({ placeHolder });

		if (!name || name.trim().length === 0) {
			return;
		}

		try {
1152
			await repository.renameBranch(name);
J
Justin Horner 已提交
1153 1154 1155
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1156 1157
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1158
				case GitErrorCodes.BranchAlreadyExists:
1159 1160 1161 1162
					window.showErrorMessage(localize('branch already exists', `A branch named '${name}' already exists`));
					return;
				default:
					throw err;
J
Justin Horner 已提交
1163 1164 1165 1166
			}
		}
	}

J
Joao Moreno 已提交
1167
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1168
	async merge(repository: Repository): Promise<void> {
1169 1170 1171 1172
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1173
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1174 1175
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1176

J
Joao Moreno 已提交
1177
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1178 1179
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1180 1181

		const picks = [...heads, ...remoteHeads];
1182 1183
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1184 1185 1186 1187 1188

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1189
		try {
J
Joao Moreno 已提交
1190
			await choice.run(repository);
J
Joao Moreno 已提交
1191 1192 1193 1194 1195 1196 1197 1198
		} 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);
		}
1199 1200
	}

J
Joao Moreno 已提交
1201
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1202
	async createTag(repository: Repository): Promise<void> {
1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214
		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 已提交
1215
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1216 1217 1218 1219 1220
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
1224
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1225 1226
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250

		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 已提交
1251
		repository.pull(false, pick.label, branchName);
1252 1253
	}

J
Joao Moreno 已提交
1254
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1255 1256
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1257 1258 1259 1260 1261 1262

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

J
Joao Moreno 已提交
1263
		await repository.pull();
J
Joao Moreno 已提交
1264 1265
	}

J
Joao Moreno 已提交
1266
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1267 1268
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1269 1270 1271 1272 1273 1274

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

J
Joao Moreno 已提交
1275
		await repository.pullWithRebase();
J
Joao Moreno 已提交
1276 1277
	}

J
Joao Moreno 已提交
1278
	@command('git.push', { repository: true })
J
Joao Moreno 已提交
1279 1280
	async push(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1281 1282 1283 1284 1285 1286

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

J
Joao Moreno 已提交
1287
		await repository.push();
J
Joao Moreno 已提交
1288 1289
	}

J
Joao Moreno 已提交
1290
	@command('git.pushWithTags', { repository: true })
J
Joao Moreno 已提交
1291 1292
	async pushWithTags(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1293 1294 1295 1296 1297 1298

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

J
Joao Moreno 已提交
1299
		await repository.pushTags();
1300 1301 1302 1303

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

J
Joao Moreno 已提交
1304
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1305 1306
	async pushTo(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1307 1308 1309 1310 1311 1312

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

J
Joao Moreno 已提交
1313
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1314 1315 1316 1317
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

J
Joao Moreno 已提交
1318
		const branchName = repository.HEAD.name;
J
Joao Moreno 已提交
1319 1320 1321 1322 1323 1324 1325 1326
		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 已提交
1327
		repository.pushTo(pick.label, branchName);
J
Joao Moreno 已提交
1328 1329
	}

J
Joao Moreno 已提交
1330
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1331
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352

		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 已提交
1353 1354 1355 1356 1357 1358 1359 1360 1361 1362
		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 已提交
1363 1364
	}

J
Joao 已提交
1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377
	@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();
		}));
	}

1378
	@command('git.syncRebase', { repository: true })
J
Joao Moreno 已提交
1379 1380
	syncRebase(repository: Repository): Promise<void> {
		return this._sync(repository, true);
J
Joao Moreno 已提交
1381 1382
	}

J
Joao Moreno 已提交
1383
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1384 1385
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1386 1387 1388 1389 1390 1391

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

J
Joao Moreno 已提交
1392
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1393 1394 1395 1396 1397 1398
		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 已提交
1399 1400 1401 1402 1403

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1404
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1405 1406
	}

J
Joao Moreno 已提交
1407
	@command('git.showOutput')
J
Joao Moreno 已提交
1408 1409 1410 1411
	showOutput(): void {
		this.outputChannel.show();
	}

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

1417
			if (!resource) {
J
Joao Moreno 已提交
1418 1419 1420
				return;
			}

1421
			resourceStates = [resource];
J
Joao Moreno 已提交
1422 1423
		}

1424
		const resources = resourceStates
J
Joao Moreno 已提交
1425 1426 1427
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1428
		if (!resources.length) {
N
NKumar2 已提交
1429 1430 1431
			return;
		}

1432
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
1433 1434
	}

1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449
	@command('git.stashIncludeUntracked', { repository: true })
	async stashIncludeUntracked(repository: Repository): Promise<void> {
		if (repository.workingTreeGroup.resourceStates.length === 0) {
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}

		const message = await this.getStashMessage();

		if (typeof message === 'undefined') {
			return;
		}
		await repository.createStash(message, true);
	}

J
Joao Moreno 已提交
1450
	@command('git.stash', { repository: true })
J
Joao Moreno 已提交
1451 1452
	async stash(repository: Repository): Promise<void> {
		if (repository.workingTreeGroup.resourceStates.length === 0) {
K
Krzysztof Cieślak 已提交
1453 1454 1455
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1456

1457
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
1458 1459 1460 1461 1462

		if (typeof message === 'undefined') {
			return;
		}

J
Joao Moreno 已提交
1463
		await repository.createStash(message);
K
Krzysztof Cieślak 已提交
1464 1465
	}

1466 1467 1468 1469 1470 1471 1472
	private async getStashMessage(): Promise<string | undefined> {
		return await window.showInputBox({
			prompt: localize('provide stash message', "Optionally provide a stash message"),
			placeHolder: localize('stash message', "Stash message")
		});
	}

J
Joao Moreno 已提交
1473
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1474 1475
	async stashPop(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1476 1477

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1478 1479 1480 1481
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1482 1483
		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 已提交
1484 1485 1486 1487 1488
		const choice = await window.showQuickPick(picks, { placeHolder });

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

J
Joao Moreno 已提交
1490
		await repository.popStash(choice.id);
K
Krzysztof Cieślak 已提交
1491 1492
	}

J
Joao Moreno 已提交
1493
	@command('git.stashPopLatest', { repository: true })
J
Joao Moreno 已提交
1494 1495
	async stashPopLatest(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1496 1497

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1498 1499 1500 1501
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1502
		await repository.popStash();
J
Joao Moreno 已提交
1503
	}
K
Krzysztof Cieślak 已提交
1504

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

J
Joao Moreno 已提交
1509
			if (!options.repository) {
J
Joao Moreno 已提交
1510 1511
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1512 1513
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1514 1515 1516 1517 1518 1519 1520 1521 1522
				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();
				}
1523

J
Joao Moreno 已提交
1524
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1525
					if (!repository) {
J
Joao 已提交
1526
						return Promise.resolve();
J
Joao Moreno 已提交
1527 1528
					}

J
Joao Moreno 已提交
1529
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1530
				});
J
Joao Moreno 已提交
1531 1532
			}

K
kieferrm 已提交
1533
			/* __GDPR__
K
kieferrm 已提交
1534 1535 1536 1537
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
1538 1539
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1540 1541 1542 1543
			return result.catch(async err => {
				let message: string;

				switch (err.gitErrorCode) {
1544
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1545 1546
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1547 1548 1549
					case GitErrorCodes.PushRejected:
						message = localize('cant push', "Can't push refs to remote. Run 'Pull' first to integrate your changes.");
						break;
J
Joao Moreno 已提交
1550
					default:
1551 1552 1553
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1554
							.split(/[\r\n]/)
J
João Moreno 已提交
1555
							.filter((line: string) => !!line)
1556 1557 1558 1559 1560
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578

						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();
				}
			});
		};
1579 1580

		// patch this object, so people can call methods directly
1581
		(this as any)[key] = result;
1582 1583

		return result;
J
Joao Moreno 已提交
1584 1585
	}

1586
	private getSCMResource(uri?: Uri): Resource | undefined {
1587
		uri = uri ? uri : window.activeTextEditor && window.activeTextEditor.document.uri;
J
Joao Moreno 已提交
1588 1589

		if (!uri) {
1590
			return undefined;
J
Joao Moreno 已提交
1591 1592 1593
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1594 1595
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1596 1597 1598 1599
		}

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

J
Joao Moreno 已提交
1602
			if (!repository) {
1603 1604
				return undefined;
			}
J
Joao Moreno 已提交
1605

J
Joao Moreno 已提交
1606 1607
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1608 1609 1610
		}
	}

J
Joao Moreno 已提交
1611
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624
	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 已提交
1625
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641

			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 已提交
1642 1643 1644
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
1645
}