commands.ts 68.7 KB
Newer Older
J
Joao Moreno 已提交
1 2 3 4 5
/*---------------------------------------------------------------------------------------------
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

J
Joao Moreno 已提交
6
import { Uri, commands, Disposable, window, workspace, QuickPickItem, OutputChannel, Range, WorkspaceEdit, Position, LineChange, SourceControlResourceState, TextDocumentShowOptions, ViewColumn, ProgressLocation, TextEditor, MessageOptions, WorkspaceFolder } from 'vscode';
J
Joao Moreno 已提交
7
import { Git, CommitOptions, Stash, ForcePushMode } from './git';
J
Joao Moreno 已提交
8
import { Repository, Resource, Status, ResourceGroupType } from './repository';
J
Joao Moreno 已提交
9
import { Model } from './model';
J
Joao Moreno 已提交
10
import { toGitUri, fromGitUri } from './uri';
11
import { grep, isDescendant, pathEquals } from './util';
J
Joao Moreno 已提交
12
import { applyLineChanges, intersectDiffWithRange, toLineRanges, invertLineChange, getModifiedRange } from './staging';
J
Joao Moreno 已提交
13
import * as path from 'path';
14
import { lstat, Stats } from 'fs';
J
Joao Moreno 已提交
15
import * as os from 'os';
J
Joao Moreno 已提交
16
import TelemetryReporter from 'vscode-extension-telemetry';
J
Joao Moreno 已提交
17
import * as nls from 'vscode-nls';
J
Joao Moreno 已提交
18
import { Ref, RefType, Branch, GitErrorCodes } from './api/git';
J
Joao Moreno 已提交
19 20

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

J
Joao Moreno 已提交
22 23 24 25 26 27
class CheckoutItem implements QuickPickItem {

	protected get shortCommit(): string { return (this.ref.commit || '').substr(0, 8); }
	get label(): string { return this.ref.name || this.shortCommit; }
	get description(): string { return this.shortCommit; }

J
Joao Moreno 已提交
28
	constructor(protected ref: Ref) { }
J
Joao Moreno 已提交
29

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

		if (!ref) {
			return;
		}

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

class CheckoutTagItem extends CheckoutItem {

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

class CheckoutRemoteHeadItem extends CheckoutItem {

J
Joao Moreno 已提交
50 51 52
	get description(): string {
		return localize('remote branch at', "Remote branch at {0}", this.shortCommit);
	}
J
Joao Moreno 已提交
53

54
	async run(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
55 56 57 58
		if (!this.ref.name) {
			return;
		}

59
		await repository.checkoutTracking(this.ref.name);
J
Joao Moreno 已提交
60 61 62
	}
}

M
Maik Riechert 已提交
63 64
class BranchDeleteItem implements QuickPickItem {

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

70
	constructor(private ref: Ref) { }
M
Maik Riechert 已提交
71

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

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

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

J
Joao Moreno 已提交
92 93
class CreateBranchItem implements QuickPickItem {

J
Joao Moreno 已提交
94 95
	constructor(private cc: CommandCenter) { }

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

C
Christof Marti 已提交
99
	get alwaysShow(): boolean { return true; }
100

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 {
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
async function categorizeResourceByResolution(resources: Resource[]): Promise<{ merge: Resource[], resolved: Resource[], unresolved: Resource[], deletionConflicts: Resource[] }> {
140 141 142
	const selection = resources.filter(s => s instanceof Resource) as Resource[];
	const merge = selection.filter(s => s.resourceGroupType === ResourceGroupType.Merge);
	const isBothAddedOrModified = (s: Resource) => s.type === Status.BOTH_MODIFIED || s.type === Status.BOTH_ADDED;
J
Joao Moreno 已提交
143
	const isAnyDeleted = (s: Resource) => s.type === Status.DELETED_BY_THEM || s.type === Status.DELETED_BY_US;
144 145 146
	const possibleUnresolved = merge.filter(isBothAddedOrModified);
	const promises = possibleUnresolved.map(s => grep(s.resourceUri.fsPath, /^<{7}|^={7}|^>{7}/));
	const unresolvedBothModified = await Promise.all<boolean>(promises);
147
	const resolved = possibleUnresolved.filter((_s, i) => !unresolvedBothModified[i]);
J
Joao Moreno 已提交
148
	const deletionConflicts = merge.filter(s => isAnyDeleted(s));
149
	const unresolved = [
J
Joao Moreno 已提交
150
		...merge.filter(s => !isBothAddedOrModified(s) && !isAnyDeleted(s)),
151
		...possibleUnresolved.filter((_s, i) => unresolvedBothModified[i])
152 153
	];

J
Joao Moreno 已提交
154
	return { merge, resolved, unresolved, deletionConflicts };
155 156
}

157 158 159 160 161 162 163 164 165 166 167
enum PushType {
	Push,
	PushTo,
	PushTags,
}

interface PushOptions {
	pushType: PushType;
	forcePush?: boolean;
}

J
Joao Moreno 已提交
168
export class CommandCenter {
J
Joao Moreno 已提交
169 170

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

J
Joao Moreno 已提交
172
	constructor(
J
Joao Moreno 已提交
173
		private git: Git,
J
Joao Moreno 已提交
174
		private model: Model,
J
Joao Moreno 已提交
175 176
		private outputChannel: OutputChannel,
		private telemetryReporter: TelemetryReporter
J
Joao Moreno 已提交
177
	) {
J
Joao Moreno 已提交
178 179
		this.disposables = Commands.map(({ commandId, key, method, options }) => {
			const command = this.createCommand(commandId, key, method, options);
180

J
Joao Moreno 已提交
181
			if (options.diff) {
J
Joao Moreno 已提交
182 183 184 185 186
				return commands.registerDiffInformationCommand(commandId, command);
			} else {
				return commands.registerCommand(commandId, command);
			}
		});
J
Joao Moreno 已提交
187 188
	}

J
Joao Moreno 已提交
189 190
	@command('git.refresh', { repository: true })
	async refresh(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
191
		await repository.status();
J
Joao Moreno 已提交
192
	}
J
Joao Moreno 已提交
193

J
Joao Moreno 已提交
194 195
	@command('git.openResource')
	async openResource(resource: Resource): Promise<void> {
J
Joao 已提交
196
		await this._openResource(resource, undefined, true, false);
J
Joao Moreno 已提交
197 198
	}

J
Joao 已提交
199
	private async _openResource(resource: Resource, preview?: boolean, preserveFocus?: boolean, preserveSelection?: boolean): Promise<void> {
200
		let stat: Stats | undefined;
201

202 203 204 205
		try {
			stat = await new Promise<Stats>((c, e) => lstat(resource.resourceUri.fsPath, (err, stat) => err ? e(err) : c(stat)));
		} catch (err) {
			// noop
206
		}
207

208 209 210 211
		let left: Uri | undefined;
		let right: Uri | undefined;

		if (stat && stat.isDirectory()) {
212 213 214 215
			const repository = this.model.getRepositoryForSubmodule(resource.resourceUri);

			if (repository) {
				right = toGitUri(resource.resourceUri, resource.resourceGroupType === ResourceGroupType.Index ? 'index' : 'wt', { submoduleOf: repository.root });
216 217
			}
		} else {
J
Joao Moreno 已提交
218 219 220 221
			if (resource.type !== Status.DELETED_BY_THEM) {
				left = await this.getLeftResource(resource);
			}

222 223
			right = await this.getRightResource(resource);
		}
224

J
Joao Moreno 已提交
225 226
		const title = this.getTitle(resource);

J
Joao Moreno 已提交
227 228 229 230 231
		if (!right) {
			// TODO
			console.error('oh no');
			return;
		}
J
Joao Moreno 已提交
232

J
Joao Moreno 已提交
233
		const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
234 235
			preserveFocus,
			preview,
236
			viewColumn: ViewColumn.Active
J
Joao Moreno 已提交
237 238
		};

J
Joao Moreno 已提交
239 240
		const activeTextEditor = window.activeTextEditor;

241 242 243
		// 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 已提交
244 245 246
			opts.selection = activeTextEditor.selection;
		}

247
		if (!left) {
J
Joao Moreno 已提交
248
			await commands.executeCommand<void>('vscode.open', right, opts, title);
J
Joao Moreno 已提交
249 250 251 252
		} else {
			await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
		}
	}
J
Joao Moreno 已提交
253

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

J
Joao Moreno 已提交
257 258 259
		if (!repository) {
			return toGitUri(uri, ref);
		}
J
Joao Moreno 已提交
260

J
Joao Moreno 已提交
261
		try {
J
Joao Moreno 已提交
262 263 264
			let gitRef = ref;

			if (gitRef === '~') {
J
Joao Moreno 已提交
265
				const uriString = uri.toString();
J
Joao Moreno 已提交
266
				const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString);
J
Joao Moreno 已提交
267
				gitRef = indexStatus ? '' : 'HEAD';
J
Joao Moreno 已提交
268 269
			}

J
Joao Moreno 已提交
270
			const { size, object } = await repository.getObjectDetails(gitRef, uri.fsPath);
J
Joao Moreno 已提交
271
			const { mimetype } = await repository.detectObjectType(object);
J
Joao Moreno 已提交
272

J
Joao Moreno 已提交
273 274 275
			if (mimetype === 'text/plain') {
				return toGitUri(uri, ref);
			}
276

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

J
Joao Moreno 已提交
281
			if (ImageMimetypes.indexOf(mimetype) > -1) {
J
Joao Moreno 已提交
282 283
				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 已提交
284 285
			}

J
Joao Moreno 已提交
286
			return Uri.parse(`data:;label:${path.basename(uri.fsPath)};description:${gitRef},`);
J
Joao Moreno 已提交
287 288 289 290

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

J
Joao Moreno 已提交
293
	private async getLeftResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
294 295 296
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
297
				return this.getURI(resource.original, 'HEAD');
J
Joao Moreno 已提交
298 299

			case Status.MODIFIED:
J
Joao Moreno 已提交
300
				return this.getURI(resource.resourceUri, '~');
301 302

			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
303
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
304
		}
305
		return undefined;
J
Joao Moreno 已提交
306
	}
J
Joao Moreno 已提交
307

J
Joao Moreno 已提交
308
	private async getRightResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
309 310 311 312 313
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_ADDED:
			case Status.INDEX_COPIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
314
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
315 316 317

			case Status.INDEX_DELETED:
			case Status.DELETED:
J
Joao Moreno 已提交
318
				return this.getURI(resource.resourceUri, 'HEAD');
J
Joao Moreno 已提交
319

J
Joao Moreno 已提交
320 321 322 323 324 325
			case Status.DELETED_BY_US:
				return this.getURI(resource.resourceUri, '~3');

			case Status.DELETED_BY_THEM:
				return this.getURI(resource.resourceUri, '~2');

J
Joao Moreno 已提交
326 327 328
			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
J
Joao Moreno 已提交
329 330 331 332 333 334
				const repository = this.model.getRepository(resource.resourceUri);

				if (!repository) {
					return;
				}

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

J
Joao Moreno 已提交
338 339
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
340 341
				}

J
Joao Moreno 已提交
342
				return resource.resourceUri;
J
Joao Moreno 已提交
343

344
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
345
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
346
				return resource.resourceUri;
J
Joao Moreno 已提交
347
		}
348
		return undefined;
J
Joao Moreno 已提交
349 350 351
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
352
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
353 354 355 356 357 358 359

		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
				return `${basename} (Index)`;

			case Status.MODIFIED:
M
Marc Kassay 已提交
360 361
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
362
				return `${basename} (Working Tree)`;
J
Joao Moreno 已提交
363 364 365 366 367 368

			case Status.DELETED_BY_US:
				return `${basename} (Theirs)`;

			case Status.DELETED_BY_THEM:
				return `${basename} (Ours)`;
J
Joao Moreno 已提交
369 370 371 372 373
		}

		return '';
	}

J
Joao Moreno 已提交
374
	@command('git.clone')
375 376 377 378 379 380 381
	async clone(url?: string): Promise<void> {
		if (!url) {
			url = await window.showInputBox({
				prompt: localize('repourl', "Repository URL"),
				ignoreFocusOut: true
			});
		}
J
Joao Moreno 已提交
382 383

		if (!url) {
K
kieferrm 已提交
384
			/* __GDPR__
K
kieferrm 已提交
385 386 387 388
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
389 390
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
391 392
		}

393
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
394 395 396 397 398 399 400 401 402
		let defaultCloneDirectory = config.get<string>('defaultCloneDirectory') || os.homedir();
		defaultCloneDirectory = defaultCloneDirectory.replace(/^~/, os.homedir());

		const uris = await window.showOpenDialog({
			canSelectFiles: false,
			canSelectFolders: true,
			canSelectMany: false,
			defaultUri: Uri.file(defaultCloneDirectory),
			openLabel: localize('selectFolder', "Select Repository Location")
J
Joao Moreno 已提交
403 404
		});

J
Joao Moreno 已提交
405
		if (!uris || uris.length === 0) {
K
kieferrm 已提交
406
			/* __GDPR__
K
kieferrm 已提交
407 408 409 410
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
411 412
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
			return;
J
Joao Moreno 已提交
413 414
		}

J
Joao Moreno 已提交
415 416 417
		const uri = uris[0];
		const parentPath = uri.fsPath;

418
		try {
419 420 421 422 423
			const opts = {
				location: ProgressLocation.Notification,
				title: localize('cloning', "Cloning git repository '{0}'...", url),
				cancellable: true
			};
M
Maryam Archie 已提交
424

425 426
			const repositoryPath = await window.withProgress(
				opts,
J
Joao Moreno 已提交
427
				(_, token) => this.git.clone(url!, parentPath, token)
428
			);
429

430 431
			const choices = [];
			let message = localize('proposeopen', "Would you like to open the cloned repository?");
432
			const open = localize('openrepo', "Open Repository");
433 434 435 436 437 438 439 440 441
			choices.push(open);

			const addToWorkspace = localize('add', "Add to Workspace");
			if (workspace.workspaceFolders) {
				message = localize('proposeopen2', "Would you like to open the cloned repository, or add it to the current workspace?");
				choices.push(addToWorkspace);
			}

			const result = await window.showInformationMessage(message, ...choices);
442 443

			const openFolder = result === open;
K
kieferrm 已提交
444
			/* __GDPR__
K
kieferrm 已提交
445 446 447 448 449
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
					"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
				}
			*/
