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

'use strict';

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

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

J
Joao Moreno 已提交
24 25 26 27 28 29
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 已提交
30
	constructor(protected ref: Ref) { }
J
Joao Moreno 已提交
31

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

		if (!ref) {
			return;
		}

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

class CheckoutTagItem extends CheckoutItem {

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

class CheckoutRemoteHeadItem extends CheckoutItem {

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

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

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

M
Maik Riechert 已提交
65 66
class BranchDeleteItem implements QuickPickItem {

67 68 69
	private get shortCommit(): string { return (this.ref.commit || '').substr(0, 8); }
	get branchName(): string | undefined { return this.ref.name; }
	get label(): string { return this.branchName || ''; }
M
Maik Riechert 已提交
70 71
	get description(): string { return this.shortCommit; }

72
	constructor(private ref: Ref) { }
M
Maik Riechert 已提交
73

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

82 83 84 85 86 87
class MergeItem implements QuickPickItem {

	get label(): string { return this.ref.name || ''; }
	get description(): string { return this.ref.name || ''; }

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

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

J
Joao Moreno 已提交
94 95
class CreateBranchItem implements QuickPickItem {

J
Joao Moreno 已提交
96 97
	constructor(private cc: CommandCenter) { }

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

101 102
	get shouldAlwaysShow(): boolean { return true; }

J
Joao Moreno 已提交
103
	async run(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
104
		await this.cc.branch(repository);
J
Joao Moreno 已提交
105 106 107
	}
}

J
Joao Moreno 已提交
108
interface CommandOptions {
J
Joao Moreno 已提交
109
	repository?: boolean;
J
Joao Moreno 已提交
110 111 112
	diff?: boolean;
}

113 114 115 116
interface Command {
	commandId: string;
	key: string;
	method: Function;
J
Joao Moreno 已提交
117
	options: CommandOptions;
118 119 120
}

const Commands: Command[] = [];
J
Joao Moreno 已提交
121

J
Joao Moreno 已提交
122
function command(commandId: string, options: CommandOptions = {}): Function {
J
Joao Moreno 已提交
123
	return (target: any, key: string, descriptor: any) => {
J
Joao Moreno 已提交
124 125 126 127
		if (!(typeof descriptor.value === 'function')) {
			throw new Error('not supported');
		}

J
Joao Moreno 已提交
128
		Commands.push({ commandId, key, method: descriptor.value, options });
J
Joao Moreno 已提交
129 130
	};
}
J
Joao Moreno 已提交
131

J
Joao Moreno 已提交
132 133 134 135 136 137 138 139 140
const ImageMimetypes = [
	'image/png',
	'image/gif',
	'image/jpeg',
	'image/webp',
	'image/tiff',
	'image/bmp'
];

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
305
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
306
		}
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 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;
J
Joao Moreno 已提交
485

J
Joao Moreno 已提交
486 487 488 489 490 491 492 493
		if (workspace.workspaceFolders && workspace.workspaceFolders.length > 1) {
			const placeHolder = localize('init', "Pick workspace folder to initialize git repo in");
			const items = workspace.workspaceFolders.map(folder => ({ label: folder.name, description: folder.uri.fsPath, folder }));
			const item = await window.showQuickPick(items, { placeHolder, ignoreFocusOut: true });

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

J
Joao Moreno 已提交
495
			repositoryPath = item.folder.uri.fsPath;
J
Joao Moreno 已提交
496
		}
J
Joao Moreno 已提交
497

J
Joao Moreno 已提交
498
		if (!repositoryPath) {
J
Joao Moreno 已提交
499 500 501 502 503 504 505 506 507 508 509 510
			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 已提交
511

J
Joao Moreno 已提交
512
			if (!result || result.length === 0) {
J
Joao Moreno 已提交
513 514
				return;
			}
J
Joao Moreno 已提交
515 516 517 518 519 520 521 522 523 524 525 526

			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 已提交
527
			repositoryPath = uri.fsPath;
J
Joao Moreno 已提交
528 529
		}

J
Joao Moreno 已提交
530
		await this.git.init(repositoryPath);
I
Ivan Sučić 已提交
531 532

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

		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ć 已提交
542 543

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

J
Joao Moreno 已提交
546 547 548 549 550 551
		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ć 已提交
552
		}
J
Joao Moreno 已提交
553 554
	}

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

J
Joao Moreno 已提交
566
			if (!result || result.length === 0) {
567 568 569
				return;
			}

J
Joao Moreno 已提交
570
			path = result[0].fsPath;
571
		}
