commands.ts 54.4 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';
13
import { grep, eventToPromise, isDescendant } 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
			let gitRef = ref;

			if (gitRef === '~') {
J
Joao Moreno 已提交
213
				const uriString = uri.toString();
J
Joao Moreno 已提交
214
				const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString);
J
Joao Moreno 已提交
215
				gitRef = indexStatus ? '' : 'HEAD';
J
Joao Moreno 已提交
216 217
			}

J
Joao Moreno 已提交
218
			const { size, object } = await repository.lstree(gitRef, uri.fsPath);
J
Joao Moreno 已提交
219
			const { mimetype, encoding } = await repository.detectObjectType(object);
J
Joao Moreno 已提交
220

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

J
Joao Moreno 已提交
225
			if (size > 1000000) { // 1 MB
J
Joao Moreno 已提交
226
				return Uri.parse(`data:;label:${path.basename(uri.fsPath)};description:${gitRef},`);
J
Joao Moreno 已提交
227 228
			}

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

J
Joao Moreno 已提交
234
			return Uri.parse(`data:;label:${path.basename(uri.fsPath)};description:${gitRef},`);
J
Joao Moreno 已提交
235 236 237 238

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

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

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

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

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

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

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

				if (!repository) {
					return;
				}

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

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

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

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

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

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

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

		return '';
	}

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

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

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

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

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

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

J
Joao Moreno 已提交
351 352 353 354 355 356 357 358 359
		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 已提交
360

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

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

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
		let path: string | undefined;
J
Joao Moreno 已提交
411

J
Joao Moreno 已提交
412 413 414 415 416 417 418 419
		if (workspace.workspaceFolders && workspace.workspaceFolders.length > 1) {
			const placeHolder = localize('init', "Pick workspace folder to initialize git repo in");
			const items = workspace.workspaceFolders.map(folder => ({ label: folder.name, description: folder.uri.fsPath, folder }));
			const item = await window.showQuickPick(items, { placeHolder, ignoreFocusOut: true });

			if (!item) {
				return;
			}
J
Joao Moreno 已提交
420

J
Joao Moreno 已提交
421 422
			path = item.folder.uri.fsPath;
		}
J
Joao Moreno 已提交
423

J
Joao Moreno 已提交
424 425 426 427 428 429 430 431 432 433 434 435 436
		if (!path) {
			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 已提交
437

J
Joao Moreno 已提交
438
			if (!result || result.length === 0) {
J
Joao Moreno 已提交
439 440
				return;
			}
J
Joao Moreno 已提交
441 442 443 444 445 446 447 448 449 450 451 452 453

			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;
				}
			}

			path = uri.fsPath;
J
Joao Moreno 已提交
454 455
		}

J
Joao Moreno 已提交
456 457
		await this.git.init(path);
		await this.model.tryOpenRepository(path);
J
Joao Moreno 已提交
458 459
	}

J
Joao Moreno 已提交
460 461 462 463 464
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

469
		let uris: Uri[] | undefined;
470 471 472

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
473
				uris = [Uri.file(fromGitUri(arg).path)];
474
			} else if (arg.scheme === 'file') {
475
				uris = [arg];
476 477 478 479 480 481
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
482
				resource = this.getSCMResource();
483 484 485
			}

			if (resource) {
486
				uris = [...resourceStates.map(r => r.resourceUri), resource.resourceUri];
487
			}
J
Joao Moreno 已提交
488 489
		}

490
		if (!uris) {
J
Joao Moreno 已提交
491
			return;
J
Joao Moreno 已提交
492 493
		}

494 495 496 497
		const preview = uris.length === 1 ? true : false;
		const activeTextEditor = window.activeTextEditor;
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
498
				preserveFocus,
499
				preview,
500
				viewColumn: ViewColumn.Active
501 502
			};

503 504 505
			// 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 已提交
506 507 508
				opts.selection = activeTextEditor.selection;
			}

509
			await commands.executeCommand<void>('vscode.open', uri, opts);
J
Joao Moreno 已提交
510
		}
J
Joao Moreno 已提交
511 512
	}

