commands.ts 67.6 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 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
		let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
649
		const preview = !(arg instanceof Resource);
D
Duroktar 已提交
650 651 652 653

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

		if (!resource) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

			resourceStates = [resource];
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

		if (!textEditor) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

		if (!textEditor) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

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

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

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

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

		if (!textEditor) {
			return;
		}

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

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

		const { ref } = fromGitUri(modifiedUri);

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

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

		if (!selectedDiffs.length) {
			return;
		}

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

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

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

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

		if (!message) {
			return false;
		}

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

		return true;
	}

J
Joao Moreno 已提交
1231
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1232
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1233
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
1234 1235 1236 1237
			if (message) {
				return message;
			}

1238 1239 1240 1241 1242 1243
			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 已提交
1244
			return await window.showInputBox({
1245
				value,
J
Joao Moreno 已提交
1246
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
1247 1248
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
1249
			});
J
Joao Moreno 已提交
1250 1251
		};

J
Joao Moreno 已提交
1252
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1253 1254

		if (message && didCommit) {
J
Joao Moreno 已提交
1255
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1256
		}
J
Joao Moreno 已提交
1257 1258
	}

J
Joao Moreno 已提交
1259
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
1260 1261
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
1262 1263
	}

J
Joao Moreno 已提交
1264
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
1265
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1266
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
1267 1268 1269
			return;
		}

J
Joao Moreno 已提交
1270
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1271 1272

		if (didCommit) {
J
Joao Moreno 已提交
1273
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1274
		}
J
Joao Moreno 已提交
1275 1276
	}

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

J
Joao Moreno 已提交
1282
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
1283 1284
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
1285 1286
	}

J
Joao Moreno 已提交
1287
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
1288
	async commitStagedAmend(repository: Repository): Promise<void> {
1289
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
1290 1291
	}

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

J
Joao Moreno 已提交
1297
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1298 1299
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1300 1301
	}

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

J
Joao Moreno 已提交
1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328
	@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 已提交
1329 1330 1331 1332 1333
	@command('git.restoreCommitTemplate', { repository: true })
	async restoreCommitTemplate(repository: Repository): Promise<void> {
		repository.inputBox.value = await repository.getCommitTemplate();
	}

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

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

J
Joao Moreno 已提交
1343
		const commit = await repository.getCommit('HEAD');
J
Joao Moreno 已提交
1344 1345

		if (commit.parents.length > 0) {
1346 1347 1348 1349 1350
			await repository.reset('HEAD~');
		} else {
			await repository.deleteRef('HEAD');
			await this.unstageAll(repository);
		}
J
Joao Moreno 已提交
1351

J
Joao Moreno 已提交
1352
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1353 1354
	}

J
Joao Moreno 已提交
1355
	@command('git.checkout', { repository: true })
1356
	async checkout(repository: Repository, treeish: string): Promise<boolean> {
J
Joao Moreno 已提交
1357
		if (typeof treeish === 'string') {
1358 1359
			await repository.checkout(treeish);
			return true;
J
Joao Moreno 已提交
1360 1361
		}

J
Joao Moreno 已提交
1362
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1363
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
1364 1365 1366
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1367
		const createBranch = new CreateBranchItem(this);
J
Joao Moreno 已提交
1368

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

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

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

J
Joao Moreno 已提交
1378
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
1379
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
1380
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
1381 1382

		if (!choice) {
1383
			return false;
J
Joao Moreno 已提交
1384 1385
		}

J
Joao Moreno 已提交
1386
		await choice.run(repository);
1387
		return true;
J
Joao Moreno 已提交
1388 1389
	}

J
Joao Moreno 已提交
1390
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1391
	async branch(repository: Repository): Promise<void> {
1392
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1393 1394 1395 1396 1397 1398 1399 1400 1401 1402
		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;
			}

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