J
Joao Moreno 已提交
572 573

		await this.model.openRepository(path);
574 575
	}

J
Joao Moreno 已提交
576 577 578 579 580
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

585
		let uris: Uri[] | undefined;
586 587 588

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
589
				uris = [Uri.file(fromGitUri(arg).path)];
590
			} else if (arg.scheme === 'file') {
591
				uris = [arg];
592 593 594 595 596 597
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
598
				resource = this.getSCMResource();
599 600 601
			}

			if (resource) {
J
Joao Moreno 已提交
602 603 604 605
				const resources = ([resource, ...resourceStates] as Resource[])
					.filter(r => r.type !== Status.DELETED && r.type !== Status.INDEX_DELETED);

				uris = resources.map(r => r.resourceUri);
606
			}
J
Joao Moreno 已提交
607 608
		}

609
		if (!uris) {
J
Joao Moreno 已提交
610
			return;
J
Joao Moreno 已提交
611 612
		}

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

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

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

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

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

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
649
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
650
		} else {
651
			resource = this.getSCMResource();
D
Duroktar 已提交
652 653 654 655 656 657
		}

		if (!resource) {
			return;
		}

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

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

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

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

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

682 683 684
			if (arg instanceof Resource) {
				resource = arg;
			} else {
685
				resource = this.getSCMResource();
686 687 688 689 690
			}

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

693
		if (!resources) {
J
Joao Moreno 已提交
694
			return;
J
Joao Moreno 已提交
695
		}
J
Joao Moreno 已提交
696

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

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

707 708
		resourceStates = resourceStates.filter(s => !!s);

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

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

714 715 716 717 718 719 720
			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

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

729 730 731 732 733 734 735 736
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
737 738 739 740 741 742 743 744 745 746 747 748 749 750
		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 已提交
751
		const workingTree = selection.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
752
		const scmResources = [...workingTree, ...resolved, ...unresolved];
753

J
Joao Moreno 已提交
754
		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
755
		if (!scmResources.length) {
J
Joao Moreno 已提交
756 757
			return;
		}
J
Joao Moreno 已提交
758

759
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
760
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
761 762
	}

J
Joao Moreno 已提交
763 764
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
765
		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
766 767 768 769 770 771 772 773 774 775 776 777 778
		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;
		}
779 780 781

		if (unresolved.length > 0) {
			const message = unresolved.length > 1
J
Joao Moreno 已提交
782 783
				? 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));
784 785 786 787 788 789 790 791 792

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

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

J
Joao Moreno 已提交
793
		await repository.add([]);
J
Joao Moreno 已提交
794 795
	}

J
Joao Moreno 已提交
796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830
	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 已提交
831
	@command('git.stageChange')
J
Joao Moreno 已提交
832 833 834 835 836 837 838 839
	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 已提交
840 841
	}

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

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
851 852 853 854
		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 已提交
855

J
Joao Moreno 已提交
856
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
857 858 859
			return;
		}

J
Joao Moreno 已提交
860 861
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
862

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

J
Joao Moreno 已提交
867
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
868 869 870
			return;
		}

J
Joao Moreno 已提交
871
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
872
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
873
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
874

J
Joao Moreno 已提交
875
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
876
	}
J
Joao Moreno 已提交
877

J
Joao Moreno 已提交
878
	@command('git.revertChange')
J
Joao Moreno 已提交
879 880 881 882
	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 已提交
883 884 885
			return;
		}

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

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

		if (!textEditor) {
			return;
		}

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

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
905 906 907
			return;
		}

