commands.ts 52.8 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
			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
			window.withProgress({ location: ProgressLocation.SourceControl, title: localize('cloning', "Cloning git repository...") }, () => clonePromise);
J
Joao Moreno 已提交
365
			// window.withProgress({ location: ProgressLocation.Window, title: localize('cloning', "Cloning git repository...") }, () => clonePromise);
M
Maryam Archie 已提交
366

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

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

J
Joao Moreno 已提交
409
	@command('git.init')
J
Joao Moreno 已提交
410
	async init(): Promise<void> {
J
Joao Moreno 已提交
411
		let path: string | undefined;
J
Joao Moreno 已提交
412

J
Joao Moreno 已提交
413 414 415 416 417 418 419 420
		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 已提交
421

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

J
Joao Moreno 已提交
425 426 427 428 429 430 431 432 433 434 435 436 437
		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 已提交
438

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

			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 已提交
455 456
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

		if (!resource) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

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

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

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

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

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

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

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

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

		if (!textEditor) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

		if (!textEditor) {
			return;
		}

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

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

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

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

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

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

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

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

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

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

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

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

		if (!textEditor) {
			return;
		}

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

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

		const { ref } = fromGitUri(modifiedUri);

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

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

		if (!selectedDiffs.length) {
			return;
		}

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

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

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

J
Joao Moreno 已提交
937
	private async smartCommit(
J
Joao Moreno 已提交
938
		repository: Repository,
939
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
940 941
		opts?: CommitOptions
	): Promise<boolean> {
942 943
		const config = workspace.getConfiguration('git');
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
944
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
945 946
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
947 948

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

J
Joao Moreno 已提交
951 952
			// 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?");
953 954 955 956 957
			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 已提交
958 959 960
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
961 962 963
			}
		}

J
Joao Moreno 已提交
964
		if (!opts) {
965
			opts = { all: noStagedChanges };
966 967
		} else if ((opts.all === false) && noStagedChanges) {
			opts = { ...opts, all: noStagedChanges };
J
Joao Moreno 已提交
968 969
		}

970 971 972
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

J
Joao Moreno 已提交
973 974
		if (
			// no changes
975
			(noStagedChanges && noUnstagedChanges)
J
Joao Moreno 已提交
976
			// or no staged changes and not `all`
977
			|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
978
		) {
J
Joao Moreno 已提交
979 980 981 982
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
983
		const message = await getCommitMessage();
J
Joao Moreno 已提交
984 985 986 987 988

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
989
		await repository.commit(message, opts);
J
Joao Moreno 已提交
990 991 992 993

		return true;
	}

J
Joao Moreno 已提交
994
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
995
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
996
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
997 998 999 1000
			if (message) {
				return message;
			}

1001 1002 1003 1004 1005 1006
			let value: string | undefined = undefined;

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

1007 1008 1009 1010 1011 1012 1013
			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 已提交
1014
			return await window.showInputBox({
1015
				value,
J
Joao Moreno 已提交
1016
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
1017 1018
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
1019
			});
J
Joao Moreno 已提交
1020 1021
		};

J
Joao Moreno 已提交
1022
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1023 1024

		if (message && didCommit) {
J
Joao Moreno 已提交
1025
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1026
		}
J
Joao Moreno 已提交
1027 1028
	}

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

J
Joao Moreno 已提交
1034
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
1035
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1036
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
1037 1038 1039
			return;
		}

J
Joao Moreno 已提交
1040
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1041 1042

		if (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.commitStaged', { repository: true })
J
Joao Moreno 已提交
1048 1049
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
1050 1051
	}

J
Joao Moreno 已提交
1052
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
1053 1054
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
1055 1056
	}

J
Joao Moreno 已提交
1057
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
1058
	async commitStagedAmend(repository: Repository): Promise<void> {
1059
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
1060 1061
	}

J
Joao Moreno 已提交
1062
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
1063 1064
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
1065 1066
	}

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

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

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

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

J
Joao Moreno 已提交
1085 1086
		const commit = await repository.getCommit('HEAD');
		await repository.reset('HEAD~');
J
Joao Moreno 已提交
1087
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1088 1089
	}

J
Joao Moreno 已提交
1090
	@command('git.checkout', { repository: true })