J
Joao Moreno 已提交
1406
		const result = await window.showInputBox({
J
Joao Moreno 已提交
1407
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
1408
			prompt: localize('provide branch name', "Please provide a branch name"),
1409 1410
			ignoreFocusOut: true,
			validateInput: (name: string) => {
J
Joao Moreno 已提交
1411
				if (validateName.test(sanitize(name))) {
1412 1413
					return null;
				}
J
Joao Moreno 已提交
1414 1415

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

J
Joao Moreno 已提交
1419 1420 1421
		const name = sanitize(result || '');

		if (!name) {
J
Joao Moreno 已提交
1422 1423
			return;
		}
J
Joao Moreno 已提交
1424

J
Joao Moreno 已提交
1425
		await repository.branch(name, true);
J
Joao Moreno 已提交
1426 1427
	}

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

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

M
Maik Riechert 已提交
1441
			if (!choice || !choice.branchName) {
1442 1443
				return;
			}
M
Maik Riechert 已提交
1444
			name = choice.branchName;
J
Joao Moreno 已提交
1445
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1446 1447
		}

1448 1449 1450 1451 1452 1453 1454 1455 1456
		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");
1457
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1458 1459 1460 1461 1462

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

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

J
Joao Moreno 已提交
1490
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1491
	async merge(repository: Repository): Promise<void> {
1492 1493 1494 1495
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1496
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1497 1498
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1499

J
Joao Moreno 已提交
1500
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1501 1502
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1503 1504

		const picks = [...heads, ...remoteHeads];
1505 1506
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1507 1508 1509 1510 1511

		if (!choice) {
			return;
		}

1512
		await choice.run(repository);
1513 1514
	}

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

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

J
Joao Moreno 已提交
1538 1539 1540 1541 1542 1543 1544
	@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 已提交
1545
		await repository.fetchDefault();
J
Joao Moreno 已提交
1546 1547
	}

J
Joao Moreno 已提交
1548 1549 1550 1551 1552 1553 1554 1555 1556 1557
	@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 已提交
1558
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1559 1560
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1561 1562 1563 1564 1565 1566

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

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

D
Dozed12 已提交
1571
		if (!remotePick) {
1572 1573 1574
			return;
		}

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

D
Dozed12 已提交
1581
		if (!branchPick) {
1582 1583 1584
			return;
		}

F
Francisco Moreira 已提交
1585 1586
		const remoteCharCnt = remotePick.label.length;

1587
		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1588 1589
	}

J
Joao Moreno 已提交
1590
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1591 1592
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1593 1594 1595 1596 1597 1598

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

J
Joao Moreno 已提交
1599
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1600 1601
	}

J
Joao Moreno 已提交
1602
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1603 1604
	async pullRebase(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.pullWithRebase(repository.HEAD);
J
Joao Moreno 已提交
1612 1613
	}

J
Joao Moreno 已提交
1614
	private async _push(repository: Repository, pushOptions: PushOptions) {
J
Joao Moreno 已提交
1615
		const remotes = repository.remotes;
1616

J
Joao Moreno 已提交
1617 1618 1619 1620
		if (remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
			return;
		}
1621

J
Joao Moreno 已提交
1622 1623 1624 1625 1626 1627
		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."));
1628 1629
				return;
			}
J
Joao Moreno 已提交
1630

J
Joao Moreno 已提交
1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644
			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 已提交
1645 1646
		}