J
Joao Moreno 已提交
908 909
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
910

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

J
Joao Moreno 已提交
915
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
916 917 918
			return;
		}

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

J
Joao Moreno 已提交
925 926 927
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
928

J
Joao Moreno 已提交
929 930
		await modifiedDocument.save();

931 932
		textEditor.selections = selectionsBeforeRevert;
		textEditor.revealRange(visibleRangesBeforeRevert[0]);
J
Joao Moreno 已提交
933 934
	}

J
Joao Moreno 已提交
935 936
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
937 938
		resourceStates = resourceStates.filter(s => !!s);

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

952
		if (!scmResources.length) {
J
Joao Moreno 已提交
953 954 955
			return;
		}

956
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
957
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
958 959
	}

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

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

		if (!textEditor) {
			return;
		}

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

976 977 978 979 980 981 982
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
983 984 985
			return;
		}

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

		if (!selectedDiffs.length) {
			return;
		}

997 998
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
999

J
Joao Moreno 已提交
1000
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
1001 1002
	}

J
Joao Moreno 已提交
1003 1004
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
1005 1006
		resourceStates = resourceStates.filter(s => !!s);

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
1020
		if (!scmResources.length) {
J
Joao Moreno 已提交
1021 1022
			return;
		}
J
Joao Moreno 已提交
1023

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

J
Joao Moreno 已提交
1028
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
1029
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
1030
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
1031 1032
				yes = localize('delete file', "Delete file");
			} else {
1033 1034 1035 1036 1037 1038
				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 已提交
1039 1040
			}
		} else {
1041 1042 1043 1044 1045 1046
			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 已提交
1047 1048 1049 1050 1051

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

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

J
Joao Moreno 已提交
1055 1056 1057 1058
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
1059
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1060
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
1061
	}
J
Joao Moreno 已提交
1062

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

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

J
Joao Moreno 已提交
1071 1072
		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 已提交
1073

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

J
Joao Moreno 已提交
1083
			if (pick !== yes) {
J
Joao Moreno 已提交
1084 1085 1086
				return;
			}

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

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

J
Joao Moreno 已提交
1104 1105 1106
			if (pick !== yes) {
				return;
			}
J
Joao Moreno 已提交
1107

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

J
Joao Moreno 已提交
1110 1111 1112 1113
		} 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 已提交
1114

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

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

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

J
Joao 已提交
1130
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1131
		}
J
Joao Moreno 已提交
1132 1133
	}

J
Joao Moreno 已提交
1134
	private async smartCommit(
J
Joao Moreno 已提交
1135
		repository: Repository,
1136
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
1137 1138
		opts?: CommitOptions
	): Promise<boolean> {
1139
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
J
Joao Moreno 已提交
1140 1141 1142 1143 1144 1145 1146 1147
		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 已提交
1148 1149
					? 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 已提交
1150 1151 1152 1153 1154 1155 1156 1157 1158 1159
				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
				}
1160 1161 1162
			}
		}

1163
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
1164
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
1165 1166
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
1167 1168

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

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

J
Joao Moreno 已提交
1184
		if (!opts) {
1185
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
1186 1187
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
1188 1189
		}

1190 1191 1192
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

1193 1194 1195 1196
		if (config.get<boolean>('alwaysSignOff')) {
			opts.signoff = true;
		}

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

J
Joao Moreno 已提交
1210
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1211 1212 1213 1214 1215

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
1216
		await repository.commit(message, opts);
J
Joao Moreno 已提交
1217 1218 1219 1220

		return true;
	}

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

1228 1229 1230 1231 1232 1233
			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 已提交
1234
			return await window.showInputBox({
1235
				value,
J
Joao Moreno 已提交
1236
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
1237 1238
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
1239
			});
J
Joao Moreno 已提交
1240 1241
		};

J
Joao Moreno 已提交
1242
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1243 1244

		if (message && didCommit) {
J
Joao Moreno 已提交
1245
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1246
		}
J
Joao Moreno 已提交
1247 1248
	}

