commands.ts 68.0 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';
I
Ilya Biryukov 已提交
8
import { Repository, Resource, 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';
I
Ilya Biryukov 已提交
18
import { Ref, RefType, Branch, GitErrorCodes, Status } 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
enum PushType {
	Push,
	PushTo,
	PushTags,
}

interface PushOptions {
	pushType: PushType;
	forcePush?: boolean;
J
Joao Moreno 已提交
166
	silent?: boolean;
167 168
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

J
Joao Moreno 已提交
321 322 323 324 325 326
			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 已提交
327 328 329
			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
J
Joao Moreno 已提交
330 331 332 333 334 335
				const repository = this.model.getRepository(resource.resourceUri);

				if (!repository) {
					return;
				}

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

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

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

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

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

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

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

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

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

		return '';
	}

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

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

394
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
395 396 397 398 399 400 401 402 403
		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 已提交
404 405
		});

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

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

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

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

431 432
			const choices = [];
			let message = localize('proposeopen', "Would you like to open the cloned repository?");
433
			const open = localize('openrepo', "Open Repository");
434 435 436 437 438 439 440 441 442
			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);
443 444

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

			const uri = Uri.file(repositoryPath);

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

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

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

J
Joao Moreno 已提交
487
		if (workspace.workspaceFolders) {
J
Joao Moreno 已提交
488
			const placeHolder = localize('init', "Pick workspace folder to initialize git repo in");
J
Joao Moreno 已提交
489 490 491 492 493
			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 已提交
494 495 496 497
			const item = await window.showQuickPick(items, { placeHolder, ignoreFocusOut: true });

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

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

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

			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 已提交
532
			repositoryPath = uri.fsPath;
J
Joao Moreno 已提交
533 534
		}

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

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

		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ć 已提交
547 548

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

J
Joao Moreno 已提交
551 552 553 554 555 556
		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ć 已提交
557
		}
J
Joao Moreno 已提交
558 559
	}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

		if (!resource) {
			return;
		}

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

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

J
Joao Moreno 已提交
671 672 673 674 675
		const opts: TextDocumentShowOptions = {
			preview
		};

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

J
Joao Moreno 已提交
678 679
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
680
		const preserveFocus = arg instanceof Resource;
J
Joao Moreno 已提交
681 682
		const preview = !(arg instanceof Resource);

J
Joao 已提交
683
		const preserveSelection = arg instanceof Uri || !arg;
684
		let resources: Resource[] | undefined = undefined;
685

686
		if (arg instanceof Uri) {
687
			const resource = this.getSCMResource(arg);
688 689 690
			if (resource !== undefined) {
				resources = [resource];
			}
691
		} else {
692
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
693

694 695 696
			if (arg instanceof Resource) {
				resource = arg;
			} else {
697
				resource = this.getSCMResource();
698 699 700 701 702
			}

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

705
		if (!resources) {
J
Joao Moreno 已提交
706
			return;
J
Joao Moreno 已提交
707
		}
J
Joao Moreno 已提交
708

709
		for (const resource of resources) {
J
Joao 已提交
710
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
711
		}
J
Joao Moreno 已提交
712 713
	}

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

718 719
		resourceStates = resourceStates.filter(s => !!s);

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

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

725 726 727 728 729 730 731
			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

732
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
733
		const { resolved, unresolved, deletionConflicts } = await categorizeResourceByResolution(selection);
734 735 736 737 738

		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));
739

740 741 742 743 744 745 746 747
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
748 749 750 751 752 753 754 755 756 757 758 759 760 761
		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 已提交
762
		const workingTree = selection.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
763
		const scmResources = [...workingTree, ...resolved, ...unresolved];
764

J
Joao Moreno 已提交
765
		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
766
		if (!scmResources.length) {
J
Joao Moreno 已提交
767 768
			return;
		}
J
Joao Moreno 已提交
769

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

J
Joao Moreno 已提交
774 775
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
776
		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
777 778 779 780 781 782 783 784 785 786 787 788 789
		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;
		}