450
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
451 452 453

			const uri = Uri.file(repositoryPath);

454
			if (openFolder) {
455 456 457
				commands.executeCommand('vscode.openFolder', uri);
			} else if (result === addToWorkspace) {
				workspace.updateWorkspaceFolders(workspace.workspaceFolders!.length, 0, { uri });
458
			}
459 460
		} catch (err) {
			if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
K
kieferrm 已提交
461
				/* __GDPR__
K
kieferrm 已提交
462 463 464 465
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
466
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'directory_not_empty' });
J
Joao Moreno 已提交
467 468
			} else if (/Cancelled/i.test(err && (err.message || err.stderr || ''))) {
				return;
469
			} else {
K
kieferrm 已提交
470
				/* __GDPR__
K
kieferrm 已提交
471 472 473 474
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
475
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'error' });
476
			}
J
Joao Moreno 已提交
477

478
			throw err;
J
Joao Moreno 已提交
479 480 481
		}
	}

J
Joao Moreno 已提交
482
	@command('git.init')
J
Joao Moreno 已提交
483
	async init(): Promise<void> {
J
Joao Moreno 已提交
484
		let repositoryPath: string | undefined = undefined;
J
Joao Moreno 已提交
485

J
Joao Moreno 已提交
486
		if (workspace.workspaceFolders) {
J
Joao Moreno 已提交
487
			const placeHolder = localize('init', "Pick workspace folder to initialize git repo in");
J
Joao Moreno 已提交
488 489 490 491 492
			const pick = { label: localize('choose', "Choose Folder...") };
			const items: { label: string, folder?: WorkspaceFolder }[] = [
				...workspace.workspaceFolders.map(folder => ({ label: folder.name, description: folder.uri.fsPath, folder })),
				pick
			];
J
Joao Moreno 已提交
493 494 495 496
			const item = await window.showQuickPick(items, { placeHolder, ignoreFocusOut: true });

			if (!item) {
				return;
J
Joao Moreno 已提交
497 498
			} else if (item.folder) {
				repositoryPath = item.folder.uri.fsPath;
J
Joao Moreno 已提交
499 500
			}
		}
J
Joao Moreno 已提交
501

J
Joao Moreno 已提交
502
		if (!repositoryPath) {
J
Joao Moreno 已提交
503 504 505 506 507 508 509 510 511 512 513 514
			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 已提交
515

J
Joao Moreno 已提交
516
			if (!result || result.length === 0) {
J
Joao Moreno 已提交
517 518
				return;
			}
J
Joao Moreno 已提交
519 520 521 522 523 524 525 526 527 528 529 530

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

J
Joao Moreno 已提交
531
			repositoryPath = uri.fsPath;
J
Joao Moreno 已提交
532 533
		}

J
Joao Moreno 已提交
534
		await this.git.init(repositoryPath);
I
Ivan Sučić 已提交
535 536

		const choices = [];
J
Joao Moreno 已提交
537 538
		let message = localize('proposeopen init', "Would you like to open the initialized repository?");
		const open = localize('openrepo', "Open Repository");
I
Ivan Sučić 已提交
539
		choices.push(open);
J
Joao Moreno 已提交
540 541 542 543 544 545

		const addToWorkspace = localize('add', "Add to Workspace");
		if (workspace.workspaceFolders) {
			message = localize('proposeopen2 init', "Would you like to open the initialized repository, or add it to the current workspace?");
			choices.push(addToWorkspace);
		}
I
Ivan Sučić 已提交
546 547

		const result = await window.showInformationMessage(message, ...choices);
J
Joao Moreno 已提交
548
		const uri = Uri.file(repositoryPath);
I
Ivan Sučić 已提交
549

J
Joao Moreno 已提交
550 551 552 553 554 555
		if (result === open) {
			commands.executeCommand('vscode.openFolder', uri);
		} else if (result === addToWorkspace) {
			workspace.updateWorkspaceFolders(workspace.workspaceFolders!.length, 0, { uri });
		} else {
			await this.model.openRepository(repositoryPath);
I
Ivan Sučić 已提交
556
		}
J
Joao Moreno 已提交
557 558
	}

J
Joao Moreno 已提交
559 560
	@command('git.openRepository', { repository: false })
	async openRepository(path?: string): Promise<void> {
561
		if (!path) {
J
Joao Moreno 已提交
562 563 564 565 566 567
			const result = await window.showOpenDialog({
				canSelectFiles: false,
				canSelectFolders: true,
				canSelectMany: false,
				defaultUri: Uri.file(os.homedir()),
				openLabel: localize('open repo', "Open Repository")
568 569
			});

J
Joao Moreno 已提交
570
			if (!result || result.length === 0) {
571 572 573
				return;
			}

J
Joao Moreno 已提交
574
			path = result[0].fsPath;
575
		}
J
Joao Moreno 已提交
576 577

		await this.model.openRepository(path);
578 579
	}

J
Joao Moreno 已提交
580 581 582 583 584
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

589
		let uris: Uri[] | undefined;
590 591 592

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
593
				uris = [Uri.file(fromGitUri(arg).path)];
594
			} else if (arg.scheme === 'file') {
595
				uris = [arg];
596 597 598 599 600 601
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
602
				resource = this.getSCMResource();
603 604 605
			}

			if (resource) {
J
Joao Moreno 已提交
606 607 608 609
				const resources = ([resource, ...resourceStates] as Resource[])
					.filter(r => r.type !== Status.DELETED && r.type !== Status.INDEX_DELETED);

				uris = resources.map(r => r.resourceUri);
610
			}
J
Joao Moreno 已提交
611 612
		}

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

617 618 619
		const activeTextEditor = window.activeTextEditor;
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
620
				preserveFocus,
J
Joao Moreno 已提交
621
				preview: false,
622
				viewColumn: ViewColumn.Active
623 624
			};

E
Eric Gang 已提交
625 626
			const document = await workspace.openTextDocument(uri);

627 628 629
			// 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) {
E
Eric Gang 已提交
630
				// preserve not only selection but also visible range
B
Benjamin Pasero 已提交
631
				opts.selection = activeTextEditor.selection;
E
Eric Gang 已提交
632 633 634 635 636
				const previousVisibleRanges = activeTextEditor.visibleRanges;
				const editor = await window.showTextDocument(document, opts);
				editor.revealRange(previousVisibleRanges[0]);
			} else {
				await window.showTextDocument(document, opts);
B
Benjamin Pasero 已提交
637
			}
J
Joao Moreno 已提交
638
		}
J
Joao Moreno 已提交
639 640
	}

J
Joao Moreno 已提交
641 642 643 644 645
	@command('git.openFile2')
	async openFile2(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
		this.openFile(arg, ...resourceStates);
	}

J
Joao Moreno 已提交
646 647
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
648 649 650 651 652
		let resource: Resource | undefined = undefined;

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
653
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
654
		} else {
655
			resource = this.getSCMResource();
D
Duroktar 已提交
656 657 658 659 660 661
		}

		if (!resource) {
			return;
		}

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

J
Joao Moreno 已提交
664 665 666
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
667
		}
J
Joao Moreno 已提交
668 669

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

J
Joao Moreno 已提交
672 673
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
674
		const preserveFocus = arg instanceof Resource;
J
Joao 已提交
675
		const preserveSelection = arg instanceof Uri || !arg;
676
		let resources: Resource[] | undefined = undefined;
677

678
		if (arg instanceof Uri) {
679
			const resource = this.getSCMResource(arg);
680 681 682
			if (resource !== undefined) {
				resources = [resource];
			}
683
		} else {
684
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
685

686 687 688
			if (arg instanceof Resource) {
				resource = arg;
			} else {
689
				resource = this.getSCMResource();
690 691 692 693 694
			}

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

697
		if (!resources) {
J
Joao Moreno 已提交
698
			return;
J
Joao Moreno 已提交
699
		}
J
Joao Moreno 已提交
700

701 702
		const preview = resources.length === 1 ? undefined : false;
		for (const resource of resources) {
J
Joao 已提交
703
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
704
		}
J
Joao Moreno 已提交
705 706
	}

707 708
	@command('git.stage')
	async stage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
709 710
		this.outputChannel.appendLine(`git.stage ${resourceStates.length}`);

711 712
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
713
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
714
			const resource = this.getSCMResource();
715

J
Joao Moreno 已提交
716 717
			this.outputChannel.appendLine(`git.stage.getSCMResource ${resource ? resource.resourceUri.toString() : null}`);

718 719 720 721 722 723 724
			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

725
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
726
		const { resolved, unresolved, deletionConflicts } = await categorizeResourceByResolution(selection);
727 728 729 730 731

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

733 734 735 736 737 738 739 740
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
741 742 743 744 745 746 747 748 749 750 751 752 753 754
		try {
			await this.runByRepository(deletionConflicts.map(r => r.resourceUri), async (repository, resources) => {
				for (const resource of resources) {
					await this._stageDeletionConflict(repository, resource);
				}
			});
		} catch (err) {
			if (/Cancelled/.test(err.message)) {
				return;
			}

			throw err;
		}

J
Joao Moreno 已提交
755
		const workingTree = selection.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
756
		const scmResources = [...workingTree, ...resolved, ...unresolved];
757

J
Joao Moreno 已提交
758
		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
759
		if (!scmResources.length) {
J
Joao Moreno 已提交
760 761
			return;
		}
J
Joao Moreno 已提交
762

763
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
764
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
765 766
	}

J
Joao Moreno 已提交
767 768
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
769
		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
770 771 772 773 774 775 776 777 778 779 780 781 782
		const { merge, unresolved, deletionConflicts } = await categorizeResourceByResolution(resources);

		try {
			for (const deletionConflict of deletionConflicts) {
				await this._stageDeletionConflict(repository, deletionConflict.resourceUri);
			}
		} catch (err) {
			if (/Cancelled/.test(err.message)) {
				return;
			}

			throw err;
		}
783 784 785

		if (unresolved.length > 0) {
			const message = unresolved.length > 1
J
Joao Moreno 已提交
786 787
				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", merge.length)
				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(merge[0].resourceUri.fsPath));
788 789 790 791 792 793 794 795 796

			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
797
		await repository.add([]);
J
Joao Moreno 已提交
798 799
	}

J
Joao Moreno 已提交
800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834
	private async _stageDeletionConflict(repository: Repository, uri: Uri): Promise<void> {
		const uriString = uri.toString();
		const resource = repository.mergeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];

		if (!resource) {
			return;
		}

		if (resource.type === Status.DELETED_BY_THEM) {
			const keepIt = localize('keep ours', "Keep Our Version");
			const deleteIt = localize('delete', "Delete File");
			const result = await window.showInformationMessage(localize('deleted by them', "File '{0}' was deleted by them and modified by us.\n\nWhat would you like to do?", path.basename(uri.fsPath)), { modal: true }, keepIt, deleteIt);

			if (result === keepIt) {
				await repository.add([uri]);
			} else if (result === deleteIt) {
				await repository.rm([uri]);
			} else {
				throw new Error('Cancelled');
			}
		} else if (resource.type === Status.DELETED_BY_US) {
			const keepIt = localize('keep theirs', "Keep Their Version");
			const deleteIt = localize('delete', "Delete File");
			const result = await window.showInformationMessage(localize('deleted by us', "File '{0}' was deleted by us and modified by them.\n\nWhat would you like to do?", path.basename(uri.fsPath)), { modal: true }, keepIt, deleteIt);

			if (result === keepIt) {
				await repository.add([uri]);
			} else if (result === deleteIt) {
				await repository.rm([uri]);
			} else {
				throw new Error('Cancelled');
			}
		}
	}

J
Joao Moreno 已提交
835
	@command('git.stageChange')
J
Joao Moreno 已提交
836 837 838 839 840 841 842 843
	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 已提交
844 845
	}

J
Joao Moreno 已提交
846
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
847
	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
848 849 850 851 852 853 854
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
855 856 857 858
		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 已提交
859

J
Joao Moreno 已提交
860
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
861 862 863
			return;
		}

J
Joao Moreno 已提交
864 865
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
866

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

J
Joao Moreno 已提交
871
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
872 873 874
			return;
		}

J
Joao Moreno 已提交
875
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
876
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
877
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
878

J
Joao Moreno 已提交
879
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
880
	}
J
Joao Moreno 已提交
881

J
Joao Moreno 已提交
882
	@command('git.revertChange')
J
Joao Moreno 已提交
883 884 885 886
	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 已提交
887 888 889
			return;
		}

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

J
Joao Moreno 已提交
893
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
894
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
895 896 897 898 899 900 901
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
902 903
		const selections = textEditor.selections;
		const selectedChanges = changes.filter(change => {
J
Joao Moreno 已提交
904
			const modifiedRange = getModifiedRange(modifiedDocument, change);
J
Joao Moreno 已提交
905 906 907 908
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
909 910 911
			return;
		}

J
Joao Moreno 已提交
912 913
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
914

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

J
Joao Moreno 已提交
919
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
920 921 922
			return;
		}

J
Joao Moreno 已提交
923 924
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
925 926
		const selectionsBeforeRevert = textEditor.selections;
		const visibleRangesBeforeRevert = textEditor.visibleRanges;
J
Joao Moreno 已提交
927
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
928

J
Joao Moreno 已提交
929 930 931
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
932

J
Joao Moreno 已提交
933 934
		await modifiedDocument.save();

935 936
		textEditor.selections = selectionsBeforeRevert;
		textEditor.revealRange(visibleRangesBeforeRevert[0]);
J
Joao Moreno 已提交
937 938
	}

J
Joao Moreno 已提交
939 940
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
941 942
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
943
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
944
			const resource = this.getSCMResource();
945 946 947 948 949 950 951 952

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

956
		if (!scmResources.length) {
J
Joao Moreno 已提交
957 958 959
			return;
		}

960
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
961
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
962 963
	}

J
Joao Moreno 已提交
964 965
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
966
		await repository.revert([]);
J
Joao Moreno 已提交
967
	}
J
Joao Moreno 已提交
968

J
Joao Moreno 已提交
969 970
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
971 972 973 974 975 976 977 978 979
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

980 981 982 983 984 985 986
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
987 988 989
			return;
		}

J
Joao Moreno 已提交
990
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
991
		const originalDocument = await workspace.openTextDocument(originalUri);
992 993 994 995
		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 已提交
996 997 998 999 1000

		if (!selectedDiffs.length) {
			return;
		}

1001 1002
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
1003

J
Joao Moreno 已提交
1004
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
1005 1006
	}

J
Joao Moreno 已提交
1007 1008
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
1009 1010
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1011
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1012
			const resource = this.getSCMResource();
1013 1014 1015 1016 1017 1018 1019 1020

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
1024
		if (!scmResources.length) {
J
Joao Moreno 已提交
1025 1026
			return;
		}
J
Joao Moreno 已提交
1027

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

J
Joao Moreno 已提交
1032
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
1033
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
1034
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
1035 1036
				yes = localize('delete file', "Delete file");
			} else {
1037 1038 1039 1040 1041 1042
				if (scmResources[0].type === Status.DELETED) {
					yes = localize('restore file', "Restore file");
					message = localize('confirm restore', "Are you sure you want to restore {0}?", path.basename(scmResources[0].resourceUri.fsPath));
				} else {
					message = localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(scmResources[0].resourceUri.fsPath));
				}
J
Joao Moreno 已提交
1043 1044
			}
		} else {
1045 1046 1047 1048 1049 1050
			if (scmResources.every(resource => resource.type === Status.DELETED)) {
				yes = localize('restore files', "Restore files");
				message = localize('confirm restore multiple', "Are you sure you want to restore {0} files?", scmResources.length);
			} else {
				message = localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", scmResources.length);
			}
J
Joao Moreno 已提交
1051 1052 1053 1054 1055

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

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

J
Joao Moreno 已提交
1059 1060 1061 1062
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
1063
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1064
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
1065
	}
J
Joao Moreno 已提交
1066

J
Joao Moreno 已提交
1067 1068
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1069
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
1070 1071 1072 1073 1074

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

J
Joao Moreno 已提交
1075 1076
		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 已提交
1077

J
Joao Moreno 已提交
1078 1079 1080 1081 1082 1083
		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 已提交
1084
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1085
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
1086

J
Joao Moreno 已提交
1087
			if (pick !== yes) {
J
Joao Moreno 已提交
1088 1089 1090
				return;
			}

J
Joao 已提交
1091
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1092 1093 1094 1095 1096 1097 1098 1099
			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 已提交
1100 1101
			}

J
Joao 已提交
1102
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1103 1104 1105 1106
		} 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 已提交
1107

J
Joao Moreno 已提交
1108 1109 1110
			if (pick !== yes) {
				return;
			}
J
Joao Moreno 已提交
1111

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

J
Joao Moreno 已提交
1114 1115 1116 1117
		} 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 已提交
1118

J
Joao Moreno 已提交
1119 1120 1121 1122 1123
			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 已提交
1124

J
Joao Moreno 已提交
1125
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1126 1127 1128 1129 1130 1131 1132 1133
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
1134
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1135
		}
J
Joao Moreno 已提交
1136 1137
	}

J
Joao Moreno 已提交
1138
	private async smartCommit(
J
Joao Moreno 已提交
1139
		repository: Repository,
1140
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
1141 1142
		opts?: CommitOptions
	): Promise<boolean> {
1143
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
J
Joao Moreno 已提交
1144 1145 1146 1147 1148 1149 1150 1151
		const promptToSaveFilesBeforeCommit = config.get<boolean>('promptToSaveFilesBeforeCommit') === true;

		if (promptToSaveFilesBeforeCommit) {
			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
J
Joao Moreno 已提交
1152 1153
					? localize('unsaved files single', "The following file is unsaved: {0}.\n\nWould you like to save it before committing?", path.basename(unsavedTextDocuments[0].uri.fsPath))
					: localize('unsaved files', "There are {0} unsaved files.\n\nWould you like to save them before committing?", unsavedTextDocuments.length);
J
Joao Moreno 已提交
1154 1155 1156 1157 1158 1159 1160 1161 1162 1163
				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
				}
1164 1165 1166
			}
		}

1167
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
1168
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
1169 1170
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
1171 1172

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

J
Joao Moreno 已提交
1175 1176
			// 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?");
1177 1178 1179 1180 1181
			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 已提交
1182 1183 1184
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
1185 1186 1187
			}
		}

J
Joao Moreno 已提交
1188
		if (!opts) {
1189
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
1190 1191
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
1192 1193
		}

1194 1195 1196
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

1197 1198 1199 1200
		if (config.get<boolean>('alwaysSignOff')) {
			opts.signoff = true;
		}

J
Joao Moreno 已提交
1201
		if (
1202
			(
J
Joao Moreno 已提交
1203 1204 1205 1206 1207
				// no changes
				(noStagedChanges && noUnstagedChanges)
				// or no staged changes and not `all`
				|| (!opts.all && noStagedChanges)
			)
1208
			&& !opts.empty
J
Joao Moreno 已提交
1209
		) {
J
Joao Moreno 已提交
1210 1211 1212 1213
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1214
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1215 1216 1217 1218 1219

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
1220
		await repository.commit(message, opts);
J
Joao Moreno 已提交
1221 1222 1223 1224

		return true;
	}

J
Joao Moreno 已提交
1225
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1226
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1227
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
1228 1229 1230 1231
			if (message) {
				return message;
			}

1232 1233 1234 1235 1236 1237
			let value: string | undefined = undefined;

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

J
Joao Moreno 已提交
1238
			return await window.showInputBox({
1239
				value,
J
Joao Moreno 已提交
1240
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
1241 1242
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
1243
			});
J
Joao Moreno 已提交
1244 1245
		};

J
Joao Moreno 已提交
1246
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1247 1248

		if (message && didCommit) {
J
Joao Moreno 已提交
1249
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1250
		}
J
Joao Moreno 已提交
1251 1252
	}

J
Joao Moreno 已提交
1253
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
1254 1255
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
1256 1257
	}

J
Joao Moreno 已提交
1258
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
1259
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1260
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
1261 1262 1263
			return;
		}

J
Joao Moreno 已提交
1264
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1265 1266

		if (didCommit) {
J
Joao Moreno 已提交
1267
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1268
		}
J
Joao Moreno 已提交
1269 1270
	}

J
Joao Moreno 已提交
1271
	@command('git.commitStaged', { repository: true })
J
Joao Moreno 已提交
1272 1273
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
1274 1275
	}

J
Joao Moreno 已提交
1276
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
1277 1278
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
1279 1280
	}

J
Joao Moreno 已提交
1281
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
1282
	async commitStagedAmend(repository: Repository): Promise<void> {
1283
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
1284 1285
	}

J
Joao Moreno 已提交
1286
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
1287 1288
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
1289 1290
	}

J
Joao Moreno 已提交
1291
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1292 1293
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1294 1295
	}

J
Joao Moreno 已提交
1296
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
1297 1298
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
1299 1300
	}

J
Joao Moreno 已提交
1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322
	@command('git.commitEmpty', { repository: true })
	async commitEmpty(repository: Repository): Promise<void> {
		const root = Uri.file(repository.root);
		const config = workspace.getConfiguration('git', root);
		const shouldPrompt = config.get<boolean>('confirmEmptyCommits') === true;

		if (shouldPrompt) {
			const message = localize('confirm emtpy commit', "Are you sure you want to create an empty commit?");
			const yes = localize('yes', "Yes");
			const neverAgain = localize('yes never again', "Yes, Don't Show Again");
			const pick = await window.showWarningMessage(message, { modal: true }, yes, neverAgain);

			if (pick === neverAgain) {
				await config.update('confirmEmptyCommits', false, true);
			} else if (pick !== yes) {
				return;
			}
		}

		await this.commitWithAnyInput(repository, { empty: true });
	}

J
Joao Moreno 已提交
1323 1324 1325 1326 1327
	@command('git.restoreCommitTemplate', { repository: true })
	async restoreCommitTemplate(repository: Repository): Promise<void> {
		repository.inputBox.value = await repository.getCommitTemplate();
	}

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

		if (!HEAD || !HEAD.commit) {
J
Joao Moreno 已提交
1333
			window.showWarningMessage(localize('no more', "Can't undo because HEAD doesn't point to any commit."));
J
Joao Moreno 已提交
1334 1335 1336
			return;
		}

J
Joao Moreno 已提交
1337
		const commit = await repository.getCommit('HEAD');
J
Joao Moreno 已提交
1338 1339

		if (commit.parents.length > 0) {
1340 1341 1342 1343 1344
			await repository.reset('HEAD~');
		} else {
			await repository.deleteRef('HEAD');
			await this.unstageAll(repository);
		}
J
Joao Moreno 已提交
1345

J
Joao Moreno 已提交
1346
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1347 1348
	}

J
Joao Moreno 已提交
1349
	@command('git.checkout', { repository: true })
1350
	async checkout(repository: Repository, treeish: string): Promise<boolean> {
J
Joao Moreno 已提交
1351
		if (typeof treeish === 'string') {
1352 1353
			await repository.checkout(treeish);
			return true;
J
Joao Moreno 已提交
1354 1355
		}

J
Joao Moreno 已提交
1356
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1357
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
1358 1359 1360
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1361
		const createBranch = new CreateBranchItem(this);
J
Joao Moreno 已提交
1362

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

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

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

J
Joao Moreno 已提交
1372
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
1373
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
1374
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
1375 1376

		if (!choice) {
1377
			return false;
J
Joao Moreno 已提交
1378 1379
		}

J
Joao Moreno 已提交
1380
		await choice.run(repository);
1381
		return true;
J
Joao Moreno 已提交
1382 1383
	}

J
Joao Moreno 已提交
1384
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1385
	async branch(repository: Repository): Promise<void> {
1386
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1387 1388 1389 1390 1391 1392 1393 1394 1395 1396
		const branchValidationRegex = config.get<string>('branchValidationRegex')!;
		const branchWhitespaceChar = config.get<string>('branchWhitespaceChar')!;
		const validateName = new RegExp(branchValidationRegex);
		const sanitize = (name: string) => {
			name = name.trim();

			if (!name) {
				return name;
			}

1397
			return name.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, branchWhitespaceChar);
J
Joao Moreno 已提交
1398 1399
		};

J
Joao Moreno 已提交
1400
		const result = await window.showInputBox({
J
Joao Moreno 已提交
1401
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
1402
			prompt: localize('provide branch name', "Please provide a branch name"),
1403 1404
			ignoreFocusOut: true,
			validateInput: (name: string) => {
J
Joao Moreno 已提交
1405
				if (validateName.test(sanitize(name))) {
1406 1407
					return null;
				}
J
Joao Moreno 已提交
1408 1409

				return localize('branch name format invalid', "Branch name needs to match regex: {0}", branchValidationRegex);
1410
			}
J
Joao Moreno 已提交
1411
		});
J
Joao Moreno 已提交
1412

J
Joao Moreno 已提交
1413 1414 1415
		const name = sanitize(result || '');

		if (!name) {
J
Joao Moreno 已提交
1416 1417
			return;
		}
J
Joao Moreno 已提交
1418

J
Joao Moreno 已提交
1419
		await repository.branch(name, true);
J
Joao Moreno 已提交
1420 1421
	}

J
Joao Moreno 已提交
1422
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1423
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1424 1425
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1426
			run = force => repository.deleteBranch(name, force);
1427
		} else {
J
Joao Moreno 已提交
1428 1429
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1430
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1431

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

M
Maik Riechert 已提交
1435
			if (!choice || !choice.branchName) {
1436 1437
				return;
			}
M
Maik Riechert 已提交
1438
			name = choice.branchName;
J
Joao Moreno 已提交
1439
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1440 1441
		}

1442 1443 1444 1445 1446 1447 1448 1449 1450
		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");
1451
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1452 1453 1454 1455 1456

			if (pick === yes) {
				await run(true);
			}
		}
M
Maik Riechert 已提交
1457 1458
	}

1459 1460
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
J
Justin Horner 已提交
1461 1462 1463 1464 1465 1466 1467 1468
		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 {
1469
			await repository.renameBranch(name);
J
Justin Horner 已提交
1470 1471 1472
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1473 1474
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1475
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1476
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", name));
1477 1478 1479
					return;
				default:
					throw err;
J
Justin Horner 已提交
1480 1481 1482 1483
			}
		}
	}

J
Joao Moreno 已提交
1484
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1485
	async merge(repository: Repository): Promise<void> {
1486 1487 1488 1489
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1490
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1491 1492
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1493

J
Joao Moreno 已提交
1494
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1495 1496
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1497 1498

		const picks = [...heads, ...remoteHeads];
1499 1500
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1501 1502 1503 1504 1505

		if (!choice) {
			return;
		}

1506
		await choice.run(repository);
1507 1508
	}

J
Joao Moreno 已提交
1509
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1510
	async createTag(repository: Repository): Promise<void> {
1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522
		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 已提交
1523
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1524 1525 1526 1527 1528
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
1532 1533 1534 1535 1536 1537 1538
	@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;
		}

J
Joao Moreno 已提交
1539
		await repository.fetchDefault();
J
Joao Moreno 已提交
1540 1541
	}

J
Joao Moreno 已提交
1542 1543 1544 1545 1546 1547 1548 1549 1550 1551
	@command('git.fetchAll', { repository: true })
	async fetchAll(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.fetchAll();
	}

J
Joao Moreno 已提交
1552
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1553 1554
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1555 1556 1557 1558 1559 1560

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

1561
		const remotePicks = remotes.filter(r => r.fetchUrl !== undefined).map(r => ({ label: r.name, description: r.fetchUrl! }));
1562
		const placeHolder = localize('pick remote pull repo', "Pick a remote to pull the branch from");
D
Dozed12 已提交
1563
		const remotePick = await window.showQuickPick(remotePicks, { placeHolder });
1564

D
Dozed12 已提交
1565
		if (!remotePick) {
1566 1567 1568
			return;
		}

D
Dozed12 已提交
1569 1570
		const remoteRefs = repository.refs;
		const remoteRefsFiltered = remoteRefs.filter(r => (r.remote === remotePick.label));
J
Joao Moreno 已提交
1571
		const branchPicks = remoteRefsFiltered.map(r => ({ label: r.name })) as { label: string; description: string }[];
J
Joao Moreno 已提交
1572 1573
		const branchPlaceHolder = localize('pick branch pull', "Pick a branch to pull from");
		const branchPick = await window.showQuickPick(branchPicks, { placeHolder: branchPlaceHolder });
1574

D
Dozed12 已提交
1575
		if (!branchPick) {
1576 1577 1578
			return;
		}

F
Francisco Moreira 已提交
1579 1580
		const remoteCharCnt = remotePick.label.length;

1581
		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1582 1583
	}

J
Joao Moreno 已提交
1584
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1585 1586
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1587 1588 1589 1590 1591 1592

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

J
Joao Moreno 已提交
1593
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1594 1595
	}

J
Joao Moreno 已提交
1596
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1597 1598
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1599 1600 1601 1602 1603 1604

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

J
Joao Moreno 已提交
1605
		await repository.pullWithRebase(repository.HEAD);
J
Joao Moreno 已提交
1606 1607
	}

J
Joao Moreno 已提交
1608
	private async _push(repository: Repository, pushOptions: PushOptions) {
J
Joao Moreno 已提交
1609
		const remotes = repository.remotes;
1610

J
Joao Moreno 已提交
1611 1612 1613 1614
		if (remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
			return;
		}
1615

J
Joao Moreno 已提交
1616 1617 1618 1619 1620 1621
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
		let forcePushMode: ForcePushMode | undefined = undefined;

		if (pushOptions.forcePush) {
			if (!config.get<boolean>('allowForcePush')) {
				await window.showErrorMessage(localize('force push not allowed', "Force push is not allowed, please enable it with the 'git.allowForcePush' setting."));
1622 1623
				return;
			}
J
Joao Moreno 已提交
1624

J
Joao Moreno 已提交
1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638
			forcePushMode = config.get<boolean>('useForcePushWithLease') === true ? ForcePushMode.ForceWithLease : ForcePushMode.Force;

			if (config.get<boolean>('confirmForcePush')) {
				const message = localize('confirm force push', "You are about to force push your changes, this can be destructive and could inadvertedly overwrite changes made by others.\n\nAre you sure to continue?");
				const yes = localize('ok', "OK");
				const neverAgain = localize('never ask again', "OK, Don't Ask Again");
				const pick = await window.showWarningMessage(message, { modal: true }, yes, neverAgain);

				if (pick === neverAgain) {
					config.update('confirmForcePush', false, true);
				} else if (pick !== yes) {
					return;
				}
			}
J
Joao Moreno 已提交
1639 1640
		}

1641 1642 1643 1644 1645 1646 1647
		if (pushOptions.pushType === PushType.PushTags) {
			await repository.pushTags(undefined, forcePushMode);

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

1648 1649 1650 1651 1652
		if (!repository.HEAD || !repository.HEAD.name) {
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

1653 1654 1655 1656 1657 1658 1659
		if (pushOptions.pushType === PushType.Push) {
			try {
				await repository.push(repository.HEAD, forcePushMode);
			} catch (err) {
				if (err.gitErrorCode !== GitErrorCodes.NoUpstreamBranch) {
					throw err;
				}
1660

1661 1662 1663 1664 1665 1666 1667 1668 1669 1670
				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);
				}
			}
		} else {
1671
			const branchName = repository.HEAD.name;
1672 1673 1674
			const picks = remotes.filter(r => r.pushUrl !== undefined).map(r => ({ label: r.name, description: r.pushUrl! }));
			const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
			const pick = await window.showQuickPick(picks, { placeHolder });
1675

1676 1677
			if (!pick) {
				return;
1678
			}
1679 1680

			await repository.pushTo(pick.label, branchName, undefined, forcePushMode);
1681
		}
J
Joao Moreno 已提交
1682 1683
	}

1684 1685
	@command('git.push', { repository: true })
	async push(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1686
		await this._push(repository, { pushType: PushType.Push });
1687
	}
1688

1689 1690
	@command('git.pushForce', { repository: true })
	async pushForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1691
		await this._push(repository, { pushType: PushType.Push, forcePush: true });
1692
	}
1693

1694 1695
	@command('git.pushWithTags', { repository: true })
	async pushWithTags(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1696
		await this._push(repository, { pushType: PushType.PushTags });
1697
	}
1698

1699 1700
	@command('git.pushWithTagsForce', { repository: true })
	async pushWithTagsForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1701
		await this._push(repository, { pushType: PushType.PushTags, forcePush: true });
1702 1703
	}

J
Joao Moreno 已提交
1704
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1705
	async pushTo(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1706
		await this._push(repository, { pushType: PushType.PushTo });
1707
	}
J
Joao Moreno 已提交
1708

1709 1710
	@command('git.pushToForce', { repository: true })
	async pushToForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1711
		await this._push(repository, { pushType: PushType.PushTo, forcePush: true });
J
Joao Moreno 已提交
1712 1713
	}

O
Omkar Manjrekar 已提交
1714 1715 1716 1717 1718 1719 1720 1721
	@command('git.addRemote', { repository: true })
	async addRemote(repository: Repository): Promise<void> {
		const config = workspace.getConfiguration('git');
		const branchValidationRegex = config.get<string>('branchValidationRegex')!;
		const branchWhitespaceChar = config.get<string>('branchWhitespaceChar')!;
		const validateName = new RegExp(branchValidationRegex);
		const sanitize = (name: string) => {
			name = name.trim();
O
Omkar Manjrekar 已提交
1722

O
Omkar Manjrekar 已提交
1723 1724 1725
			if (!name) {
				return name;
			}
O
Omkar Manjrekar 已提交
1726

O
Omkar Manjrekar 已提交
1727 1728
			return name.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, branchWhitespaceChar);
		};
O
Omkar Manjrekar 已提交
1729

O
Omkar Manjrekar 已提交
1730 1731 1732 1733 1734 1735 1736 1737
		const result = await window.showInputBox({
			placeHolder: localize('remote name', "Remote name"),
			prompt: localize('provide remote name', "Please provide a remote name"),
			ignoreFocusOut: true,
			validateInput: (name: string) => {
				if (validateName.test(sanitize(name))) {
					return null;
				}
O
Omkar Manjrekar 已提交
1738

O
Omkar Manjrekar 已提交
1739
				return localize('branch name format invalid', "Branch name needs to match regex: {0}", branchValidationRegex);
O
Omkar Manjrekar 已提交
1740
			}
O
Omkar Manjrekar 已提交
1741
		});
O
Omkar Manjrekar 已提交
1742

O
Omkar Manjrekar 已提交
1743 1744 1745 1746
		const name = sanitize(result || '');

		if (!name) {
			return;
O
Omkar Manjrekar 已提交
1747
		}
O
Omkar Manjrekar 已提交
1748 1749

		await repository.branch(name, true);
O
Omkar Manjrekar 已提交
1750 1751
	}

O
Omkar Manjrekar 已提交
1752 1753
	@command('git.removeRemote', { repository: true })
	async removeRemote(repository: Repository): Promise<void> {
O
Omkar Manjrekar 已提交
1754

O
Omkar Manjrekar 已提交
1755
	}
O
Omkar Manjrekar 已提交
1756

J
Joao Moreno 已提交
1757
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1758
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1759 1760 1761 1762 1763

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

J
Joao Moreno 已提交
1764 1765 1766 1767
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
1768
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1769
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
1770 1771

		if (shouldPrompt) {
J
Joao Moreno 已提交
1772
			const message = localize('sync is unpredictable', "This action will push and pull commits to and from '{0}/{1}'.", HEAD.upstream.remote, HEAD.upstream.name);
J
Joao Moreno 已提交
1773
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
1774
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
1775 1776 1777 1778 1779 1780 1781 1782 1783
			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 已提交
1784
		if (rebase) {
J
Joao Moreno 已提交
1785
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
1786
		} else {
J
Joao Moreno 已提交
1787
			await repository.sync(HEAD);
J
Joao Moreno 已提交
1788 1789 1790 1791 1792 1793
		}
	}

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

J
Joao 已提交
1796 1797 1798 1799 1800 1801 1802 1803 1804
	@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;
			}

J
Joao Moreno 已提交
1805
			await repository.sync(HEAD);
J
Joao 已提交
1806 1807 1808
		}));
	}

1809
	@command('git.syncRebase', { repository: true })
J
Joao Moreno 已提交
1810 1811
	syncRebase(repository: Repository): Promise<void> {
		return this._sync(repository, true);
J
Joao Moreno 已提交
1812 1813
	}

J
Joao Moreno 已提交
1814
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1815 1816
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1817 1818 1819 1820 1821 1822

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

J
Joao Moreno 已提交
1823
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1824 1825 1826 1827 1828 1829
		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 已提交
1830 1831 1832 1833 1834

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1835
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1836 1837
	}

1838 1839
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
1840 1841
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1842
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1843
			const resource = this.getSCMResource();
N
NKumar2 已提交
1844

1845
			if (!resource) {
J
Joao Moreno 已提交
1846 1847 1848
				return;
			}

1849
			resourceStates = [resource];
J
Joao Moreno 已提交
1850 1851
		}

1852
		const resources = resourceStates
J
Joao Moreno 已提交
1853 1854 1855
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1856
		if (!resources.length) {
N
NKumar2 已提交
1857 1858 1859
			return;
		}

1860
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
1861 1862
	}

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

1867
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
1868 1869 1870
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1871

1872
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
1873 1874 1875 1876 1877

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

J
Joao Moreno 已提交
1878
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
1879 1880
	}

1881 1882 1883 1884 1885 1886 1887
	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 已提交
1888 1889 1890 1891 1892 1893 1894 1895 1896 1897
	@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 已提交
1898
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1899
	async stashPop(repository: Repository): Promise<void> {
1900
		const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
J
Joao Moreno 已提交
1901
		const stash = await this.pickStash(repository, placeHolder);
1902

J
Joao Moreno 已提交
1903
		if (!stash) {
1904 1905 1906
			return;
		}

J
Joao Moreno 已提交
1907
		await repository.popStash(stash.index);
1908 1909 1910 1911
	}

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

J
Joao Moreno 已提交
1914 1915
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
1916 1917 1918
			return;
		}

1919 1920 1921 1922 1923 1924
		await repository.popStash();
	}

	@command('git.stashApply', { repository: true })
	async stashApply(repository: Repository): Promise<void> {
		const placeHolder = localize('pick stash to apply', "Pick a stash to apply");
J
Joao Moreno 已提交
1925
		const stash = await this.pickStash(repository, placeHolder);
K
Krzysztof Cieślak 已提交
1926

J
Joao Moreno 已提交
1927
		if (!stash) {
K
Krzysztof Cieślak 已提交
1928 1929
			return;
		}
J
Joao Moreno 已提交
1930

J
Joao Moreno 已提交
1931
		await repository.applyStash(stash.index);
K
Krzysztof Cieślak 已提交
1932 1933
	}

1934 1935
	@command('git.stashApplyLatest', { repository: true })
	async stashApplyLatest(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1936
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1937

J
Joao Moreno 已提交
1938 1939
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
1940 1941 1942 1943 1944 1945
			return;
		}

		await repository.applyStash();
	}

J
Joao Moreno 已提交
1946
	private async pickStash(repository: Repository, placeHolder: string): Promise<Stash | undefined> {
1947 1948
		const stashes = await repository.getStashes();

J
Joao Moreno 已提交
1949 1950
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
1951 1952 1953
			return;
		}

J
Joao Moreno 已提交
1954 1955 1956
		const picks = stashes.map(stash => ({ label: `#${stash.index}:  ${stash.description}`, description: '', details: '', stash }));
		const result = await window.showQuickPick(picks, { placeHolder });
		return result && result.stash;
J
Joao Moreno 已提交
1957
	}
K
Krzysztof Cieślak 已提交
1958

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

J
Joao Moreno 已提交
1963
			if (!options.repository) {
J
Joao Moreno 已提交
1964 1965
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1966 1967
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1968 1969 1970 1971 1972 1973 1974 1975 1976
				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();
				}
1977

J
Joao Moreno 已提交
1978
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1979
					if (!repository) {
J
Joao 已提交
1980
						return Promise.resolve();
J
Joao Moreno 已提交
1981 1982
					}

J
Joao Moreno 已提交
1983
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1984
				});
J
Joao Moreno 已提交
1985 1986
			}

K
kieferrm 已提交
1987
			/* __GDPR__
K
kieferrm 已提交
1988 1989 1990 1991
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
1992 1993
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1994
			return result.catch(async err => {
J
Joao Moreno 已提交
1995
				const options: MessageOptions = {
1996
					modal: true
J
Joao Moreno 已提交
1997 1998
				};

J
Joao Moreno 已提交
1999
				let message: string;
2000
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
2001

J
Joao Moreno 已提交
2002 2003 2004 2005 2006
				const choices = new Map<string, () => void>();
				const openOutputChannelChoice = localize('open git log', "Open Git Log");
				const outputChannel = this.outputChannel as OutputChannel;
				choices.set(openOutputChannelChoice, () => outputChannel.show());

J
Joao Moreno 已提交
2007
				switch (err.gitErrorCode) {
2008
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
2009 2010
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
2011
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
2012
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
2013
						break;
2014 2015 2016 2017 2018
					case GitErrorCodes.Conflict:
						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
						type = 'warning';
						options.modal = false;
						break;
J
Joao Moreno 已提交
2019 2020 2021 2022 2023
					case GitErrorCodes.StashConflict:
						message = localize('stash merge conflicts', "There were merge conflicts while applying the stash.");
						type = 'warning';
						options.modal = false;
						break;
2024 2025
					case GitErrorCodes.NoUserNameConfigured:
					case GitErrorCodes.NoUserEmailConfigured:
J
Joao Moreno 已提交
2026 2027
						message = localize('missing user info', "Make sure you configure your 'user.name' and 'user.email' in git.");
						choices.set(localize('learn more', "Learn More"), () => commands.executeCommand('vscode.open', Uri.parse('https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup')));
2028
						break;
J
Joao Moreno 已提交
2029
					default:
2030 2031 2032
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
2033
							.split(/[\r\n]/)
J
João Moreno 已提交
2034
							.filter((line: string) => !!line)
2035 2036 2037 2038 2039
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
2040 2041 2042 2043 2044 2045 2046 2047 2048

						break;
				}

				if (!message) {
					console.error(err);
					return;
				}

J
Joao Moreno 已提交
2049 2050 2051 2052 2053 2054 2055
				const allChoices = Array.from(choices.keys());
				const result = type === 'error'
					? await window.showErrorMessage(message, options, ...allChoices)
					: await window.showWarningMessage(message, options, ...allChoices);

				if (result) {
					const resultFn = choices.get(result);
J
Joao Moreno 已提交
2056

J
Joao Moreno 已提交
2057 2058 2059
					if (resultFn) {
						resultFn();
					}
J
Joao Moreno 已提交
2060 2061 2062
				}
			});
		};
2063 2064

		// patch this object, so people can call methods directly
2065
		(this as any)[key] = result;
2066 2067

		return result;
J
Joao Moreno 已提交
2068 2069
	}

2070
	private getSCMResource(uri?: Uri): Resource | undefined {
J
Joao Moreno 已提交
2071
		uri = uri ? uri : (window.activeTextEditor && window.activeTextEditor.document.uri);
J
Joao Moreno 已提交
2072

J
Joao Moreno 已提交
2073
		this.outputChannel.appendLine(`git.getSCMResource.uri ${uri && uri.toString()}`);
J
Joao Moreno 已提交
2074 2075 2076
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
2077

J
Joao Moreno 已提交
2078
		if (!uri) {
2079
			return undefined;
J
Joao Moreno 已提交
2080 2081 2082
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
2083 2084
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
2085 2086 2087 2088
		}

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

J
Joao Moreno 已提交
2091
			if (!repository) {
2092 2093
				return undefined;
			}
J
Joao Moreno 已提交
2094

J
Joao Moreno 已提交
2095 2096
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
2097
		}
2098
		return undefined;
J
Joao Moreno 已提交
2099 2100
	}

J
Joao Moreno 已提交
2101
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
2102 2103 2104 2105 2106 2107
	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) => {
2108
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
2109 2110 2111 2112 2113 2114

			if (!repository) {
				console.warn('Could not find git repository for ', resource);
				return result;
			}

2115
			// Could it be a submodule?
2116
			if (pathEquals(resource.fsPath, repository.root)) {
2117 2118 2119
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
2120
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136

			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 已提交
2137 2138 2139
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
2140
}