J
Joao Moreno 已提交
1249
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
1250 1251
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
1252 1253
	}

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

J
Joao Moreno 已提交
1260
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1261 1262

		if (didCommit) {
J
Joao Moreno 已提交
1263
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1264
		}
J
Joao Moreno 已提交
1265 1266
	}

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

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

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

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

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

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

J
Joao Moreno 已提交
1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318
	@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 已提交
1319 1320 1321 1322 1323
	@command('git.restoreCommitTemplate', { repository: true })
	async restoreCommitTemplate(repository: Repository): Promise<void> {
		repository.inputBox.value = await repository.getCommitTemplate();
	}

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

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

J
Joao Moreno 已提交
1333
		const commit = await repository.getCommit('HEAD');
J
Joao Moreno 已提交
1334 1335

		if (commit.parents.length > 0) {
1336 1337 1338 1339 1340
			await repository.reset('HEAD~');
		} else {
			await repository.deleteRef('HEAD');
			await this.unstageAll(repository);
		}
J
Joao Moreno 已提交
1341

J
Joao Moreno 已提交
1342
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1343 1344
	}

J
Joao Moreno 已提交
1345
	@command('git.checkout', { repository: true })
J
Joao Moreno 已提交
1346
	async checkout(repository: Repository, treeish: string): Promise<void> {
J
Joao Moreno 已提交
1347
		if (typeof treeish === 'string') {
J
Joao Moreno 已提交
1348
			return await repository.checkout(treeish);
J
Joao Moreno 已提交
1349 1350
		}

J
Joao Moreno 已提交
1351
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1352
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
1353 1354 1355
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1356
		const createBranch = new CreateBranchItem(this);
J
Joao Moreno 已提交
1357

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

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

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

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

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1375
		await choice.run(repository);
J
Joao Moreno 已提交
1376 1377
	}

1378

J
Joao Moreno 已提交
1379
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1380
	async branch(repository: Repository): Promise<void> {
1381
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1382 1383 1384 1385 1386 1387 1388 1389 1390 1391
		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;
			}

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

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

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

J
Joao Moreno 已提交
1408 1409 1410
		const name = sanitize(result || '');

		if (!name) {
J
Joao Moreno 已提交
1411 1412
			return;
		}
J
Joao Moreno 已提交
1413

J
Joao Moreno 已提交
1414
		await repository.branch(name, true);
J
Joao Moreno 已提交
1415 1416
	}

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

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

M
Maik Riechert 已提交
1430
			if (!choice || !choice.branchName) {
1431 1432
				return;
			}
M
Maik Riechert 已提交
1433
			name = choice.branchName;
J
Joao Moreno 已提交
1434
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1435 1436
		}

1437 1438 1439 1440 1441 1442 1443 1444 1445
		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");
1446
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1447 1448 1449 1450 1451

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

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

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

J
Joao Moreno 已提交
1485
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1486 1487
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1488

J
Joao Moreno 已提交
1489
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1490 1491
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1492 1493

		const picks = [...heads, ...remoteHeads];
1494 1495
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1496 1497 1498 1499 1500

		if (!choice) {
			return;
		}

1501
		await choice.run(repository);
1502 1503
	}

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

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

J
Joao Moreno 已提交
1527 1528 1529 1530 1531 1532 1533
	@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 已提交
1534
		await repository.fetchDefault();
J
Joao Moreno 已提交
1535 1536
	}

J
Joao Moreno 已提交
1537 1538 1539 1540 1541 1542 1543 1544 1545 1546
	@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 已提交
1547
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1548 1549
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1550 1551 1552 1553 1554 1555

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

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

D
Dozed12 已提交
1560
		if (!remotePick) {
1561 1562 1563
			return;
		}

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

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

F
Francisco Moreira 已提交
1574 1575
		const remoteCharCnt = remotePick.label.length;

1576
		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1577 1578
	}

J
Joao Moreno 已提交
1579
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1580 1581
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1582 1583 1584 1585 1586 1587

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

J
Joao Moreno 已提交
1588
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1589 1590
	}

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

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

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