790 791 792

		if (unresolved.length > 0) {
			const message = unresolved.length > 1
J
Joao Moreno 已提交
793 794
				? 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));
795 796 797 798 799 800 801 802 803

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

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

J
Joao Moreno 已提交
804
		await repository.add([]);
J
Joao Moreno 已提交
805 806
	}

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

J
Joao Moreno 已提交
853
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
854
	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
855 856 857 858 859 860 861
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
862 863 864 865
		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 已提交
866

J
Joao Moreno 已提交
867
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
868 869 870
			return;
		}

J
Joao Moreno 已提交
871 872
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
873

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

J
Joao Moreno 已提交
878
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
879 880 881
			return;
		}

J
Joao Moreno 已提交
882
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
883
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
884
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
885

J
Joao Moreno 已提交
886
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
887
	}
J
Joao Moreno 已提交
888

J
Joao Moreno 已提交
889
	@command('git.revertChange')
J
Joao Moreno 已提交
890 891 892 893
	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 已提交
894 895 896
			return;
		}

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

J
Joao Moreno 已提交
900
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
901
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
902 903 904 905 906 907 908
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
909 910
		const selections = textEditor.selections;
		const selectedChanges = changes.filter(change => {
J
Joao Moreno 已提交
911
			const modifiedRange = getModifiedRange(modifiedDocument, change);
J
Joao Moreno 已提交
912 913 914 915
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
916 917 918
			return;
		}

J
Joao Moreno 已提交
919 920
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
921

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

J
Joao Moreno 已提交
926
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
927 928 929
			return;
		}

J
Joao Moreno 已提交
930 931
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
932 933
		const selectionsBeforeRevert = textEditor.selections;
		const visibleRangesBeforeRevert = textEditor.visibleRanges;
J
Joao Moreno 已提交
934
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
935

J
Joao Moreno 已提交
936 937 938
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
939

J
Joao Moreno 已提交
940 941
		await modifiedDocument.save();

942 943
		textEditor.selections = selectionsBeforeRevert;
		textEditor.revealRange(visibleRangesBeforeRevert[0]);
J
Joao Moreno 已提交
944 945
	}

J
Joao Moreno 已提交
946 947
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
948 949
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
950
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
951
			const resource = this.getSCMResource();
952 953 954 955 956 957 958 959

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

963
		if (!scmResources.length) {
J
Joao Moreno 已提交
964 965 966
			return;
		}

967
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
968
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
969 970
	}

J
Joao Moreno 已提交
971 972
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
973
		await repository.revert([]);
J
Joao Moreno 已提交
974
	}
J
Joao Moreno 已提交
975

J
Joao Moreno 已提交
976 977
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
978 979 980 981 982 983 984 985 986
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

987 988 989 990 991 992 993
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
994 995 996
			return;
		}

J
Joao Moreno 已提交
997
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
998
		const originalDocument = await workspace.openTextDocument(originalUri);
999 1000 1001 1002
		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 已提交
1003 1004 1005 1006 1007

		if (!selectedDiffs.length) {
			return;
		}

1008 1009
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
1010

J
Joao Moreno 已提交
1011
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
1012 1013
	}

J
Joao Moreno 已提交
1014 1015
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
1016 1017
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1018
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1019
			const resource = this.getSCMResource();
1020 1021 1022 1023 1024 1025 1026 1027

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
1031
		if (!scmResources.length) {
J
Joao Moreno 已提交
1032 1033
			return;
		}
J
Joao Moreno 已提交
1034

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

J
Joao Moreno 已提交
1039
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
1040
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
1041
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
1042 1043
				yes = localize('delete file', "Delete file");
			} else {
1044 1045 1046 1047 1048 1049
				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 已提交
1050 1051
			}
		} else {
1052 1053 1054 1055 1056 1057
			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 已提交
1058 1059 1060 1061 1062

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

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

J
Joao Moreno 已提交
1066 1067 1068 1069
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
1070
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1071
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
1072
	}
J
Joao Moreno 已提交
1073