J
Joao Moreno 已提交
1091
	async checkout(repository: Repository, treeish: string): Promise<void> {
J
Joao Moreno 已提交
1092
		if (typeof treeish === 'string') {
J
Joao Moreno 已提交
1093
			return await repository.checkout(treeish);
J
Joao Moreno 已提交
1094 1095
		}

J
Joao Moreno 已提交
1096
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1097
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
1098 1099 1100
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1101
		const createBranch = new CreateBranchItem(this);
J
Joao Moreno 已提交
1102

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

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

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

J
Joao Moreno 已提交
1112
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
1113
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
1114
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
1115 1116 1117 1118 1119

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1120
		await choice.run(repository);
J
Joao Moreno 已提交
1121 1122
	}

J
Joao Moreno 已提交
1123
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1124
	async branch(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1125
		const result = await window.showInputBox({
J
Joao Moreno 已提交
1126
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
1127 1128
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
1129
		});
J
Joao Moreno 已提交
1130

J
Joao Moreno 已提交
1131 1132 1133
		if (!result) {
			return;
		}
J
Joao Moreno 已提交
1134

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

J
Joao Moreno 已提交
1139
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1140
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1141 1142
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1143
			run = force => repository.deleteBranch(name, force);
1144
		} else {
J
Joao Moreno 已提交
1145 1146
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1147
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1148

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

M
Maik Riechert 已提交
1152
			if (!choice || !choice.branchName) {
1153 1154
				return;
			}
M
Maik Riechert 已提交
1155
			name = choice.branchName;
J
Joao Moreno 已提交
1156
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1157 1158
		}

1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173
		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 已提交
1174 1175
	}

1176 1177
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
J
Justin Horner 已提交
1178 1179 1180 1181 1182 1183 1184 1185
		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 {
1186
			await repository.renameBranch(name);
J
Justin Horner 已提交
1187 1188 1189
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1190 1191
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1192
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1193
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", name));
1194 1195 1196
					return;
				default:
					throw err;
J
Justin Horner 已提交
1197 1198 1199 1200
			}
		}
	}

J
Joao Moreno 已提交
1201
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1202
	async merge(repository: Repository): Promise<void> {
1203 1204 1205 1206
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1207
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1208 1209
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1210

J
Joao Moreno 已提交
1211
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1212 1213
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1214 1215

		const picks = [...heads, ...remoteHeads];
1216 1217
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1218 1219 1220 1221 1222

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1223
		try {
J
Joao Moreno 已提交
1224
			await choice.run(repository);
J
Joao Moreno 已提交
1225 1226 1227 1228 1229 1230 1231 1232
		} 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);
		}
1233 1234
	}

J
Joao Moreno 已提交
1235
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1236
	async createTag(repository: Repository): Promise<void> {
1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248
		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 已提交
1249
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1250 1251 1252 1253 1254
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
1258 1259 1260 1261 1262 1263 1264 1265 1266 1267
	@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 已提交
1268
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1269 1270
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294

		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 已提交
1295
		repository.pull(false, pick.label, branchName);
1296 1297
	}

J
Joao Moreno 已提交
1298
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1299 1300
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1301 1302 1303 1304 1305 1306

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

J
Joao Moreno 已提交
1307
		await repository.pull();
J
Joao Moreno 已提交
1308 1309
	}

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

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

J
Joao Moreno 已提交
1319
		await repository.pullWithRebase();
J
Joao Moreno 已提交
1320 1321
	}

J
Joao Moreno 已提交
1322
	@command('git.push', { repository: true })
J
Joao Moreno 已提交
1323 1324
	async push(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1325 1326 1327 1328 1329 1330

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

J
Joao Moreno 已提交
1331
		await repository.push();
J
Joao Moreno 已提交
1332 1333
	}

J
Joao Moreno 已提交
1334
	@command('git.pushWithTags', { repository: true })
J
Joao Moreno 已提交
1335 1336
	async pushWithTags(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1337 1338 1339 1340 1341 1342

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

J
Joao Moreno 已提交
1343
		await repository.pushTags();
1344 1345 1346 1347

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

J
Joao Moreno 已提交
1348
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1349 1350
	async pushTo(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1351 1352 1353 1354 1355 1356

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

J
Joao Moreno 已提交
1357
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1358 1359 1360 1361
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

J
Joao Moreno 已提交
1362
		const branchName = repository.HEAD.name;
J
Joao Moreno 已提交
1363 1364 1365 1366 1367 1368 1369 1370
		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 已提交
1371
		repository.pushTo(pick.label, branchName);
J
Joao Moreno 已提交
1372 1373
	}

J
Joao Moreno 已提交
1374
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1375
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396

		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 已提交
1397 1398 1399 1400 1401 1402 1403 1404 1405 1406
		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 已提交
1407 1408
	}