J
Joao Moreno 已提交
1603
	private async _push(repository: Repository, pushOptions: PushOptions) {
J
Joao Moreno 已提交
1604
		const remotes = repository.remotes;
1605

J
Joao Moreno 已提交
1606 1607 1608 1609
		if (remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
			return;
		}
1610

J
Joao Moreno 已提交
1611 1612 1613 1614 1615 1616
		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."));
1617 1618
				return;
			}
J
Joao Moreno 已提交
1619

J
Joao Moreno 已提交
1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633
			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 已提交
1634 1635
		}

1636 1637 1638 1639 1640 1641 1642
		if (pushOptions.pushType === PushType.PushTags) {
			await repository.pushTags(undefined, forcePushMode);

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

1643 1644 1645 1646 1647
		if (!repository.HEAD || !repository.HEAD.name) {
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

1648 1649 1650 1651 1652 1653 1654
		if (pushOptions.pushType === PushType.Push) {
			try {
				await repository.push(repository.HEAD, forcePushMode);
			} catch (err) {
				if (err.gitErrorCode !== GitErrorCodes.NoUpstreamBranch) {
					throw err;
				}
1655

1656 1657 1658 1659 1660 1661 1662 1663 1664 1665
				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 {
1666
			const branchName = repository.HEAD.name;
1667 1668 1669
			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 });
1670

1671 1672
			if (!pick) {
				return;
1673
			}
1674 1675

			await repository.pushTo(pick.label, branchName, undefined, forcePushMode);
1676
		}
J
Joao Moreno 已提交
1677 1678
	}

1679 1680
	@command('git.push', { repository: true })
	async push(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1681
		await this._push(repository, { pushType: PushType.Push });
1682
	}
1683

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

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

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

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

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

J
Joao Moreno 已提交
1709
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1710
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1711 1712 1713 1714 1715

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

J
Joao Moreno 已提交
1716 1717 1718 1719
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
1720
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1721
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
1722 1723

		if (shouldPrompt) {
J
Joao Moreno 已提交
1724
			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 已提交
1725
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
1726
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
1727 1728 1729 1730 1731 1732 1733 1734 1735
			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 已提交
1736
		if (rebase) {
J
Joao Moreno 已提交
1737
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
1738
		} else {
J
Joao Moreno 已提交
1739
			await repository.sync(HEAD);
J
Joao Moreno 已提交
1740 1741 1742 1743 1744 1745
		}
	}

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

J
Joao 已提交
1748 1749 1750 1751 1752 1753 1754 1755 1756
	@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 已提交
1757
			await repository.sync(HEAD);
J
Joao 已提交
1758 1759 1760
		}));
	}

1761
	@command('git.syncRebase', { repository: true })
J
Joao Moreno 已提交
1762 1763
	syncRebase(repository: Repository): Promise<void> {
		return this._sync(repository, true);
J
Joao Moreno 已提交
1764 1765
	}

J
Joao Moreno 已提交
1766
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1767 1768
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1769 1770 1771 1772 1773 1774

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

J
Joao Moreno 已提交
1775
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1776 1777 1778 1779 1780 1781
		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 已提交
1782 1783 1784 1785 1786

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1787
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1788 1789
	}

1790 1791
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
1792 1793
		resourceStates = resourceStates.filter(s => !!s);

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

1797
			if (!resource) {
J
Joao Moreno 已提交
1798 1799 1800
				return;
			}

1801
			resourceStates = [resource];
J
Joao Moreno 已提交
1802 1803
		}

1804
		const resources = resourceStates
J
Joao Moreno 已提交
1805 1806 1807
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1808
		if (!resources.length) {
N
NKumar2 已提交
1809 1810 1811
			return;
		}

1812
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
1813 1814
	}

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

1819
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
1820 1821 1822
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1823

1824
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
1825 1826 1827 1828 1829

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

J
Joao Moreno 已提交
1830
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
1831 1832
	}

1833 1834 1835 1836 1837 1838 1839
	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 已提交