1647 1648 1649 1650 1651 1652 1653
		if (pushOptions.pushType === PushType.PushTags) {
			await repository.pushTags(undefined, forcePushMode);

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

1654 1655 1656 1657 1658
		if (!repository.HEAD || !repository.HEAD.name) {
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

1659 1660 1661 1662 1663 1664 1665
		if (pushOptions.pushType === PushType.Push) {
			try {
				await repository.push(repository.HEAD, forcePushMode);
			} catch (err) {
				if (err.gitErrorCode !== GitErrorCodes.NoUpstreamBranch) {
					throw err;
				}
1666

1667 1668 1669 1670 1671 1672 1673 1674 1675 1676
				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 {
1677
			const branchName = repository.HEAD.name;
1678 1679 1680
			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 });
1681

1682 1683
			if (!pick) {
				return;
1684
			}
1685 1686

			await repository.pushTo(pick.label, branchName, undefined, forcePushMode);
1687
		}
J
Joao Moreno 已提交
1688 1689
	}

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

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

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

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

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

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

J
Joao Moreno 已提交
1720
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1721
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1722 1723 1724 1725 1726

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

J
Joao Moreno 已提交
1727 1728 1729 1730
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
1731
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1732
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
1733 1734

		if (shouldPrompt) {
J
Joao Moreno 已提交
1735
			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 已提交
1736
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
1737
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
1738 1739 1740 1741 1742 1743 1744 1745 1746
			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 已提交
1747
		if (rebase) {
J
Joao Moreno 已提交
1748
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
1749
		} else {
J
Joao Moreno 已提交
1750
			await repository.sync(HEAD);
J
Joao Moreno 已提交
1751 1752 1753 1754 1755 1756
		}
	}

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

J
Joao 已提交
1759 1760 1761 1762 1763 1764 1765 1766 1767
	@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 已提交
1768
			await repository.sync(HEAD);
J
Joao 已提交
1769 1770 1771
		}));
	}

1772
	@command('git.syncRebase', { repository: true })
J
Joao Moreno 已提交
1773 1774
	syncRebase(repository: Repository): Promise<void> {
		return this._sync(repository, true);
J
Joao Moreno 已提交
1775 1776
	}

J
Joao Moreno 已提交
1777
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1778 1779
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1780 1781 1782 1783 1784 1785

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

J
Joao Moreno 已提交
1786
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1787 1788 1789 1790 1791 1792
		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 已提交
1793 1794 1795 1796 1797

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1798
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1799 1800
	}

1801 1802
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
1803 1804
		resourceStates = resourceStates.filter(s => !!s);

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

1808
			if (!resource) {
J
Joao Moreno 已提交
1809 1810 1811
				return;
			}

1812
			resourceStates = [resource];
J
Joao Moreno 已提交
1813 1814
		}

1815
		const resources = resourceStates
J
Joao Moreno 已提交
1816 1817 1818
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1819
		if (!resources.length) {
N
NKumar2 已提交
1820 1821 1822
			return;
		}

1823
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
1824 1825
	}

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

1830
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
1831 1832 1833
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1834

1835
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
1836 1837 1838 1839 1840

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

J
Joao Moreno 已提交
1841
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
1842 1843
	}

1844 1845 1846 1847 1848 1849 1850
	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 已提交
1851 1852 1853 1854 1855 1856 1857 1858 1859 1860
	@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 已提交
1861
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1862
	async stashPop(repository: Repository): Promise<void> {
1863
		const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
J
Joao Moreno 已提交
1864
		const stash = await this.pickStash(repository, placeHolder);
1865

J
Joao Moreno 已提交
1866
		if (!stash) {
1867 1868 1869
			return;
		}

J
Joao Moreno 已提交
1870
		await repository.popStash(stash.index);
1871 1872 1873 1874
	}

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

J
Joao Moreno 已提交
1877 1878
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
1879 1880 1881
			return;
		}

1882 1883 1884 1885 1886 1887
		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 已提交
1888
		const stash = await this.pickStash(repository, placeHolder);
K
Krzysztof Cieślak 已提交
1889

J
Joao Moreno 已提交
1890
		if (!stash) {
K
Krzysztof Cieślak 已提交
1891 1892
			return;
		}
J
Joao Moreno 已提交
1893

J
Joao Moreno 已提交
1894
		await repository.applyStash(stash.index);
K
Krzysztof Cieślak 已提交
1895 1896
	}

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

J
Joao Moreno 已提交
1901 1902
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
1903 1904 1905 1906 1907 1908
			return;
		}

		await repository.applyStash();
	}

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

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