J
Joao 已提交
1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421
	@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();
		}));
	}

1422
	@command('git.syncRebase', { repository: true })
J
Joao Moreno 已提交
1423 1424
	syncRebase(repository: Repository): Promise<void> {
		return this._sync(repository, true);
J
Joao Moreno 已提交
1425 1426
	}

J
Joao Moreno 已提交
1427
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1428 1429
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1430 1431 1432 1433 1434 1435

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

J
Joao Moreno 已提交
1436
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1437 1438 1439 1440 1441 1442
		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 已提交
1443 1444 1445 1446 1447

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1448
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1449 1450
	}

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

1456
			if (!resource) {
J
Joao Moreno 已提交
1457 1458 1459
				return;
			}

1460
			resourceStates = [resource];
J
Joao Moreno 已提交
1461 1462
		}

1463
		const resources = resourceStates
J
Joao Moreno 已提交
1464 1465 1466
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1467
		if (!resources.length) {
N
NKumar2 已提交
1468 1469 1470
			return;
		}

1471
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
1472 1473
	}

J
Joao Moreno 已提交
1474
	private async _stash(repository: Repository, includeUntracked = false): Promise<void> {
J
Joao Moreno 已提交
1475
		if (repository.workingTreeGroup.resourceStates.length === 0) {
K
Krzysztof Cieślak 已提交
1476 1477 1478
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1479

1480
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
1481 1482 1483 1484 1485

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

J
Joao Moreno 已提交
1486
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
1487 1488
	}

1489 1490 1491 1492 1493 1494 1495
	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 已提交
1496 1497 1498 1499 1500 1501 1502 1503 1504 1505
	@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 已提交
1506
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1507 1508
	async stashPop(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1509 1510

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1511 1512 1513 1514
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1515 1516
		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 已提交
1517 1518 1519 1520 1521
		const choice = await window.showQuickPick(picks, { placeHolder });

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

J
Joao Moreno 已提交
1523
		await repository.popStash(choice.id);
K
Krzysztof Cieślak 已提交
1524 1525
	}

J
Joao Moreno 已提交
1526
	@command('git.stashPopLatest', { repository: true })
J
Joao Moreno 已提交
1527 1528
	async stashPopLatest(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1529 1530

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1531 1532 1533 1534
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1535
		await repository.popStash();
J
Joao Moreno 已提交
1536
	}
K
Krzysztof Cieślak 已提交
1537

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

J
Joao Moreno 已提交
1542
			if (!options.repository) {
J
Joao Moreno 已提交
1543 1544
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1545 1546
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1547 1548 1549 1550 1551 1552 1553 1554 1555
				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();
				}
1556

J
Joao Moreno 已提交
1557
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1558
					if (!repository) {
J
Joao 已提交
1559
						return Promise.resolve();
J
Joao Moreno 已提交
1560 1561
					}

J
Joao Moreno 已提交
1562
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1563
				});
J
Joao Moreno 已提交
1564 1565
			}

K
kieferrm 已提交
1566
			/* __GDPR__
K
kieferrm 已提交
1567 1568 1569 1570
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
1571 1572
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1573 1574 1575 1576
			return result.catch(async err => {
				let message: string;

				switch (err.gitErrorCode) {
1577
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1578 1579
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1580
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
1581
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
1582
						break;
J
Joao Moreno 已提交
1583
					default:
1584 1585 1586
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1587
							.split(/[\r\n]/)
J
João Moreno 已提交
1588
							.filter((line: string) => !!line)
1589 1590 1591 1592 1593
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611

						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();
				}
			});
		};
1612 1613

		// patch this object, so people can call methods directly
1614
		(this as any)[key] = result;
1615 1616

		return result;
J
Joao Moreno 已提交
1617 1618
	}

1619
	private getSCMResource(uri?: Uri): Resource | undefined {
1620
		uri = uri ? uri : window.activeTextEditor && window.activeTextEditor.document.uri;
J
Joao Moreno 已提交
1621 1622

		if (!uri) {
1623
			return undefined;
J
Joao Moreno 已提交
1624 1625 1626
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1627 1628
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1629 1630 1631 1632
		}

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

J
Joao Moreno 已提交
1635
			if (!repository) {
1636 1637
				return undefined;
			}
J
Joao Moreno 已提交
1638

J
Joao Moreno 已提交
1639 1640
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1641 1642 1643
		}
	}

J
Joao Moreno 已提交
1644
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657
	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 已提交
1658
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674

			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 已提交
1675 1676 1677
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
1678
}