J
Joao Moreno 已提交
513 514
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
515 516 517 518 519
		let resource: Resource | undefined = undefined;

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
520
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
521
		} else {
522
			resource = this.getSCMResource();
D
Duroktar 已提交
523 524 525 526 527 528
		}

		if (!resource) {
			return;
		}

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

J
Joao Moreno 已提交
531 532 533
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
534
		}
J
Joao Moreno 已提交
535 536

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

J
Joao Moreno 已提交
539 540
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
541
		const preserveFocus = arg instanceof Resource;
J
Joao 已提交
542
		const preserveSelection = arg instanceof Uri || !arg;
543
		let resources: Resource[] | undefined = undefined;
544

545
		if (arg instanceof Uri) {
546
			const resource = this.getSCMResource(arg);
547 548 549
			if (resource !== undefined) {
				resources = [resource];
			}
550
		} else {
551
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
552

553 554 555
			if (arg instanceof Resource) {
				resource = arg;
			} else {
556
				resource = this.getSCMResource();
557 558 559 560 561
			}

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

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

568 569
		const preview = resources.length === 1 ? undefined : false;
		for (const resource of resources) {
J
Joao 已提交
570
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
571
		}
J
Joao Moreno 已提交
572 573
	}

574 575
	@command('git.stage')
	async stage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
576
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
577
			const resource = this.getSCMResource();
578 579 580 581 582 583 584 585

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

586
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
587 588 589 590 591 592 593 594 595 596 597 598 599 600
		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));
601

602 603 604 605 606 607 608 609
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

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

613
		if (!scmResources.length) {
J
Joao Moreno 已提交
614 615
			return;
		}
J
Joao Moreno 已提交
616

617
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
618
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
619 620
	}

J
Joao Moreno 已提交
621 622
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638
		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 已提交
639
		await repository.add([]);
J
Joao Moreno 已提交
640 641
	}

J
Joao Moreno 已提交
642
	@command('git.stageChange')
J
Joao Moreno 已提交
643 644 645 646 647 648 649 650
	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 已提交
651 652
	}

J
Joao Moreno 已提交
653
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
654
	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
655 656 657 658 659 660 661
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
662 663 664 665
		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 已提交
666

J
Joao Moreno 已提交
667
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
668 669 670
			return;
		}

J
Joao Moreno 已提交
671 672
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
673

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

J
Joao Moreno 已提交
678
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
679 680 681
			return;
		}

J
Joao Moreno 已提交
682
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
683
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
684
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
685

J
Joao Moreno 已提交
686
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
687
	}
J
Joao Moreno 已提交
688

J
Joao Moreno 已提交
689
	@command('git.revertChange')
J
Joao Moreno 已提交
690 691 692 693
	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 已提交
694 695 696
			return;
		}

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

J
Joao Moreno 已提交
700
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
701
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
702 703 704 705 706 707 708
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
709 710 711 712 713
		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 已提交
714

J
Joao Moreno 已提交
715 716 717 718
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
719 720 721
			return;
		}

J
Joao Moreno 已提交
722 723
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
724

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

J
Joao Moreno 已提交
729
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
730 731 732
			return;
		}

J
Joao Moreno 已提交
733 734
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
735 736 737 738 739 740 741 742 743
		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 已提交
744
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
745 746 747
		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 已提交
748
		await modifiedDocument.save();
J
Joao Moreno 已提交
749 750
	}

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

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

770
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
771
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
772 773
	}

J
Joao Moreno 已提交
774 775
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
776
		await repository.revert([]);
J
Joao Moreno 已提交
777
	}
J
Joao Moreno 已提交
778

J
Joao Moreno 已提交
779 780
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
781 782 783 784 785 786 787 788 789
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

790 791 792 793 794 795 796
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
797 798 799
			return;
		}

J
Joao Moreno 已提交
800
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
801
		const originalDocument = await workspace.openTextDocument(originalUri);
802 803 804 805
		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 已提交
806 807 808 809 810

		if (!selectedDiffs.length) {
			return;
		}

811 812
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
813

J
Joao Moreno 已提交
814
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
815 816
	}

J
Joao Moreno 已提交
817 818
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
819
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
820
			const resource = this.getSCMResource();
821 822 823 824 825 826 827 828

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
832
		if (!scmResources.length) {
J
Joao Moreno 已提交
833 834
			return;
		}