J
Joao Moreno 已提交
1074 1075
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1076
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
1077 1078 1079 1080 1081

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

J
Joao Moreno 已提交
1082 1083
		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 已提交
1084

J
Joao Moreno 已提交
1085 1086 1087 1088 1089 1090
		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 已提交
1091
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1092
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
1093

J
Joao Moreno 已提交
1094
			if (pick !== yes) {
J
Joao Moreno 已提交
1095 1096 1097
				return;
			}

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

J
Joao 已提交
1109
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1110 1111 1112 1113
		} 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 已提交
1114

J
Joao Moreno 已提交
1115 1116 1117
			if (pick !== yes) {
				return;
			}
J
Joao Moreno 已提交
1118

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

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

J
Joao Moreno 已提交
1126 1127 1128 1129 1130
			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 已提交
1131

J
Joao Moreno 已提交
1132
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1133 1134 1135 1136 1137 1138 1139 1140
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
1141
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1142
		}
J
Joao Moreno 已提交
1143 1144
	}

J
Joao Moreno 已提交
1145
	private async smartCommit(
J
Joao Moreno 已提交
1146
		repository: Repository,
1147
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
1148 1149
		opts?: CommitOptions
	): Promise<boolean> {
1150
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
J
Joao Moreno 已提交
1151 1152 1153 1154 1155 1156 1157 1158
		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 已提交
1159 1160
					? 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 已提交
1161 1162 1163 1164 1165 1166 1167 1168 1169 1170
				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
				}
1171 1172 1173
			}
		}

1174
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
1175
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
1176 1177
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
1178 1179

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

J
Joao Moreno 已提交
1182 1183
			// 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?");
1184 1185 1186 1187 1188
			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 已提交
1189 1190 1191
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
1192 1193 1194
			}
		}

J
Joao Moreno 已提交
1195
		if (!opts) {
1196
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
1197 1198
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
1199 1200
		}

1201 1202 1203
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

1204 1205 1206 1207
		if (config.get<boolean>('alwaysSignOff')) {
			opts.signoff = true;
		}

J
Joao Moreno 已提交
1208
		if (
1209
			(
J
Joao Moreno 已提交
1210 1211 1212 1213 1214
				// no changes
				(noStagedChanges && noUnstagedChanges)
				// or no staged changes and not `all`
				|| (!opts.all && noStagedChanges)
			)
1215
			&& !opts.empty
J
Joao Moreno 已提交
1216
		) {
J
Joao Moreno 已提交
1217 1218 1219 1220
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1221
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1222 1223 1224 1225 1226

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
1227
		await repository.commit(message, opts);
J
Joao Moreno 已提交
1228

J
Joao Moreno 已提交
1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239
		const postCommitCommand = config.get<'none' | 'push' | 'sync'>('postCommitCommand');

		switch (postCommitCommand) {
			case 'push':
				await this._push(repository, { pushType: PushType.Push, silent: true });
				break;
			case 'sync':
				await this.sync(repository);
				break;
		}

J
Joao Moreno 已提交
1240 1241 1242
		return true;
	}

J
Joao Moreno 已提交
1243
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1244
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1245
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
1246 1247 1248 1249
			if (message) {
				return message;
			}

1250 1251 1252 1253 1254 1255
			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 已提交
1256
			return await window.showInputBox({
1257
				value,
J
Joao Moreno 已提交
1258
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
1259 1260
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
1261
			});
J
Joao Moreno 已提交
1262 1263
		};

J
Joao Moreno 已提交
1264
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1265 1266

		if (message && 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.commit', { repository: true })
J
Joao Moreno 已提交
1272 1273
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
1274 1275
	}

J
Joao Moreno 已提交
1276
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
1277
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1278
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
1279 1280 1281
			return;
		}

J
Joao Moreno 已提交
1282
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1283 1284

		if (didCommit) {
J
Joao Moreno 已提交
1285
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1286
		}
J
Joao Moreno 已提交
1287 1288
	}

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

J
Joao Moreno 已提交
1294
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
1295 1296
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
1297 1298
	}

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