1840 1841 1842 1843 1844 1845 1846 1847 1848 1849
	@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 已提交
1850
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1851
	async stashPop(repository: Repository): Promise<void> {
1852
		const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
J
Joao Moreno 已提交
1853
		const stash = await this.pickStash(repository, placeHolder);
1854

J
Joao Moreno 已提交
1855
		if (!stash) {
1856 1857 1858
			return;
		}

J
Joao Moreno 已提交
1859
		await repository.popStash(stash.index);
1860 1861 1862 1863
	}

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

J
Joao Moreno 已提交
1866 1867
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
1868 1869 1870
			return;
		}

1871 1872 1873 1874 1875 1876
		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 已提交
1877
		const stash = await this.pickStash(repository, placeHolder);
K
Krzysztof Cieślak 已提交
1878

J
Joao Moreno 已提交
1879
		if (!stash) {
K
Krzysztof Cieślak 已提交
1880 1881
			return;
		}
J
Joao Moreno 已提交
1882

J
Joao Moreno 已提交
1883
		await repository.applyStash(stash.index);
K
Krzysztof Cieślak 已提交
1884 1885
	}

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

J
Joao Moreno 已提交
1890 1891
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
1892 1893 1894 1895 1896 1897
			return;
		}

		await repository.applyStash();
	}

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

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

J
Joao Moreno 已提交
1906 1907 1908
		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 已提交
1909
	}
K
Krzysztof Cieślak 已提交
1910

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

J
Joao Moreno 已提交
1915
			if (!options.repository) {
J
Joao Moreno 已提交
1916 1917
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1918 1919
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1920 1921 1922 1923 1924 1925 1926 1927 1928
				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();
				}
1929

J
Joao Moreno 已提交
1930
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1931
					if (!repository) {
J
Joao 已提交
1932
						return Promise.resolve();
J
Joao Moreno 已提交
1933 1934
					}

J
Joao Moreno 已提交
1935
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1936
				});
J
Joao Moreno 已提交
1937 1938
			}

K
kieferrm 已提交
1939
			/* __GDPR__
K
kieferrm 已提交
1940 1941 1942 1943
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
1944 1945
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1946
			return result.catch(async err => {
J
Joao Moreno 已提交
1947
				const options: MessageOptions = {
1948
					modal: true
J
Joao Moreno 已提交
1949 1950
				};

J
Joao Moreno 已提交
1951
				let message: string;
1952
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
1953

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

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1992 1993 1994 1995 1996 1997 1998 1999 2000

						break;
				}

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

J
Joao Moreno 已提交
2001 2002 2003 2004 2005 2006 2007
				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 已提交
2008

J
Joao Moreno 已提交
2009 2010 2011
					if (resultFn) {
						resultFn();
					}
J
Joao Moreno 已提交
2012 2013 2014
				}
			});
		};
2015 2016

		// patch this object, so people can call methods directly
2017
		(this as any)[key] = result;
2018 2019

		return result;
J
Joao Moreno 已提交
2020 2021
	}

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

J
Joao Moreno 已提交
2025
		this.outputChannel.appendLine(`git.getSCMResource.uri ${uri && uri.toString()}`);
J
Joao Moreno 已提交
2026 2027 2028
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
2029

J
Joao Moreno 已提交
2030
		if (!uri) {
2031
			return undefined;
J
Joao Moreno 已提交
2032 2033 2034
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
2035 2036
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
2037 2038 2039 2040
		}

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

J
Joao Moreno 已提交
2043
			if (!repository) {
2044 2045
				return undefined;
			}
J
Joao Moreno 已提交
2046

J
Joao Moreno 已提交
2047 2048
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
2049 2050 2051
		}
	}

J
Joao Moreno 已提交
2052
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
2053 2054 2055 2056 2057 2058
	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) => {
2059
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
2060 2061 2062 2063 2064 2065

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

2066
			// Could it be a submodule?
2067
			if (pathEquals(resource.fsPath, repository.root)) {
2068 2069 2070
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
2071
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087

			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 已提交
2088 2089 2090
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
2091
}