J
Joao Moreno 已提交
835

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

J
Joao Moreno 已提交
840
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
841
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
842
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
843 844
				yes = localize('delete file', "Delete file");
			} else {
J
Joao Moreno 已提交
845
				message = localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
846 847
			}
		} else {
J
Joao Moreno 已提交
848
			message = localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", scmResources.length);
J
Joao Moreno 已提交
849 850 851 852 853

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

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

J
Joao Moreno 已提交
857 858 859 860
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
861
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
862
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
863
	}
J
Joao Moreno 已提交
864

J
Joao Moreno 已提交
865 866
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
867
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
868 869 870 871 872

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

J
Joao Moreno 已提交
873 874
		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 已提交
875

J
Joao Moreno 已提交
876 877 878 879 880 881
		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 已提交
882
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
883
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
884

J
Joao Moreno 已提交
885
			if (pick !== yes) {
J
Joao Moreno 已提交
886 887 888
				return;
			}

J
Joao 已提交
889
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
890 891 892 893 894 895 896 897
			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 已提交
898 899
			}

J
Joao 已提交
900
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
901 902 903 904
		} 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 已提交
905

J
Joao Moreno 已提交
906 907 908
			if (pick !== yes) {
				return;
			}
J
Joao Moreno 已提交
909

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

J
Joao Moreno 已提交
912 913 914 915
		} 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 已提交
916

J
Joao Moreno 已提交
917 918 919 920 921
			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 已提交
922

J
Joao Moreno 已提交
923
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
924 925 926 927 928 929 930 931
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
932
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
933
		}
J
Joao Moreno 已提交
934 935
	}

J
Joao Moreno 已提交
936
	private async smartCommit(
J
Joao Moreno 已提交
937
		repository: Repository,
938
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
939 940
		opts?: CommitOptions
	): Promise<boolean> {
941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959
		const unsavedTextDocuments = workspace.textDocuments
			.filter(d => !d.isUntitled && d.isDirty && isDescendant(repository.root, d.uri.fsPath));

		if (unsavedTextDocuments.length > 0) {
			const message = unsavedTextDocuments.length === 1
				? localize('unsaved files single', "The following file is unsaved: {0}.\n\nWould you like to save it before comitting?", path.basename(unsavedTextDocuments[0].uri.fsPath))
				: localize('unsaved files', "There are {0} unsaved files.\n\nWould you like to save them before comitting?", unsavedTextDocuments.length);
			const saveAndCommit = localize('save and commit', "Save All & Commit");
			const commit = localize('commit', "Commit Anyway");
			const pick = await window.showWarningMessage(message, { modal: true }, saveAndCommit, commit);

			if (pick === saveAndCommit) {
				await Promise.all(unsavedTextDocuments.map(d => d.save()));
				await repository.status();
			} else if (pick !== commit) {
				return false; // do not commit on cancel
			}
		}

960 961
		const config = workspace.getConfiguration('git');
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
962
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
963 964
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
965 966

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

J
Joao Moreno 已提交
969 970
			// 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?");
971 972 973 974 975
			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 已提交
976 977 978
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
979 980 981
			}
		}

J
Joao Moreno 已提交
982
		if (!opts) {
983
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
984 985
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
986 987
		}

988 989 990
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

J
Joao Moreno 已提交
991 992
		if (
			// no changes
993
			(noStagedChanges && noUnstagedChanges)
J
Joao Moreno 已提交
994
			// or no staged changes and not `all`
995
			|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
996
		) {
J
Joao Moreno 已提交
997 998 999 1000
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1001
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1002 1003 1004 1005 1006

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
1007
		await repository.commit(message, opts);
J
Joao Moreno 已提交
1008 1009 1010 1011

		return true;
	}

J
Joao Moreno 已提交
1012
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1013
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1014
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
1015 1016 1017 1018
			if (message) {
				return message;
			}

1019 1020 1021 1022 1023 1024
			let value: string | undefined = undefined;

			if (opts && opts.amend && repository.HEAD && repository.HEAD.commit) {
				value = (await repository.getCommit(repository.HEAD.commit)).message;
			}