J
Joao Moreno 已提交
1304
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
1305 1306
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
1307 1308
	}

J
Joao Moreno 已提交
1309
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1310 1311
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1312 1313
	}

J
Joao Moreno 已提交
1314
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
1315 1316
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
1317 1318
	}

J
Joao Moreno 已提交
1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340
	@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 已提交
1341 1342 1343 1344 1345
	@command('git.restoreCommitTemplate', { repository: true })
	async restoreCommitTemplate(repository: Repository): Promise<void> {
		repository.inputBox.value = await repository.getCommitTemplate();
	}

J
Joao Moreno 已提交
1346
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
1347 1348
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1349 1350

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

J
Joao Moreno 已提交
1355
		const commit = await repository.getCommit('HEAD');
J
Joao Moreno 已提交
1356 1357

		if (commit.parents.length > 0) {
1358 1359 1360 1361 1362
			await repository.reset('HEAD~');
		} else {
			await repository.deleteRef('HEAD');
			await this.unstageAll(repository);
		}
J
Joao Moreno 已提交
1363

J
Joao Moreno 已提交
1364
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1365 1366
	}

J
Joao Moreno 已提交
1367
	@command('git.checkout', { repository: true })
1368
	async checkout(repository: Repository, treeish: string): Promise<boolean> {
J
Joao Moreno 已提交
1369
		if (typeof treeish === 'string') {
1370 1371
			await repository.checkout(treeish);
			return true;
J
Joao Moreno 已提交
1372 1373
		}

J
Joao Moreno 已提交
1374
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1375
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
1376 1377 1378
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1379
		const createBranch = new CreateBranchItem(this);
J
Joao Moreno 已提交
1380

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

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

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

J
Joao Moreno 已提交
1390
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
1391
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
1392
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
1393 1394

		if (!choice) {
1395
			return false;
J
Joao Moreno 已提交
1396 1397
		}

J
Joao Moreno 已提交
1398
		await choice.run(repository);
1399
		return true;
J
Joao Moreno 已提交
1400 1401
	}

J
Joao Moreno 已提交
1402
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1403
	async branch(repository: Repository): Promise<void> {
1404
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1405 1406 1407 1408 1409 1410 1411 1412 1413 1414
		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;
			}

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

J
Joao Moreno 已提交
1418
		const result = await window.showInputBox({
J
Joao Moreno 已提交
1419
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
1420
			prompt: localize('provide branch name', "Please provide a branch name"),
1421 1422
			ignoreFocusOut: true,
			validateInput: (name: string) => {
J
Joao Moreno 已提交
1423
				if (validateName.test(sanitize(name))) {
1424 1425
					return null;
				}
J
Joao Moreno 已提交
1426 1427

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

J
Joao Moreno 已提交
1431 1432 1433
		const name = sanitize(result || '');

		if (!name) {
J
Joao Moreno 已提交
1434 1435
			return;
		}
J
Joao Moreno 已提交
1436

J
Joao Moreno 已提交
1437
		await repository.branch(name, true);
J
Joao Moreno 已提交
1438 1439
	}

J
Joao Moreno 已提交
1440
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1441
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1442 1443
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1444
			run = force => repository.deleteBranch(name, force);
1445
		} else {
J
Joao Moreno 已提交
1446 1447
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1448
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1449

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

M
Maik Riechert 已提交
1453
			if (!choice || !choice.branchName) {
1454 1455
				return;
			}
M
Maik Riechert 已提交
1456
			name = choice.branchName;
J
Joao Moreno 已提交
1457
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1458 1459
		}

1460 1461 1462 1463 1464 1465 1466 1467 1468
		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");
1469
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1470 1471 1472 1473 1474

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

1477 1478
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
J
Justin Horner 已提交
1479 1480 1481 1482 1483 1484 1485 1486
		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 {
1487
			await repository.renameBranch(name);
J
Justin Horner 已提交
1488 1489 1490
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1491 1492
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1493
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1494
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", name));
1495 1496 1497
					return;
				default:
					throw err;
J
Justin Horner 已提交
1498 1499 1500 1501
			}
		}
	}