J
Joao Moreno 已提交
1917 1918 1919
		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 已提交
1920
	}
K
Krzysztof Cieślak 已提交
1921

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

J
Joao Moreno 已提交
1926
			if (!options.repository) {
J
Joao Moreno 已提交
1927 1928
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1929 1930
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1931 1932 1933 1934 1935 1936 1937 1938 1939
				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();
				}
1940

J
Joao Moreno 已提交
1941
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1942
					if (!repository) {
J
Joao 已提交
1943
						return Promise.resolve();
J
Joao Moreno 已提交
1944 1945
					}

J
Joao Moreno 已提交
1946
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1947
				});
J
Joao Moreno 已提交
1948 1949
			}

K
kieferrm 已提交
1950
			/* __GDPR__
K
kieferrm 已提交
1951 1952 1953 1954
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
1955 1956
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1957
			return result.catch(async err => {
J
Joao Moreno 已提交
1958
				const options: MessageOptions = {
1959
					modal: true
J
Joao Moreno 已提交
1960 1961
				};

J
Joao Moreno 已提交
1962
				let message: string;
1963
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
1964

J
Joao Moreno 已提交
1965 1966 1967 1968 1969
				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 已提交
1970
				switch (err.gitErrorCode) {
1971
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1972 1973
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1974
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
1975
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
1976
						break;
1977 1978 1979 1980 1981
					case GitErrorCodes.Conflict:
						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
						type = 'warning';
						options.modal = false;
						break;
J
Joao Moreno 已提交
1982 1983 1984 1985 1986
					case GitErrorCodes.StashConflict:
						message = localize('stash merge conflicts', "There were merge conflicts while applying the stash.");
						type = 'warning';
						options.modal = false;
						break;
1987 1988
					case GitErrorCodes.NoUserNameConfigured:
					case GitErrorCodes.NoUserEmailConfigured:
J
Joao Moreno 已提交
1989 1990
						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')));
1991
						break;
J
Joao Moreno 已提交
1992
					default:
1993 1994 1995
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1996
							.split(/[\r\n]/)
J
João Moreno 已提交
1997
							.filter((line: string) => !!line)
1998 1999 2000 2001 2002
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
2003 2004 2005 2006 2007 2008 2009 2010 2011

						break;
				}

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

J
Joao Moreno 已提交
2012 2013 2014 2015 2016 2017 2018
				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 已提交
2019

J
Joao Moreno 已提交
2020 2021 2022
					if (resultFn) {
						resultFn();
					}
J
Joao Moreno 已提交
2023 2024 2025
				}
			});
		};
2026 2027

		// patch this object, so people can call methods directly
2028
		(this as any)[key] = result;
2029 2030

		return result;
J
Joao Moreno 已提交
2031 2032
	}

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

J
Joao Moreno 已提交
2036
		this.outputChannel.appendLine(`git.getSCMResource.uri ${uri && uri.toString()}`);
J
Joao Moreno 已提交
2037 2038 2039
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
2040

J
Joao Moreno 已提交
2041
		if (!uri) {
2042
			return undefined;
J
Joao Moreno 已提交
2043 2044 2045
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
2046 2047
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
2048 2049 2050 2051
		}

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

J
Joao Moreno 已提交
2054
			if (!repository) {
2055 2056
				return undefined;
			}
J
Joao Moreno 已提交
2057

J
Joao Moreno 已提交
2058 2059
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
2060
		}
2061
		return undefined;
J
Joao Moreno 已提交
2062 2063
	}

J
Joao Moreno 已提交
2064
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
2065 2066 2067 2068 2069 2070
	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) => {
2071
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
2072 2073 2074 2075 2076 2077

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

2078
			// Could it be a submodule?
2079
			if (pathEquals(resource.fsPath, repository.root)) {
2080 2081 2082
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
2083
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099

			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 已提交
2100 2101 2102
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
2103
}