1025 1026 1027 1028 1029 1030 1031
			const getPreviousCommitMessage = async () => {
				//Only return the previous commit message if it's an amend commit and the repo already has a commit
				if (opts && opts.amend && repository.HEAD && repository.HEAD.commit) {
					return (await repository.getCommit('HEAD')).message;
				}
			};

J
Joao Moreno 已提交
1032
			return await window.showInputBox({
1033
				value,
J
Joao Moreno 已提交
1034
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
1035 1036
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
1037
			});
J
Joao Moreno 已提交
1038 1039
		};

J
Joao Moreno 已提交
1040
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1041 1042

		if (message && didCommit) {
J
Joao Moreno 已提交
1043
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1044
		}
J
Joao Moreno 已提交
1045 1046
	}

J
Joao Moreno 已提交
1047
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
1048 1049
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
1050 1051
	}

J
Joao Moreno 已提交
1052
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
1053
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1054
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
1055 1056 1057
			return;
		}

J
Joao Moreno 已提交
1058
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1059 1060

		if (didCommit) {
J
Joao Moreno 已提交
1061
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1062
		}
J
Joao Moreno 已提交
1063 1064
	}

J
Joao Moreno 已提交
1065
	@command('git.commitStaged', { repository: true })
J
Joao Moreno 已提交
1066 1067
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
1068 1069
	}

J
Joao Moreno 已提交
1070
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
1071 1072
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
1073 1074
	}

J
Joao Moreno 已提交
1075
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
1076
	async commitStagedAmend(repository: Repository): Promise<void> {
1077
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
1078 1079
	}

J
Joao Moreno 已提交
1080
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
1081 1082
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
1083 1084
	}

J
Joao Moreno 已提交
1085
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1086 1087
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1088 1089
	}

J
Joao Moreno 已提交
1090
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
1091 1092
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
1093 1094
	}

J
Joao Moreno 已提交
1095
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
1096 1097
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1098 1099 1100 1101 1102

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

J
Joao Moreno 已提交
1103 1104
		const commit = await repository.getCommit('HEAD');
		await repository.reset('HEAD~');
J
Joao Moreno 已提交
1105
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1106 1107
	}

J
Joao Moreno 已提交
1108
	@command('git.checkout', { repository: true })
J
Joao Moreno 已提交
1109
	async checkout(repository: Repository, treeish: string): Promise<void> {
J
Joao Moreno 已提交
1110
		if (typeof treeish === 'string') {
J
Joao Moreno 已提交
1111
			return await repository.checkout(treeish);
J
Joao Moreno 已提交
1112 1113
		}

J
Joao Moreno 已提交
1114
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1115
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
1116 1117 1118
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1119
		const createBranch = new CreateBranchItem(this);
J
Joao Moreno 已提交
1120

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

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

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

J
Joao Moreno 已提交
1130
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
1131
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
1132
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
1133 1134 1135 1136 1137

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1138
		await choice.run(repository);
J
Joao Moreno 已提交
1139 1140
	}

J
Joao Moreno 已提交
1141
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1142
	async branch(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1143
		const result = await window.showInputBox({
J
Joao Moreno 已提交
1144
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
1145 1146
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
1147
		});
J
Joao Moreno 已提交
1148

J
Joao Moreno 已提交
1149 1150 1151
		if (!result) {
			return;
		}
J
Joao Moreno 已提交
1152

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

J
Joao Moreno 已提交
1157
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1158
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1159 1160
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1161
			run = force => repository.deleteBranch(name, force);
1162
		} else {
J
Joao Moreno 已提交
1163 1164
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1165
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1166

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

M
Maik Riechert 已提交
1170
			if (!choice || !choice.branchName) {
1171 1172
				return;
			}
M
Maik Riechert 已提交
1173
			name = choice.branchName;
J
Joao Moreno 已提交
1174
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1175 1176
		}

1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191
		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 已提交
1192 1193
	}

1194 1195
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
J
Justin Horner 已提交
1196 1197 1198 1199 1200 1201 1202 1203
		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 {
1204
			await repository.renameBranch(name);
J
Justin Horner 已提交
1205 1206 1207
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1208 1209
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1210
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1211
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", name));
1212 1213 1214
					return;
				default:
					throw err;
J
Justin Horner 已提交
1215 1216 1217 1218
			}
		}
	}