J
Joao Moreno 已提交
1502
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1503
	async merge(repository: Repository): Promise<void> {
1504 1505 1506 1507
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1508
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1509 1510
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1511

J
Joao Moreno 已提交
1512
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1513 1514
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1515 1516

		const picks = [...heads, ...remoteHeads];
1517 1518
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1519 1520 1521 1522 1523

		if (!choice) {
			return;
		}

1524
		await choice.run(repository);
1525 1526
	}

J
Joao Moreno 已提交
1527
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1528
	async createTag(repository: Repository): Promise<void> {
1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540
		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 已提交
1541
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1542 1543 1544 1545 1546
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
1550 1551 1552 1553 1554 1555 1556
	@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 已提交
1557
		await repository.fetchDefault();
J
Joao Moreno 已提交
1558 1559
	}

J
Joao Moreno 已提交
1560 1561 1562 1563 1564 1565 1566 1567 1568 1569
	@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 已提交
1570
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1571 1572
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1573 1574 1575 1576 1577 1578

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

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

D
Dozed12 已提交
1583
		if (!remotePick) {
1584 1585 1586
			return;
		}

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

D
Dozed12 已提交
1593
		if (!branchPick) {
1594 1595 1596
			return;
		}

F
Francisco Moreira 已提交
1597 1598
		const remoteCharCnt = remotePick.label.length;

1599
		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1600 1601
	}

J
Joao Moreno 已提交
1602
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1603 1604
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1605 1606 1607 1608 1609 1610

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

J
Joao Moreno 已提交
1611
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1612 1613
	}

J
Joao Moreno 已提交
1614
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1615 1616
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1617 1618 1619 1620 1621 1622

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

J
Joao Moreno 已提交
1623
		await repository.pullWithRebase(repository.HEAD);
J
Joao Moreno 已提交
1624 1625
	}

J
Joao Moreno 已提交
1626
	private async _push(repository: Repository, pushOptions: PushOptions) {
J
Joao Moreno 已提交
1627
		const remotes = repository.remotes;
1628

J
Joao Moreno 已提交
1629
		if (remotes.length === 0) {
J
Joao Moreno 已提交
1630 1631 1632
			if (!pushOptions.silent) {
				window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
			}
J
Joao Moreno 已提交
1633 1634
			return;
		}
1635

J
Joao Moreno 已提交
1636 1637 1638 1639 1640 1641
		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."));
1642 1643
				return;
			}
J
Joao Moreno 已提交
1644

J
Joao Moreno 已提交
1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658
			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 已提交
1659 1660
		}

1661 1662 1663 1664 1665 1666 1667
		if (pushOptions.pushType === PushType.PushTags) {
			await repository.pushTags(undefined, forcePushMode);

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

1668
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1669 1670 1671
			if (!pushOptions.silent) {
				window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			}
1672 1673 1674
			return;
		}

1675 1676 1677 1678 1679 1680 1681
		if (pushOptions.pushType === PushType.Push) {
			try {
				await repository.push(repository.HEAD, forcePushMode);
			} catch (err) {
				if (err.gitErrorCode !== GitErrorCodes.NoUpstreamBranch) {
					throw err;
				}
1682

J
Joao Moreno 已提交
1683 1684 1685 1686
				if (pushOptions.silent) {
					return;
				}

1687 1688 1689 1690 1691 1692 1693 1694 1695 1696
				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 {
1697
			const branchName = repository.HEAD.name;
1698 1699 1700
			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 });
1701

1702 1703
			if (!pick) {
				return;
1704
			}
1705 1706

			await repository.pushTo(pick.label, branchName, undefined, forcePushMode);
1707
		}
J
Joao Moreno 已提交
1708 1709
	}

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

1715 1716
	@command('git.pushForce', { repository: true })
	async pushForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1717
		await this._push(repository, { pushType: PushType.Push, forcePush: true });
1718
	}
1719