J
Joao Moreno 已提交
1219
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1220
	async merge(repository: Repository): Promise<void> {
1221 1222 1223 1224
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1225
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1226 1227
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1228

J
Joao Moreno 已提交
1229
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1230 1231
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1232 1233

		const picks = [...heads, ...remoteHeads];
1234 1235
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1236 1237 1238 1239 1240

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1241
		try {
J
Joao Moreno 已提交
1242
			await choice.run(repository);
J
Joao Moreno 已提交
1243 1244 1245 1246 1247 1248 1249 1250
		} 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);
		}
1251 1252
	}

J
Joao Moreno 已提交
1253
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1254
	async createTag(repository: Repository): Promise<void> {
1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266
		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 已提交
1267
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1268 1269 1270 1271 1272
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
1276 1277 1278 1279 1280 1281 1282 1283 1284 1285
	@command('git.fetch', { repository: true })
	async fetch(repository: Repository): Promise<void> {
		if (repository.remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to fetch', "This repository has no remotes configured to fetch from."));
			return;
		}

		await repository.fetch();
	}

J
Joao Moreno 已提交
1286
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1287 1288
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312

		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 已提交
1313
		repository.pull(false, pick.label, branchName);
1314 1315
	}

J
Joao Moreno 已提交
1316
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1317 1318
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1319 1320 1321 1322 1323 1324

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

J
Joao Moreno 已提交
1325
		await repository.pull();
J
Joao Moreno 已提交
1326 1327
	}

J
Joao Moreno 已提交
1328
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1329 1330
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1331 1332 1333 1334 1335 1336

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

J
Joao Moreno 已提交
1337
		await repository.pullWithRebase();
J
Joao Moreno 已提交
1338 1339
	}

J
Joao Moreno 已提交
1340
	@command('git.push', { repository: true })
J
Joao Moreno 已提交
1341 1342
	async push(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1343 1344 1345 1346 1347 1348

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

1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369
		if (!repository.HEAD || !repository.HEAD.name) {
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

		try {
			await repository.push();
		} catch (err) {
			if (err.gitErrorCode !== GitErrorCodes.NoUpstreamBranch) {
				throw err;
			}

			const branchName = repository.HEAD.name;
			const message = localize('confirm publish branch', "The branch '{0}' has no upstream branch. Would you like to publish this branch?", branchName);
			const yes = localize('ok', "OK");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

			if (pick === yes) {
				await this.publish(repository);
			}
		}
J
Joao Moreno 已提交
1370 1371
	}

J
Joao Moreno 已提交
1372
	@command('git.pushWithTags', { repository: true })
J
Joao Moreno 已提交
1373 1374
	async pushWithTags(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1375 1376 1377 1378 1379 1380

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

J
Joao Moreno 已提交
1381
		await repository.pushTags();
1382 1383 1384 1385

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

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

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

J
Joao Moreno 已提交
1395
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1396 1397 1398 1399
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

J
Joao Moreno 已提交
1400
		const branchName = repository.HEAD.name;
J
Joao Moreno 已提交
1401 1402 1403 1404 1405 1406 1407 1408
		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 已提交
1409
		repository.pushTo(pick.label, branchName);
J
Joao Moreno 已提交
1410 1411
	}

J
Joao Moreno 已提交
1412
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1413
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434

		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 已提交
1435 1436 1437 1438 1439 1440 1441 1442 1443 1444
		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 已提交
1445 1446
	}

J
Joao 已提交
1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459
	@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();
		}));
	}

1460
	@command('git.syncRebase', { repository: true })
J
Joao Moreno 已提交
1461 1462
	syncRebase(repository: Repository): Promise<void> {
		return this._sync(repository, true);
J
Joao Moreno 已提交
1463 1464
	}

J
Joao Moreno 已提交
1465
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1466 1467
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1468 1469 1470 1471 1472 1473

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

J
Joao Moreno 已提交
1474
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1475 1476 1477 1478 1479 1480
		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 已提交
1481 1482 1483 1484 1485

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1486
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1487 1488
	}