1720 1721
	@command('git.pushWithTags', { repository: true })
	async pushWithTags(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1722
		await this._push(repository, { pushType: PushType.PushTags });
1723
	}
1724

1725 1726
	@command('git.pushWithTagsForce', { repository: true })
	async pushWithTagsForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1727
		await this._push(repository, { pushType: PushType.PushTags, forcePush: true });
1728 1729
	}

J
Joao Moreno 已提交
1730
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1731
	async pushTo(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1732
		await this._push(repository, { pushType: PushType.PushTo });
1733
	}
J
Joao Moreno 已提交
1734

1735 1736
	@command('git.pushToForce', { repository: true })
	async pushToForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1737
		await this._push(repository, { pushType: PushType.PushTo, forcePush: true });
J
Joao Moreno 已提交
1738 1739
	}

J
Joao Moreno 已提交
1740
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1741
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1742 1743 1744 1745 1746

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

J
Joao Moreno 已提交
1747 1748 1749 1750
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
1751
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1752
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
1753 1754

		if (shouldPrompt) {
J
Joao Moreno 已提交
1755
			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 已提交
1756
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
1757
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
1758 1759 1760 1761 1762 1763 1764 1765 1766
			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 已提交
1767
		if (rebase) {
J
Joao Moreno 已提交
1768
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
1769
		} else {
J
Joao Moreno 已提交
1770
			await repository.sync(HEAD);
J
Joao Moreno 已提交
1771 1772 1773 1774 1775 1776
		}
	}

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

J
Joao 已提交
1779 1780 1781 1782 1783 1784 1785 1786 1787
	@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 已提交
1788
			await repository.sync(HEAD);
J
Joao 已提交
1789 1790 1791
		}));
	}

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

J
Joao Moreno 已提交
1797
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1798 1799
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1800 1801 1802 1803 1804 1805

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

J
Joao Moreno 已提交
1806
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1807 1808 1809 1810 1811 1812
		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 已提交
1813 1814 1815 1816 1817

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1818
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1819 1820
	}

1821 1822
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
1823 1824
		resourceStates = resourceStates.filter(s => !!s);

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

1828
			if (!resource) {
J
Joao Moreno 已提交
1829 1830 1831
				return;
			}

1832
			resourceStates = [resource];
J
Joao Moreno 已提交
1833 1834
		}

1835
		const resources = resourceStates
J
Joao Moreno 已提交
1836 1837 1838
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1839
		if (!resources.length) {
N
NKumar2 已提交
1840 1841 1842
			return;
		}

1843
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
1844 1845
	}

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

1850
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
1851 1852 1853
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1854

1855
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
1856 1857 1858 1859 1860

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

J
Joao Moreno 已提交
1861
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
1862 1863
	}

1864 1865 1866 1867 1868 1869 1870
	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 已提交
1871 1872 1873 1874 1875 1876 1877 1878 1879 1880
	@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 已提交
1881
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1882
	async stashPop(repository: Repository): Promise<void> {
1883
		const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
J
Joao Moreno 已提交
1884
		const stash = await this.pickStash(repository, placeHolder);
1885

J
Joao Moreno 已提交
1886
		if (!stash) {
1887 1888 1889
			return;
		}

J
Joao Moreno 已提交
1890
		await repository.popStash(stash.index);
1891 1892 1893 1894
	}

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

J
Joao Moreno 已提交
1897 1898
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
1899 1900 1901
			return;
		}

1902 1903 1904 1905 1906 1907
		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 已提交
1908
		const stash = await this.pickStash(repository, placeHolder);
K
Krzysztof Cieślak 已提交
1909

J
Joao Moreno 已提交
1910
		if (!stash) {
K
Krzysztof Cieślak 已提交
1911 1912
			return;
		}
J
Joao Moreno 已提交
1913

J
Joao Moreno 已提交
1914
		await repository.applyStash(stash.index);
K
Krzysztof Cieślak 已提交
1915 1916
	}

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

J
Joao Moreno 已提交
1921 1922
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
1923 1924 1925 1926 1927 1928
			return;
		}

		await repository.applyStash();
	}

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

J
Joao Moreno 已提交
1932 1933
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
1934 1935 1936
			return;
		}

J
Joao Moreno 已提交
1937 1938 1939
		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 已提交
1940
	}
K
Krzysztof Cieślak 已提交
1941

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

J
Joao Moreno 已提交
1946
			if (!options.repository) {
J
Joao Moreno 已提交
1947 1948
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1949 1950
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1951 1952 1953 1954 1955 1956 1957 1958 1959
				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();
				}
1960

J
Joao Moreno 已提交
1961
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1962
					if (!repository) {
J
Joao 已提交
1963
						return Promise.resolve();
J
Joao Moreno 已提交
1964 1965
					}

J
Joao Moreno 已提交
1966
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1967
				});
J
Joao Moreno 已提交
1968 1969
			}

K
kieferrm 已提交
1970
			/* __GDPR__
K
kieferrm 已提交
1971 1972 1973 1974
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
1975 1976
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1977
			return result.catch(async err => {
J
Joao Moreno 已提交
1978
				const options: MessageOptions = {
1979
					modal: true
J
Joao Moreno 已提交
1980 1981
				};

J
Joao Moreno 已提交
1982
				let message: string;
1983
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
1984

J
Joao Moreno 已提交
1985 1986 1987 1988 1989
				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 已提交
1990
				switch (err.gitErrorCode) {
1991
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1992 1993
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1994
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
1995
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
1996
						break;
1997 1998 1999 2000 2001
					case GitErrorCodes.Conflict:
						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
						type = 'warning';
						options.modal = false;
						break;
J
Joao Moreno 已提交
2002 2003 2004 2005 2006
					case GitErrorCodes.StashConflict:
						message = localize('stash merge conflicts', "There were merge conflicts while applying the stash.");
						type = 'warning';
						options.modal = false;
						break;
2007 2008
					case GitErrorCodes.NoUserNameConfigured:
					case GitErrorCodes.NoUserEmailConfigured:
J
Joao Moreno 已提交
2009 2010
						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')));
2011
						break;
J
Joao Moreno 已提交
2012
					default:
2013 2014 2015
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
2016
							.split(/[\r\n]/)
J
João Moreno 已提交
2017
							.filter((line: string) => !!line)
2018 2019 2020 2021 2022
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
2023 2024 2025 2026 2027 2028 2029 2030 2031

						break;
				}

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

J
Joao Moreno 已提交
2032 2033 2034 2035 2036 2037 2038
				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 已提交
2039

J
Joao Moreno 已提交
2040 2041 2042
					if (resultFn) {
						resultFn();
					}
J
Joao Moreno 已提交
2043 2044 2045
				}
			});
		};
2046 2047

		// patch this object, so people can call methods directly
2048
		(this as any)[key] = result;
2049 2050

		return result;
J
Joao Moreno 已提交
2051 2052
	}

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

J
Joao Moreno 已提交
2056
		this.outputChannel.appendLine(`git.getSCMResource.uri ${uri && uri.toString()}`);
J
Joao Moreno 已提交
2057 2058 2059
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
2060

J
Joao Moreno 已提交
2061
		if (!uri) {
2062
			return undefined;
J
Joao Moreno 已提交
2063 2064 2065
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
2066 2067
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
2068 2069 2070 2071
		}

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

J
Joao Moreno 已提交
2074
			if (!repository) {
2075 2076
				return undefined;
			}
J
Joao Moreno 已提交
2077

J
Joao Moreno 已提交
2078 2079
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
2080
		}
2081
		return undefined;
J
Joao Moreno 已提交
2082 2083
	}

J
Joao Moreno 已提交
2084
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
2085 2086 2087 2088 2089 2090
	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) => {
2091
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
2092 2093 2094 2095 2096 2097

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

2098
			// Could it be a submodule?
2099
			if (pathEquals(resource.fsPath, repository.root)) {
2100 2101 2102
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
2103
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119

			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 已提交
2120 2121 2122
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
2123
}