1489 1490
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
1491
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1492
			const resource = this.getSCMResource();
N
NKumar2 已提交
1493

1494
			if (!resource) {
J
Joao Moreno 已提交
1495 1496 1497
				return;
			}

1498
			resourceStates = [resource];
J
Joao Moreno 已提交
1499 1500
		}

1501
		const resources = resourceStates
J
Joao Moreno 已提交
1502 1503 1504
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1505
		if (!resources.length) {
N
NKumar2 已提交
1506 1507 1508
			return;
		}

1509
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
1510 1511
	}

J
Joao Moreno 已提交
1512
	private async _stash(repository: Repository, includeUntracked = false): Promise<void> {
1513 1514
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
1515

1516
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
1517 1518 1519
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1520

1521
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
1522 1523 1524 1525 1526

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

J
Joao Moreno 已提交
1527
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
1528 1529
	}

1530 1531 1532 1533 1534 1535 1536
	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 已提交
1537 1538 1539 1540 1541 1542 1543 1544 1545 1546
	@command('git.stash', { repository: true })
	stash(repository: Repository): Promise<void> {
		return this._stash(repository);
	}

	@command('git.stashIncludeUntracked', { repository: true })
	stashIncludeUntracked(repository: Repository): Promise<void> {
		return this._stash(repository, true);
	}

J
Joao Moreno 已提交
1547
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1548 1549
	async stashPop(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1550 1551

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1552 1553 1554 1555
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1556 1557
		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 已提交
1558 1559 1560 1561 1562
		const choice = await window.showQuickPick(picks, { placeHolder });

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

J
Joao Moreno 已提交
1564
		await repository.popStash(choice.id);
K
Krzysztof Cieślak 已提交
1565 1566
	}

J
Joao Moreno 已提交
1567
	@command('git.stashPopLatest', { repository: true })
J
Joao Moreno 已提交
1568 1569
	async stashPopLatest(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1570 1571

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1572 1573 1574 1575
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1576
		await repository.popStash();
J
Joao Moreno 已提交
1577
	}
K
Krzysztof Cieślak 已提交
1578

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

J
Joao Moreno 已提交
1583
			if (!options.repository) {
J
Joao Moreno 已提交
1584 1585
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1586 1587
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1588 1589 1590 1591 1592 1593 1594 1595 1596
				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();
				}
1597

J
Joao Moreno 已提交
1598
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1599
					if (!repository) {
J
Joao 已提交
1600
						return Promise.resolve();
J
Joao Moreno 已提交
1601 1602
					}

J
Joao Moreno 已提交
1603
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1604
				});
J
Joao Moreno 已提交
1605 1606
			}

K
kieferrm 已提交
1607
			/* __GDPR__
K
kieferrm 已提交
1608 1609 1610 1611
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
1612 1613
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1614 1615 1616 1617
			return result.catch(async err => {
				let message: string;

				switch (err.gitErrorCode) {
1618
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1619 1620
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1621
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
1622
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
1623
						break;
J
Joao Moreno 已提交
1624
					default:
1625 1626 1627
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1628
							.split(/[\r\n]/)
J
João Moreno 已提交
1629
							.filter((line: string) => !!line)
1630 1631 1632 1633 1634
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652

						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();
				}
			});
		};
1653 1654

		// patch this object, so people can call methods directly
1655
		(this as any)[key] = result;
1656 1657

		return result;
J
Joao Moreno 已提交
1658 1659
	}

1660
	private getSCMResource(uri?: Uri): Resource | undefined {
1661
		uri = uri ? uri : window.activeTextEditor && window.activeTextEditor.document.uri;
J
Joao Moreno 已提交
1662 1663

		if (!uri) {
1664
			return undefined;
J
Joao Moreno 已提交
1665 1666 1667
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1668 1669
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1670 1671 1672 1673
		}

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

J
Joao Moreno 已提交
1676
			if (!repository) {
1677 1678
				return undefined;
			}
J
Joao Moreno 已提交
1679

J
Joao Moreno 已提交
1680 1681
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1682 1683 1684
		}
	}

J
Joao Moreno 已提交
1685
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698
	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 已提交
1699
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715

			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 已提交
1716 1717 1718
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
1719
}