commands.ts 82.3 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.
 *--------------------------------------------------------------------------------------------*/

6
import { lstat, Stats } from 'fs';
J
Joao Moreno 已提交
7
import * as os from 'os';
8
import * as path from 'path';
9
import { commands, Disposable, LineChange, MessageOptions, OutputChannel, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env } from 'vscode';
J
Joao Moreno 已提交
10
import TelemetryReporter from 'vscode-extension-telemetry';
J
Joao Moreno 已提交
11
import * as nls from 'vscode-nls';
12 13
import { Branch, GitErrorCodes, Ref, RefType, Status, CommitOptions } from './api/git';
import { ForcePushMode, Git, Stash } from './git';
14 15 16
import { Model } from './model';
import { Repository, Resource, ResourceGroupType } from './repository';
import { applyLineChanges, getModifiedRange, intersectDiffWithRange, invertLineChange, toLineRanges } from './staging';
J
Joao Moreno 已提交
17
import { fromGitUri, toGitUri, isGitUri } from './uri';
18
import { grep, isDescendant, pathEquals } from './util';
J
Joao Moreno 已提交
19
import { Log, LogLevel } from './log';
20
import { GitTimelineItem } from './timelineProvider';
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
		if (!this.ref.name) {
J
Joao Moreno 已提交
58 59 60
			return;
		}

J
Joao Moreno 已提交
61 62 63 64
		const branches = await repository.findTrackingBranches(this.ref.name);

		if (branches.length > 0) {
			await repository.checkout(branches[0].name!);
65
		} else {
J
Joao Moreno 已提交
66
			await repository.checkoutTracking(this.ref.name);
67
		}
J
Joao Moreno 已提交
68 69 70
	}
}

M
Maik Riechert 已提交
71 72
class BranchDeleteItem implements QuickPickItem {

73 74 75
	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 已提交
76 77
	get description(): string { return this.shortCommit; }

78
	constructor(private ref: Ref) { }
M
Maik Riechert 已提交
79

J
Joao Moreno 已提交
80
	async run(repository: Repository, force?: boolean): Promise<void> {
81
		if (!this.branchName) {
M
Maik Riechert 已提交
82 83
			return;
		}
J
Joao Moreno 已提交
84
		await repository.deleteBranch(this.branchName, force);
M
Maik Riechert 已提交
85 86 87
	}
}

88 89 90 91 92 93
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 已提交
94

J
Joao Moreno 已提交
95 96
	async run(repository: Repository): Promise<void> {
		await repository.merge(this.ref.name! || this.ref.commit!);
J
Joao Moreno 已提交
97
	}
98 99
}

J
Joao Moreno 已提交
100 101
class CreateBranchItem implements QuickPickItem {

J
Joao Moreno 已提交
102 103
	constructor(private cc: CommandCenter) { }

D
Daniel Imms 已提交
104
	get label(): string { return '$(plus) ' + localize('create branch', 'Create new branch...'); }
J
Joao Moreno 已提交
105 106
	get description(): string { return ''; }

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

J
Joao Moreno 已提交
109
	async run(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
110
		await this.cc.branch(repository);
J
Joao Moreno 已提交
111 112 113
	}
}

J
Joao Moreno 已提交
114 115 116 117
class CreateBranchFromItem implements QuickPickItem {

	constructor(private cc: CommandCenter) { }

D
Daniel Imms 已提交
118
	get label(): string { return '$(plus) ' + localize('create branch from', 'Create new branch from...'); }
J
Joao Moreno 已提交
119 120 121 122 123 124 125 126 127
	get description(): string { return ''; }

	get alwaysShow(): boolean { return true; }

	async run(repository: Repository): Promise<void> {
		await this.cc.branch(repository);
	}
}

J
Joao Moreno 已提交
128 129 130 131 132 133 134 135 136
class HEADItem implements QuickPickItem {

	constructor(private repository: Repository) { }

	get label(): string { return 'HEAD'; }
	get description(): string { return (this.repository.HEAD && this.repository.HEAD.commit || '').substr(0, 8); }
	get alwaysShow(): boolean { return true; }
}

137 138 139 140
class AddRemoteItem implements QuickPickItem {

	constructor(private cc: CommandCenter) { }

D
Daniel Imms 已提交
141
	get label(): string { return '$(plus) ' + localize('add remote', 'Add a new remote...'); }
142 143 144 145 146 147 148 149 150
	get description(): string { return ''; }

	get alwaysShow(): boolean { return true; }

	async run(repository: Repository): Promise<void> {
		await this.cc.addRemote(repository);
	}
}

J
Joao Moreno 已提交
151
interface CommandOptions {
J
Joao Moreno 已提交
152
	repository?: boolean;
J
Joao Moreno 已提交
153 154 155
	diff?: boolean;
}

156 157 158 159
interface Command {
	commandId: string;
	key: string;
	method: Function;
J
Joao Moreno 已提交
160
	options: CommandOptions;
161 162 163
}

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

J
Joao Moreno 已提交
165
function command(commandId: string, options: CommandOptions = {}): Function {
166
	return (_target: any, key: string, descriptor: any) => {
J
Joao Moreno 已提交
167 168 169 170
		if (!(typeof descriptor.value === 'function')) {
			throw new Error('not supported');
		}

J
Joao Moreno 已提交
171
		Commands.push({ commandId, key, method: descriptor.value, options });
J
Joao Moreno 已提交
172 173
	};
}
J
Joao Moreno 已提交
174

J
Joao Moreno 已提交
175 176 177 178 179 180 181 182
// const ImageMimetypes = [
// 	'image/png',
// 	'image/gif',
// 	'image/jpeg',
// 	'image/webp',
// 	'image/tiff',
// 	'image/bmp'
// ];
J
Joao Moreno 已提交
183

J
Joao Moreno 已提交
184
async function categorizeResourceByResolution(resources: Resource[]): Promise<{ merge: Resource[], resolved: Resource[], unresolved: Resource[], deletionConflicts: Resource[] }> {
185 186 187
	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 已提交
188
	const isAnyDeleted = (s: Resource) => s.type === Status.DELETED_BY_THEM || s.type === Status.DELETED_BY_US;
189 190 191
	const possibleUnresolved = merge.filter(isBothAddedOrModified);
	const promises = possibleUnresolved.map(s => grep(s.resourceUri.fsPath, /^<{7}|^={7}|^>{7}/));
	const unresolvedBothModified = await Promise.all<boolean>(promises);
192
	const resolved = possibleUnresolved.filter((_s, i) => !unresolvedBothModified[i]);
J
Joao Moreno 已提交
193
	const deletionConflicts = merge.filter(s => isAnyDeleted(s));
194
	const unresolved = [
J
Joao Moreno 已提交
195
		...merge.filter(s => !isBothAddedOrModified(s) && !isAnyDeleted(s)),
196
		...possibleUnresolved.filter((_s, i) => unresolvedBothModified[i])
197 198
	];

J
Joao Moreno 已提交
199
	return { merge, resolved, unresolved, deletionConflicts };
200 201
}

J
Joao Moreno 已提交
202
function createCheckoutItems(repository: Repository): CheckoutItem[] {
203 204 205 206 207 208 209 210 211 212 213 214 215 216 217
	const config = workspace.getConfiguration('git');
	const checkoutType = config.get<string>('checkoutType') || 'all';
	const includeTags = checkoutType === 'all' || checkoutType === 'tags';
	const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

	const heads = repository.refs.filter(ref => ref.type === RefType.Head)
		.map(ref => new CheckoutItem(ref));
	const tags = (includeTags ? repository.refs.filter(ref => ref.type === RefType.Tag) : [])
		.map(ref => new CheckoutTagItem(ref));
	const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
		.map(ref => new CheckoutRemoteHeadItem(ref));

	return [...heads, ...tags, ...remoteHeads];
}

J
Joao Moreno 已提交
218 219 220 221
class TagItem implements QuickPickItem {
	get label(): string { return this.ref.name ?? ''; }
	get description(): string { return this.ref.commit?.substr(0, 8) ?? ''; }
	constructor(readonly ref: Ref) { }
222 223
}

224 225 226
enum PushType {
	Push,
	PushTo,
227
	PushFollowTags,
228 229 230 231 232
}

interface PushOptions {
	pushType: PushType;
	forcePush?: boolean;
J
Joao Moreno 已提交
233
	silent?: boolean;
234 235
}

J
Joao Moreno 已提交
236
export class CommandCenter {
J
Joao Moreno 已提交
237 238

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

J
Joao Moreno 已提交
240
	constructor(
J
Joao Moreno 已提交
241
		private git: Git,
J
Joao Moreno 已提交
242
		private model: Model,
J
Joao Moreno 已提交
243 244
		private outputChannel: OutputChannel,
		private telemetryReporter: TelemetryReporter
J
Joao Moreno 已提交
245
	) {
J
Joao Moreno 已提交
246 247
		this.disposables = Commands.map(({ commandId, key, method, options }) => {
			const command = this.createCommand(commandId, key, method, options);
248

J
Joao Moreno 已提交
249
			if (options.diff) {
J
Joao Moreno 已提交
250 251 252 253 254
				return commands.registerDiffInformationCommand(commandId, command);
			} else {
				return commands.registerCommand(commandId, command);
			}
		});
J
Joao Moreno 已提交
255 256
	}

J
Joao Moreno 已提交
257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286
	@command('git.setLogLevel')
	async setLogLevel(): Promise<void> {
		const createItem = (logLevel: LogLevel) => ({
			label: LogLevel[logLevel],
			logLevel,
			description: Log.logLevel === logLevel ? localize('current', "Current") : undefined
		});

		const items = [
			createItem(LogLevel.Trace),
			createItem(LogLevel.Debug),
			createItem(LogLevel.Info),
			createItem(LogLevel.Warning),
			createItem(LogLevel.Error),
			createItem(LogLevel.Critical),
			createItem(LogLevel.Off)
		];

		const choice = await window.showQuickPick(items, {
			placeHolder: localize('select log level', "Select log level")
		});

		if (!choice) {
			return;
		}

		Log.logLevel = choice.logLevel;
		this.outputChannel.appendLine(localize('changed', "Log level changed to: {0}", LogLevel[Log.logLevel]));
	}

J
Joao Moreno 已提交
287 288
	@command('git.refresh', { repository: true })
	async refresh(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
289
		await repository.status();
J
Joao Moreno 已提交
290
	}
J
Joao Moreno 已提交
291

J
Joao Moreno 已提交
292 293
	@command('git.openResource')
	async openResource(resource: Resource): Promise<void> {
J
Joao Moreno 已提交
294 295 296 297 298 299 300 301 302 303 304 305 306 307
		const repository = this.model.getRepository(resource.resourceUri);

		if (!repository) {
			return;
		}

		const config = workspace.getConfiguration('git', Uri.file(repository.root));
		const openDiffOnClick = config.get<boolean>('openDiffOnClick');

		if (openDiffOnClick) {
			await this._openResource(resource, undefined, true, false);
		} else {
			await this.openFile(resource);
		}
J
Joao Moreno 已提交
308 309
	}

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

313 314 315 316
		try {
			stat = await new Promise<Stats>((c, e) => lstat(resource.resourceUri.fsPath, (err, stat) => err ? e(err) : c(stat)));
		} catch (err) {
			// noop
317
		}
318

319 320 321 322
		let left: Uri | undefined;
		let right: Uri | undefined;

		if (stat && stat.isDirectory()) {
323 324 325 326
			const repository = this.model.getRepositoryForSubmodule(resource.resourceUri);

			if (repository) {
				right = toGitUri(resource.resourceUri, resource.resourceGroupType === ResourceGroupType.Index ? 'index' : 'wt', { submoduleOf: repository.root });
327 328
			}
		} else {
J
Joao Moreno 已提交
329
			if (resource.type !== Status.DELETED_BY_THEM) {
J
Joao Moreno 已提交
330
				left = this.getLeftResource(resource);
J
Joao Moreno 已提交
331 332
			}

J
Joao Moreno 已提交
333
			right = this.getRightResource(resource);
334
		}
335

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

J
Joao Moreno 已提交
338 339 340 341 342
		if (!right) {
			// TODO
			console.error('oh no');
			return;
		}
J
Joao Moreno 已提交
343

J
Joao Moreno 已提交
344
		const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
345 346
			preserveFocus,
			preview,
347
			viewColumn: ViewColumn.Active
J
Joao Moreno 已提交
348 349
		};

J
Joao Moreno 已提交
350 351
		const activeTextEditor = window.activeTextEditor;

352 353 354
		// 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 已提交
355 356 357
			opts.selection = activeTextEditor.selection;
		}

358
		if (!left) {
J
Joao Moreno 已提交
359
			await commands.executeCommand<void>('vscode.open', right, opts, title);
J
Joao Moreno 已提交
360 361 362 363
		} else {
			await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
		}
	}
J
Joao Moreno 已提交
364

J
Joao Moreno 已提交
365
	private getLeftResource(resource: Resource): Uri | undefined {
J
Joao Moreno 已提交
366 367 368
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
D
Darrien Singleton 已提交
369
			case Status.INDEX_ADDED:
J
Joao Moreno 已提交
370
				return toGitUri(resource.original, 'HEAD');
J
Joao Moreno 已提交
371 372

			case Status.MODIFIED:
373
			case Status.UNTRACKED:
J
Joao Moreno 已提交
374
				return toGitUri(resource.resourceUri, '~');
375 376

			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
377
				return toGitUri(resource.resourceUri, '');
J
Joao Moreno 已提交
378
		}
379
		return undefined;
J
Joao Moreno 已提交
380
	}
J
Joao Moreno 已提交
381

J
Joao Moreno 已提交
382
	private getRightResource(resource: Resource): Uri | undefined {
J
Joao Moreno 已提交
383 384 385 386 387
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_ADDED:
			case Status.INDEX_COPIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
388
				return toGitUri(resource.resourceUri, '');
J
Joao Moreno 已提交
389 390 391

			case Status.INDEX_DELETED:
			case Status.DELETED:
J
Joao Moreno 已提交
392
				return toGitUri(resource.resourceUri, 'HEAD');
J
Joao Moreno 已提交
393

J
Joao Moreno 已提交
394
			case Status.DELETED_BY_US:
J
Joao Moreno 已提交
395
				return toGitUri(resource.resourceUri, '~3');
J
Joao Moreno 已提交
396 397

			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
398
				return toGitUri(resource.resourceUri, '~2');
J
Joao Moreno 已提交
399

J
Joao Moreno 已提交
400 401 402
			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
403
			case Status.INTENT_TO_ADD:
J
Joao Moreno 已提交
404 405 406 407 408 409
				const repository = this.model.getRepository(resource.resourceUri);

				if (!repository) {
					return;
				}

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

J
Joao Moreno 已提交
413 414
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
415 416
				}

J
Joao Moreno 已提交
417
				return resource.resourceUri;
J
Joao Moreno 已提交
418

419
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
420
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
421
				return resource.resourceUri;
J
Joao Moreno 已提交
422
		}
423
		return undefined;
J
Joao Moreno 已提交
424 425 426
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
427
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
428 429 430 431

		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
D
Darrien Singleton 已提交
432
			case Status.INDEX_ADDED:
E
Eric Amodio 已提交
433
				return localize('git.title.index', '{0} (Index)', basename);
J
Joao Moreno 已提交
434 435

			case Status.MODIFIED:
M
Marc Kassay 已提交
436 437
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
E
Eric Amodio 已提交
438
				return localize('git.title.workingTree', '{0} (Working Tree)', basename);
J
Joao Moreno 已提交
439 440

			case Status.DELETED_BY_US:
E
Eric Amodio 已提交
441
				return localize('git.title.theirs', '{0} (Theirs)', basename);
J
Joao Moreno 已提交
442 443

			case Status.DELETED_BY_THEM:
E
Eric Amodio 已提交
444
				return localize('git.title.ours', '{0} (Ours)', basename);
D
Darrien Singleton 已提交
445 446

			case Status.UNTRACKED:
E
Eric Amodio 已提交
447
				return localize('git.title.untracked', '{0} (Untracked)', basename);
D
Darrien Singleton 已提交
448

E
Eric Amodio 已提交
449 450
			default:
				return '';
J
Joao Moreno 已提交
451 452 453
		}
	}

J
Joao Moreno 已提交
454
	@command('git.clone')
455
	async clone(url?: string, parentPath?: string): Promise<void> {
456 457 458 459 460 461
		if (!url) {
			url = await window.showInputBox({
				prompt: localize('repourl', "Repository URL"),
				ignoreFocusOut: true
			});
		}
J
Joao Moreno 已提交
462 463

		if (!url) {
K
kieferrm 已提交
464
			/* __GDPR__
K
kieferrm 已提交
465 466 467 468
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
469 470
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
471 472
		}

473
		url = url.trim().replace(/^git\s+clone\s+/, '');
H
Howard Hung 已提交
474

475 476 477 478 479 480 481 482 483 484 485 486
		if (!parentPath) {
			const config = workspace.getConfiguration('git');
			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 已提交
487

488 489 490 491 492 493 494 495 496
			if (!uris || uris.length === 0) {
				/* __GDPR__
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
				return;
			}
J
Joao Moreno 已提交
497

498 499
			const uri = uris[0];
			parentPath = uri.fsPath;
J
Joao Moreno 已提交
500 501
		}

502
		try {
503 504 505 506 507
			const opts = {
				location: ProgressLocation.Notification,
				title: localize('cloning', "Cloning git repository '{0}'...", url),
				cancellable: true
			};
M
Maryam Archie 已提交
508

509 510
			const repositoryPath = await window.withProgress(
				opts,
511
				(progress, token) => this.git.clone(url!, parentPath!, progress, token)
512
			);
513

J
Joao Moreno 已提交
514 515 516 517
			let message = localize('proposeopen', "Would you like to open the cloned repository?");
			const open = localize('openrepo', "Open");
			const openNewWindow = localize('openreponew', "Open in New Window");
			const choices = [open, openNewWindow];
518 519 520

			const addToWorkspace = localize('add', "Add to Workspace");
			if (workspace.workspaceFolders) {
J
Joao Moreno 已提交
521
				message = localize('proposeopen2', "Would you like to open the cloned repository, or add it to the current workspace?");
522 523 524 525
				choices.push(addToWorkspace);
			}

			const result = await window.showInformationMessage(message, ...choices);
526 527

			const openFolder = result === open;
K
kieferrm 已提交
528
			/* __GDPR__
K
kieferrm 已提交
529 530 531 532 533
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
					"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
				}
			*/
534
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
535 536 537

			const uri = Uri.file(repositoryPath);

538
			if (openFolder) {
539 540 541
				commands.executeCommand('vscode.openFolder', uri);
			} else if (result === addToWorkspace) {
				workspace.updateWorkspaceFolders(workspace.workspaceFolders!.length, 0, { uri });
542 543
			} else if (result === openNewWindow) {
				commands.executeCommand('vscode.openFolder', uri, true);
544
			}
545 546
		} catch (err) {
			if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
K
kieferrm 已提交
547
				/* __GDPR__
K
kieferrm 已提交
548 549 550 551
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
552
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'directory_not_empty' });
J
Joao Moreno 已提交
553 554
			} else if (/Cancelled/i.test(err && (err.message || err.stderr || ''))) {
				return;
555
			} else {
K
kieferrm 已提交
556
				/* __GDPR__
K
kieferrm 已提交
557 558 559 560
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
561
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'error' });
562
			}
J
Joao Moreno 已提交
563

564
			throw err;
J
Joao Moreno 已提交
565 566 567
		}
	}

J
Joao Moreno 已提交
568
	@command('git.init')
J
Joao Moreno 已提交
569
	async init(skipFolderPrompt = false): Promise<void> {
J
Joao Moreno 已提交
570
		let repositoryPath: string | undefined = undefined;
J
Joao Moreno 已提交
571
		let askToOpen = true;
J
Joao Moreno 已提交
572

J
Joao Moreno 已提交
573
		if (workspace.workspaceFolders) {
J
Joao Moreno 已提交
574 575
			if (skipFolderPrompt && workspace.workspaceFolders.length === 1) {
				repositoryPath = workspace.workspaceFolders[0].uri.fsPath;
J
Joao Moreno 已提交
576
				askToOpen = false;
J
Joao Moreno 已提交
577 578 579 580 581 582 583 584 585 586 587 588 589 590 591
			} else {
				const placeHolder = localize('init', "Pick workspace folder to initialize git repo in");
				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
				];
				const item = await window.showQuickPick(items, { placeHolder, ignoreFocusOut: true });

				if (!item) {
					return;
				} else if (item.folder) {
					repositoryPath = item.folder.uri.fsPath;
					askToOpen = false;
				}
J
Joao Moreno 已提交
592 593
			}
		}
J
Joao Moreno 已提交
594

J
Joao Moreno 已提交
595
		if (!repositoryPath) {
J
Joao Moreno 已提交
596 597 598 599 600 601 602 603 604 605 606 607
			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 已提交
608

J
Joao Moreno 已提交
609
			if (!result || result.length === 0) {
J
Joao Moreno 已提交
610 611
				return;
			}
J
Joao Moreno 已提交
612 613 614 615 616 617 618 619 620 621 622 623

			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 已提交
624
			repositoryPath = uri.fsPath;
J
Joao Moreno 已提交
625 626 627 628

			if (workspace.workspaceFolders && workspace.workspaceFolders.some(w => w.uri.toString() === uri.toString())) {
				askToOpen = false;
			}
J
Joao Moreno 已提交
629 630
		}

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

J
Joao Moreno 已提交
633 634 635 636
		let message = localize('proposeopen init', "Would you like to open the initialized repository?");
		const open = localize('openrepo', "Open");
		const openNewWindow = localize('openreponew', "Open in New Window");
		const choices = [open, openNewWindow];
J
Joao Moreno 已提交
637

J
Joao Moreno 已提交
638 639 640 641
		if (!askToOpen) {
			return;
		}

J
Joao Moreno 已提交
642 643
		const addToWorkspace = localize('add', "Add to Workspace");
		if (workspace.workspaceFolders) {
J
Joao Moreno 已提交
644
			message = localize('proposeopen2 init', "Would you like to open the initialized repository, or add it to the current workspace?");
J
Joao Moreno 已提交
645 646
			choices.push(addToWorkspace);
		}
I
Ivan Sučić 已提交
647 648

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

J
Joao Moreno 已提交
651 652 653 654
		if (result === open) {
			commands.executeCommand('vscode.openFolder', uri);
		} else if (result === addToWorkspace) {
			workspace.updateWorkspaceFolders(workspace.workspaceFolders!.length, 0, { uri });
655 656
		} else if (result === openNewWindow) {
			commands.executeCommand('vscode.openFolder', uri, true);
J
Joao Moreno 已提交
657 658
		} else {
			await this.model.openRepository(repositoryPath);
I
Ivan Sučić 已提交
659
		}
J
Joao Moreno 已提交
660 661
	}

J
Joao Moreno 已提交
662 663
	@command('git.openRepository', { repository: false })
	async openRepository(path?: string): Promise<void> {
664
		if (!path) {
J
Joao Moreno 已提交
665 666 667 668 669 670
			const result = await window.showOpenDialog({
				canSelectFiles: false,
				canSelectFolders: true,
				canSelectMany: false,
				defaultUri: Uri.file(os.homedir()),
				openLabel: localize('open repo', "Open Repository")
671 672
			});

J
Joao Moreno 已提交
673
			if (!result || result.length === 0) {
674 675 676
				return;
			}

J
Joao Moreno 已提交
677
			path = result[0].fsPath;
678
		}
J
Joao Moreno 已提交
679 680

		await this.model.openRepository(path);
681 682
	}

J
Joao Moreno 已提交
683 684 685 686 687
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

692
		let uris: Uri[] | undefined;
693 694

		if (arg instanceof Uri) {
J
Joao Moreno 已提交
695
			if (isGitUri(arg)) {
696
				uris = [Uri.file(fromGitUri(arg).path)];
697
			} else if (arg.scheme === 'file') {
698
				uris = [arg];
699 700 701 702 703 704
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
705
				resource = this.getSCMResource();
706 707 708
			}

			if (resource) {
J
Joao Moreno 已提交
709 710 711 712 713
				uris = ([resource, ...resourceStates] as Resource[])
					.filter(r => r.type !== Status.DELETED && r.type !== Status.INDEX_DELETED)
					.map(r => r.resourceUri);
			} else if (window.activeTextEditor) {
				uris = [window.activeTextEditor.document.uri];
714
			}
J
Joao Moreno 已提交
715 716
		}

717
		if (!uris) {
J
Joao Moreno 已提交
718
			return;
J
Joao Moreno 已提交
719 720
		}

721
		const activeTextEditor = window.activeTextEditor;
J
Joao Moreno 已提交
722

723 724
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
725
				preserveFocus,
J
Joao Moreno 已提交
726
				preview: false,
727
				viewColumn: ViewColumn.Active
728 729
			};

M
Micah Smith 已提交
730 731 732 733 734 735 736
			let document;
			try {
				document = await workspace.openTextDocument(uri);
			} catch (error) {
				await commands.executeCommand<void>('vscode.open', uri, opts);
				continue;
			}
E
Eric Gang 已提交
737

738 739 740
			// 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 已提交
741
				// preserve not only selection but also visible range
B
Benjamin Pasero 已提交
742
				opts.selection = activeTextEditor.selection;
E
Eric Gang 已提交
743 744 745 746 747
				const previousVisibleRanges = activeTextEditor.visibleRanges;
				const editor = await window.showTextDocument(document, opts);
				editor.revealRange(previousVisibleRanges[0]);
			} else {
				await window.showTextDocument(document, opts);
B
Benjamin Pasero 已提交
748
			}
J
Joao Moreno 已提交
749
		}
J
Joao Moreno 已提交
750 751
	}

J
Joao Moreno 已提交
752 753 754 755 756
	@command('git.openFile2')
	async openFile2(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
		this.openFile(arg, ...resourceStates);
	}

J
Joao Moreno 已提交
757 758
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
759
		let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
760
		const preview = !(arg instanceof Resource);
D
Duroktar 已提交
761 762 763 764

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
765
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
766
		} else {
767
			resource = this.getSCMResource();
D
Duroktar 已提交
768 769 770 771 772 773
		}

		if (!resource) {
			return;
		}

J
Joao Moreno 已提交
774
		const HEAD = this.getLeftResource(resource);
775 776
		const basename = path.basename(resource.resourceUri.fsPath);
		const title = `${basename} (HEAD)`;
D
Duroktar 已提交
777

J
Joao Moreno 已提交
778 779 780
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
781
		}
J
Joao Moreno 已提交
782

J
Joao Moreno 已提交
783 784 785 786
		const opts: TextDocumentShowOptions = {
			preview
		};

787
		return await commands.executeCommand<void>('vscode.open', HEAD, opts, title);
D
Duroktar 已提交
788 789
	}

J
Joao Moreno 已提交
790 791
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
792
		const preserveFocus = arg instanceof Resource;
J
Joao Moreno 已提交
793 794
		const preview = !(arg instanceof Resource);

J
Joao 已提交
795
		const preserveSelection = arg instanceof Uri || !arg;
796
		let resources: Resource[] | undefined = undefined;
797

798
		if (arg instanceof Uri) {
799
			const resource = this.getSCMResource(arg);
800 801 802
			if (resource !== undefined) {
				resources = [resource];
			}
803
		} else {
804
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
805

806 807 808
			if (arg instanceof Resource) {
				resource = arg;
			} else {
809
				resource = this.getSCMResource();
810 811 812 813 814
			}

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

817
		if (!resources) {
J
Joao Moreno 已提交
818
			return;
J
Joao Moreno 已提交
819
		}
J
Joao Moreno 已提交
820

821
		for (const resource of resources) {
J
Joao 已提交
822
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
823
		}
J
Joao Moreno 已提交
824 825
	}

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

830 831
		resourceStates = resourceStates.filter(s => !!s);

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

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

837 838 839 840 841 842 843
			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

844
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
845
		const { resolved, unresolved, deletionConflicts } = await categorizeResourceByResolution(selection);
846 847 848 849 850

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

852 853 854 855 856 857 858 859
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
860 861 862 863 864 865 866 867 868 869 870 871 872 873
		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 已提交
874
		const workingTree = selection.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
875 876
		const untracked = selection.filter(s => s.resourceGroupType === ResourceGroupType.Untracked);
		const scmResources = [...workingTree, ...untracked, ...resolved, ...unresolved];
877

J
Joao Moreno 已提交
878
		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
879
		if (!scmResources.length) {
J
Joao Moreno 已提交
880 881
			return;
		}
J
Joao Moreno 已提交
882

883
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
884
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
885 886
	}

J
Joao Moreno 已提交
887 888
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
889
		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
890 891 892 893 894 895 896 897 898 899 900 901 902
		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;
		}
903 904 905

		if (unresolved.length > 0) {
			const message = unresolved.length > 1
J
Joao Moreno 已提交
906 907
				? 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));
908 909 910 911 912 913 914 915 916

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

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

917
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
918 919
		const untrackedChanges = config.get<'mixed' | 'separate' | 'hidden'>('untrackedChanges');
		await repository.add([], untrackedChanges === 'mixed' ? undefined : { update: true });
J
Joao Moreno 已提交
920 921
	}

J
Joao Moreno 已提交
922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956
	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');
			}
		}
	}

957 958 959 960 961 962 963 964 965
	@command('git.stageAllTracked', { repository: true })
	async stageAllTracked(repository: Repository): Promise<void> {
		const resources = repository.workingTreeGroup.resourceStates
			.filter(r => r.type !== Status.UNTRACKED && r.type !== Status.IGNORED);
		const uris = resources.map(r => r.resourceUri);

		await repository.add(uris);
	}

966 967 968 969 970 971 972 973 974
	@command('git.stageAllUntracked', { repository: true })
	async stageAllUntracked(repository: Repository): Promise<void> {
		const resources = [...repository.workingTreeGroup.resourceStates, ...repository.untrackedGroup.resourceStates]
			.filter(r => r.type === Status.UNTRACKED || r.type === Status.IGNORED);
		const uris = resources.map(r => r.resourceUri);

		await repository.add(uris);
	}

J
Joao Moreno 已提交
975
	@command('git.stageChange')
J
Joao Moreno 已提交
976 977 978 979 980 981 982 983
	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 已提交
984 985
	}

J
Joao Moreno 已提交
986
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
987
	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
988 989 990 991 992 993 994
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
995 996 997 998
		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 已提交
999

J
Joao Moreno 已提交
1000
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
1001 1002 1003
			return;
		}

J
Joao Moreno 已提交
1004 1005
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
1006

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

J
Joao Moreno 已提交
1011
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
1012 1013 1014
			return;
		}

J
Joao Moreno 已提交
1015
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
1016
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
1017
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
1018

J
Joao Moreno 已提交
1019
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
1020
	}
J
Joao Moreno 已提交
1021

J
Joao Moreno 已提交
1022
	@command('git.revertChange')
J
Joao Moreno 已提交
1023 1024 1025 1026
	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 已提交
1027 1028 1029
			return;
		}

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

J
Joao Moreno 已提交
1033
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
1034
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
1035 1036 1037 1038 1039 1040 1041
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
1042 1043
		const selections = textEditor.selections;
		const selectedChanges = changes.filter(change => {
J
Joao Moreno 已提交
1044
			const modifiedRange = getModifiedRange(modifiedDocument, change);
J
Joao Moreno 已提交
1045 1046 1047 1048
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
1049 1050 1051
			return;
		}

J
Joao Moreno 已提交
1052 1053
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
1054

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

J
Joao Moreno 已提交
1059
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
1060 1061 1062
			return;
		}

J
Joao Moreno 已提交
1063 1064
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
1065 1066
		const selectionsBeforeRevert = textEditor.selections;
		const visibleRangesBeforeRevert = textEditor.visibleRanges;
J
Joao Moreno 已提交
1067
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
1068

J
Joao Moreno 已提交
1069 1070 1071
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
1072

J
Joao Moreno 已提交
1073 1074
		await modifiedDocument.save();

1075 1076
		textEditor.selections = selectionsBeforeRevert;
		textEditor.revealRange(visibleRangesBeforeRevert[0]);
J
Joao Moreno 已提交
1077 1078
	}

J
Joao Moreno 已提交
1079 1080
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
1081 1082
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1083
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1084
			const resource = this.getSCMResource();
1085 1086 1087 1088 1089 1090 1091 1092

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

1096
		if (!scmResources.length) {
J
Joao Moreno 已提交
1097 1098 1099
			return;
		}

1100
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1101
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
1102 1103
	}

J
Joao Moreno 已提交
1104 1105
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
1106
		await repository.revert([]);
J
Joao Moreno 已提交
1107
	}
J
Joao Moreno 已提交
1108

J
Joao Moreno 已提交
1109 1110
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
1111 1112 1113 1114 1115 1116 1117 1118 1119
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

J
Joao Moreno 已提交
1120
		if (!isGitUri(modifiedUri)) {
1121 1122 1123 1124 1125 1126
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
1127 1128 1129
			return;
		}

J
Joao Moreno 已提交
1130
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
1131
		const originalDocument = await workspace.openTextDocument(originalUri);
1132 1133 1134 1135
		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 已提交
1136 1137 1138 1139 1140

		if (!selectedDiffs.length) {
			return;
		}

1141 1142
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
1143

J
Joao Moreno 已提交
1144
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
1145 1146
	}

J
Joao Moreno 已提交
1147 1148
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
1149 1150
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1151
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1152
			const resource = this.getSCMResource();
1153 1154 1155 1156 1157 1158 1159 1160

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

1161 1162
		const scmResources = resourceStates.filter(s => s instanceof Resource
			&& (s.resourceGroupType === ResourceGroupType.WorkingTree || s.resourceGroupType === ResourceGroupType.Untracked)) as Resource[];
1163

J
Joao Moreno 已提交
1164
		if (!scmResources.length) {
J
Joao Moreno 已提交
1165 1166
			return;
		}
J
Joao Moreno 已提交
1167

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

J
Joao Moreno 已提交
1172
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
1173
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
1174
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?\nThis is IRREVERSIBLE!\nThis file will be FOREVER LOST.", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
1175 1176
				yes = localize('delete file', "Delete file");
			} else {
1177 1178 1179 1180 1181 1182
				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 已提交
1183 1184
			}
		} else {
1185 1186 1187 1188 1189 1190
			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 已提交
1191 1192

			if (untrackedCount > 0) {
J
Joao Moreno 已提交
1193
				message = `${message}\n\n${localize('warn untracked', "This will DELETE {0} untracked files!\nThis is IRREVERSIBLE!\nThese files will be FOREVER LOST.", untrackedCount)}`;
J
Joao Moreno 已提交
1194 1195
			}
		}
1196

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

J
Joao Moreno 已提交
1199 1200 1201 1202
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
1203
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1204
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
1205
	}
J
Joao Moreno 已提交
1206

J
Joao Moreno 已提交
1207 1208
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1209
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
1210 1211 1212 1213 1214

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

J
Joao Moreno 已提交
1215 1216
		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 已提交
1217

J
Joao Moreno 已提交
1218
		if (untrackedResources.length === 0) {
1219
			await this._cleanTrackedChanges(repository, resources);
1220 1221
		} else if (resources.length === 1) {
			await this._cleanUntrackedChange(repository, resources[0]);
J
Joao Moreno 已提交
1222
		} else if (trackedResources.length === 0) {
1223
			await this._cleanUntrackedChanges(repository, resources);
J
Joao Moreno 已提交
1224 1225 1226 1227
		} 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 已提交
1228

J
Joao Moreno 已提交
1229 1230 1231 1232 1233
			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 已提交
1234

J
Joao Moreno 已提交
1235
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1236 1237 1238 1239 1240 1241 1242 1243
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
1244
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1245
		}
J
Joao Moreno 已提交
1246 1247
	}

1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259
	@command('git.cleanAllTracked', { repository: true })
	async cleanAllTracked(repository: Repository): Promise<void> {
		const resources = repository.workingTreeGroup.resourceStates
			.filter(r => r.type !== Status.UNTRACKED && r.type !== Status.IGNORED);

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

		await this._cleanTrackedChanges(repository, resources);
	}

1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275
	@command('git.cleanAllUntracked', { repository: true })
	async cleanAllUntracked(repository: Repository): Promise<void> {
		const resources = [...repository.workingTreeGroup.resourceStates, ...repository.untrackedGroup.resourceStates]
			.filter(r => r.type === Status.UNTRACKED || r.type === Status.IGNORED);

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

		if (resources.length === 1) {
			await this._cleanUntrackedChange(repository, resources[0]);
		} else {
			await this._cleanUntrackedChanges(repository, resources);
		}
	}

1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291
	private async _cleanTrackedChanges(repository: Repository, resources: Resource[]): Promise<void> {
		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")
			: localize('discardAll', "Discard All {0} Files", resources.length);
		const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

		await repository.clean(resources.map(r => r.resourceUri));
	}

1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315
	private async _cleanUntrackedChange(repository: Repository, resource: Resource): Promise<void> {
		const message = localize('confirm delete', "Are you sure you want to DELETE {0}?\nThis is IRREVERSIBLE!\nThis file will be FOREVER LOST.", path.basename(resource.resourceUri.fsPath));
		const yes = localize('delete file', "Delete file");
		const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

		await repository.clean([resource.resourceUri]);
	}

	private async _cleanUntrackedChanges(repository: Repository, resources: Resource[]): Promise<void> {
		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);

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

		await repository.clean(resources.map(r => r.resourceUri));
	}

J
Joao Moreno 已提交
1316
	private async smartCommit(
J
Joao Moreno 已提交
1317
		repository: Repository,
1318
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
1319 1320
		opts?: CommitOptions
	): Promise<boolean> {
1321
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
1322
		let promptToSaveFilesBeforeCommit = config.get<'always' | 'staged' | 'never'>('promptToSaveFilesBeforeCommit');
J
Joao Moreno 已提交
1323

1324 1325 1326 1327 1328 1329 1330
		// migration
		if (promptToSaveFilesBeforeCommit as any === true) {
			promptToSaveFilesBeforeCommit = 'always';
		} else if (promptToSaveFilesBeforeCommit as any === false) {
			promptToSaveFilesBeforeCommit = 'never';
		}

J
Joao Moreno 已提交
1331
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
J
Joao Moreno 已提交
1332 1333 1334
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
J
Joao Moreno 已提交
1335

1336 1337 1338 1339
		if (promptToSaveFilesBeforeCommit !== 'never') {
			let documents = workspace.textDocuments
				.filter(d => !d.isUntitled && d.isDirty && isDescendant(repository.root, d.uri.fsPath));

J
Joao Moreno 已提交
1340
			if (promptToSaveFilesBeforeCommit === 'staged' || repository.indexGroup.resourceStates.length > 0) {
1341
				documents = documents
J
Joao Moreno 已提交
1342
					.filter(d => repository.indexGroup.resourceStates.some(s => pathEquals(s.resourceUri.fsPath, d.uri.fsPath)));
1343
			}
1344

1345 1346
			if (documents.length > 0) {
				const message = documents.length === 1
J
Joao Moreno 已提交
1347
					? localize('unsaved files single', "The following file has unsaved changes which won't be included in the commit if you proceed: {0}.\n\nWould you like to save it before committing?", path.basename(documents[0].uri.fsPath))
J
Joao Moreno 已提交
1348
					: localize('unsaved files', "There are {0} unsaved files.\n\nWould you like to save them before committing?", documents.length);
J
Joao Moreno 已提交
1349 1350 1351 1352 1353
				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) {
1354
					await Promise.all(documents.map(d => d.save()));
J
Joao Moreno 已提交
1355
					await repository.add(documents.map(d => d.uri));
J
Joao Moreno 已提交
1356 1357 1358
				} else if (pick !== commit) {
					return false; // do not commit on cancel
				}
1359 1360 1361
			}
		}

1362
		// no changes, and the user has not configured to commit all in this case
1363
		if (!noUnstagedChanges && noStagedChanges && !enableSmartCommit) {
1364
			const suggestSmartCommit = config.get<boolean>('suggestSmartCommit') === true;
J
Joao Moreno 已提交
1365

1366 1367 1368 1369
			if (!suggestSmartCommit) {
				return false;
			}

J
Joao Moreno 已提交
1370 1371
			// 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?");
1372 1373
			const yes = localize('yes', "Yes");
			const always = localize('always', "Always");
1374 1375
			const never = localize('never', "Never");
			const pick = await window.showWarningMessage(message, { modal: true }, yes, always, never);
1376 1377

			if (pick === always) {
J
Joao Moreno 已提交
1378
				config.update('enableSmartCommit', true, true);
1379 1380 1381
			} else if (pick === never) {
				config.update('suggestSmartCommit', false, true);
				return false;
J
Joao Moreno 已提交
1382 1383
			} else if (pick !== yes) {
				return false; // do not commit on cancel
1384 1385 1386
			}
		}

J
Joao Moreno 已提交
1387
		if (!opts) {
1388
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
1389 1390
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
1391 1392
		}

1393 1394 1395
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

1396 1397 1398 1399
		if (config.get<boolean>('alwaysSignOff')) {
			opts.signoff = true;
		}

J
Joao Moreno 已提交
1400 1401
		const smartCommitChanges = config.get<'all' | 'tracked'>('smartCommitChanges');

J
Joao Moreno 已提交
1402
		if (
1403
			(
J
Joao Moreno 已提交
1404 1405 1406 1407
				// no changes
				(noStagedChanges && noUnstagedChanges)
				// or no staged changes and not `all`
				|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
1408 1409
				// no staged changes and no tracked unstaged changes
				|| (noStagedChanges && smartCommitChanges === 'tracked' && repository.workingTreeGroup.resourceStates.every(r => r.type === Status.UNTRACKED))
J
Joao Moreno 已提交
1410
			)
1411
			&& !opts.empty
J
Joao Moreno 已提交
1412
		) {
J
Joao Moreno 已提交
1413 1414 1415 1416
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1417
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1418 1419 1420 1421 1422

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
1423
		if (opts.all && smartCommitChanges === 'tracked') {
J
Joao Moreno 已提交
1424
			opts.all = 'tracked';
1425 1426
		}

1427
		if (opts.all && config.get<'mixed' | 'separate' | 'hidden'>('untrackedChanges') !== 'mixed') {
1428
			opts.all = 'tracked';
J
Joao Moreno 已提交
1429 1430
		}

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

J
Joao Moreno 已提交
1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443
		const postCommitCommand = config.get<'none' | 'push' | 'sync'>('postCommitCommand');

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

J
Joao Moreno 已提交
1444 1445 1446
		return true;
	}

J
Joao Moreno 已提交
1447
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1448
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1449
		const getCommitMessage = async () => {
1450
			let _message: string | undefined = message;
1451

1452 1453
			if (!_message) {
				let value: string | undefined = undefined;
J
Joao Moreno 已提交
1454

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

1459 1460
				const branchName = repository.headShortName;
				let placeHolder: string;
1461

1462 1463 1464 1465 1466
				if (branchName) {
					placeHolder = localize('commitMessageWithHeadLabel2', "Message (commit on '{0}')", branchName);
				} else {
					placeHolder = localize('commit message', "Commit message");
				}
J
Joao Moreno 已提交
1467

1468 1469
				_message = await window.showInputBox({
					value,
1470
					placeHolder,
1471 1472 1473
					prompt: localize('provide commit message', "Please provide a commit message"),
					ignoreFocusOut: true
				});
A
💄  
al 已提交
1474
			}
J
Joao Moreno 已提交
1475

1476
			return _message;
J
Joao Moreno 已提交
1477 1478
		};

J
Joao Moreno 已提交
1479
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1480 1481

		if (message && didCommit) {
J
Joao Moreno 已提交
1482
			repository.inputBox.value = await repository.getInputTemplate();
J
Joao Moreno 已提交
1483
		}
J
Joao Moreno 已提交
1484 1485
	}

J
Joao Moreno 已提交
1486
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
1487 1488
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
1489 1490
	}

J
Joao Moreno 已提交
1491
	@command('git.commitStaged', { repository: true })
J
Joao Moreno 已提交
1492 1493
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
1494 1495
	}

J
Joao Moreno 已提交
1496
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
1497 1498
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
1499 1500
	}

J
Joao Moreno 已提交
1501
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
1502
	async commitStagedAmend(repository: Repository): Promise<void> {
1503
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
1504 1505
	}

J
Joao Moreno 已提交
1506
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
1507 1508
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
1509 1510
	}

J
Joao Moreno 已提交
1511
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1512 1513
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1514 1515
	}

J
Joao Moreno 已提交
1516
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
1517 1518
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
1519 1520
	}

J
Joao Moreno 已提交
1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542
	@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 已提交
1543 1544 1545 1546 1547
	@command('git.restoreCommitTemplate', { repository: true })
	async restoreCommitTemplate(repository: Repository): Promise<void> {
		repository.inputBox.value = await repository.getCommitTemplate();
	}

J
Joao Moreno 已提交
1548
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
1549 1550
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1551 1552

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

J
Joao Moreno 已提交
1557
		const commit = await repository.getCommit('HEAD');
J
Joao Moreno 已提交
1558

1559 1560
		if (commit.parents.length > 1) {
			const yes = localize('undo commit', "Undo merge commit");
J
Joao Moreno 已提交
1561
			const result = await window.showWarningMessage(localize('merge commit', "The last commit was a merge commit. Are you sure you want to undo it?"), { modal: true }, yes);
1562 1563 1564 1565 1566 1567

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

J
Joao Moreno 已提交
1568
		if (commit.parents.length > 0) {
1569 1570 1571 1572 1573
			await repository.reset('HEAD~');
		} else {
			await repository.deleteRef('HEAD');
			await this.unstageAll(repository);
		}
J
Joao Moreno 已提交
1574

J
Joao Moreno 已提交
1575
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1576 1577
	}

J
Joao Moreno 已提交
1578
	@command('git.checkout', { repository: true })
1579
	async checkout(repository: Repository, treeish: string): Promise<boolean> {
J
Joao Moreno 已提交
1580
		if (typeof treeish === 'string') {
1581 1582
			await repository.checkout(treeish);
			return true;
J
Joao Moreno 已提交
1583
		}
J
Joao Moreno 已提交
1584

J
Joao Moreno 已提交
1585 1586 1587
		const createBranch = new CreateBranchItem(this);
		const createBranchFrom = new CreateBranchFromItem(this);
		const picks = [createBranch, createBranchFrom, ...createCheckoutItems(repository)];
1588
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
1589 1590 1591 1592 1593 1594 1595 1596

		const quickpick = window.createQuickPick();
		quickpick.items = picks;
		quickpick.placeholder = placeHolder;
		quickpick.show();

		const choice = await new Promise<QuickPickItem | undefined>(c => quickpick.onDidAccept(() => c(quickpick.activeItems[0])));
		quickpick.hide();
J
Joao Moreno 已提交
1597 1598

		if (!choice) {
1599
			return false;
J
Joao Moreno 已提交
1600 1601
		}

1602 1603
		if (choice === createBranch) {
			await this._branch(repository, quickpick.value);
J
Joao Moreno 已提交
1604 1605
		} else if (choice === createBranchFrom) {
			await this._branch(repository, quickpick.value, true);
1606 1607 1608 1609
		} else {
			await (choice as CheckoutItem).run(repository);
		}

1610
		return true;
J
Joao Moreno 已提交
1611 1612
	}

J
Joao Moreno 已提交
1613
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1614
	async branch(repository: Repository): Promise<void> {
1615 1616
		await this._branch(repository);
	}
J
Joao Moreno 已提交
1617

J
Joao Moreno 已提交
1618 1619 1620 1621 1622
	@command('git.branchFrom', { repository: true })
	async branchFrom(repository: Repository): Promise<void> {
		await this._branch(repository, undefined, true);
	}

1623
	private async promptForBranchName(defaultName?: string, initialValue?: string): Promise<string> {
1624 1625 1626 1627
		const config = workspace.getConfiguration('git');
		const branchWhitespaceChar = config.get<string>('branchWhitespaceChar')!;
		const branchValidationRegex = config.get<string>('branchValidationRegex')!;
		const sanitize = (name: string) => name ?
J
Joao Moreno 已提交
1628
			name.trim().replace(/^-+/, '').replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, branchWhitespaceChar)
1629 1630
			: name;

J
Joao Moreno 已提交
1631
		const rawBranchName = defaultName || await window.showInputBox({
1632
			placeHolder: localize('branch name', "Branch name"),
1633
			prompt: localize('provide branch name', "Please provide a new branch name"),
1634
			value: initialValue,
1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645
			ignoreFocusOut: true,
			validateInput: (name: string) => {
				const validateName = new RegExp(branchValidationRegex);
				if (validateName.test(sanitize(name))) {
					return null;
				}

				return localize('branch name format invalid', "Branch name needs to match regex: {0}", branchValidationRegex);
			}
		});

J
Joao Moreno 已提交
1646 1647 1648 1649 1650
		return sanitize(rawBranchName || '');
	}

	private async _branch(repository: Repository, defaultName?: string, from = false): Promise<void> {
		const branchName = await this.promptForBranchName(defaultName);
1651 1652

		if (!branchName) {
1653 1654
			return;
		}
J
Joao Moreno 已提交
1655

J
Joao Moreno 已提交
1656
		let target = 'HEAD';
J
Joao Moreno 已提交
1657

J
Joao Moreno 已提交
1658 1659 1660 1661 1662 1663 1664 1665 1666 1667
		if (from) {
			const picks = [new HEADItem(repository), ...createCheckoutItems(repository)];
			const placeHolder = localize('select a ref to create a new branch from', 'Select a ref to create the \'{0}\' branch from', branchName);
			const choice = await window.showQuickPick(picks, { placeHolder });

			if (!choice) {
				return;
			}

			target = choice.label;
J
Joao Moreno 已提交
1668
		}
J
Joao Moreno 已提交
1669

J
Joao Moreno 已提交
1670
		await repository.branch(branchName, true, target);
J
Joao Moreno 已提交
1671 1672
	}

J
Joao Moreno 已提交
1673
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1674
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1675 1676
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1677
			run = force => repository.deleteBranch(name, force);
1678
		} else {
J
Joao Moreno 已提交
1679 1680
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1681
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1682

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

M
Maik Riechert 已提交
1686
			if (!choice || !choice.branchName) {
1687 1688
				return;
			}
M
Maik Riechert 已提交
1689
			name = choice.branchName;
J
Joao Moreno 已提交
1690
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1691 1692
		}

1693 1694 1695 1696 1697 1698 1699 1700 1701
		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");
1702
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1703 1704 1705 1706 1707

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

1710 1711
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
1712 1713
		const currentBranchName = repository.HEAD && repository.HEAD.name;
		const branchName = await this.promptForBranchName(undefined, currentBranchName);
J
Justin Horner 已提交
1714

J
Joao Moreno 已提交
1715
		if (!branchName) {
J
Justin Horner 已提交
1716 1717 1718 1719
			return;
		}

		try {
J
Joao Moreno 已提交
1720
			await repository.renameBranch(branchName);
J
Justin Horner 已提交
1721 1722 1723
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1724 1725
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1726
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1727
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", branchName));
1728 1729 1730
					return;
				default:
					throw err;
J
Justin Horner 已提交
1731 1732 1733 1734
			}
		}
	}

J
Joao Moreno 已提交
1735
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1736
	async merge(repository: Repository): Promise<void> {
1737 1738 1739 1740
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1741
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1742 1743
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1744

J
Joao Moreno 已提交
1745
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1746 1747
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1748 1749

		const picks = [...heads, ...remoteHeads];
1750 1751
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1752 1753 1754 1755 1756

		if (!choice) {
			return;
		}

1757
		await choice.run(repository);
1758 1759
	}

J
Joao Moreno 已提交
1760
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1761
	async createTag(repository: Repository): Promise<void> {
1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773
		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 已提交
1774
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1775 1776 1777 1778 1779
			ignoreFocusOut: true
		});

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

X
Xhulio Hasani 已提交
1783 1784
	@command('git.deleteTag', { repository: true })
	async deleteTag(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1785 1786 1787 1788
		const picks = repository.refs.filter(ref => ref.type === RefType.Tag)
			.map(ref => new TagItem(ref));

		if (picks.length === 0) {
1789
			window.showWarningMessage(localize('no tags', "This repository has no tags."));
J
Joao Moreno 已提交
1790
			return;
1791
		}
J
Joao Moreno 已提交
1792

1793
		const placeHolder = localize('select a tag to delete', 'Select a tag to delete');
J
Joao Moreno 已提交
1794 1795
		const choice = await window.showQuickPick(picks, { placeHolder });

1796
		if (!choice) {
X
Xhulio Hasani 已提交
1797 1798
			return;
		}
J
Joao Moreno 已提交
1799 1800

		await repository.deleteTag(choice.label);
X
Xhulio Hasani 已提交
1801 1802
	}

J
Joao Moreno 已提交
1803 1804 1805 1806 1807 1808 1809
	@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 已提交
1810
		await repository.fetchDefault();
J
Joao Moreno 已提交
1811 1812
	}

R
Ryan Scott 已提交
1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823
	@command('git.fetchPrune', { repository: true })
	async fetchPrune(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.fetchPrune();
	}


J
Joao Moreno 已提交
1824 1825 1826 1827 1828 1829 1830 1831 1832 1833
	@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 已提交
1834
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1835 1836
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1837 1838 1839 1840 1841 1842

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

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

D
Dozed12 已提交
1847
		if (!remotePick) {
1848 1849 1850
			return;
		}

D
Dozed12 已提交
1851 1852
		const remoteRefs = repository.refs;
		const remoteRefsFiltered = remoteRefs.filter(r => (r.remote === remotePick.label));
J
Joao Moreno 已提交
1853
		const branchPicks = remoteRefsFiltered.map(r => ({ label: r.name! }));
J
Joao Moreno 已提交
1854 1855
		const branchPlaceHolder = localize('pick branch pull', "Pick a branch to pull from");
		const branchPick = await window.showQuickPick(branchPicks, { placeHolder: branchPlaceHolder });
1856

D
Dozed12 已提交
1857
		if (!branchPick) {
1858 1859 1860
			return;
		}

F
Francisco Moreira 已提交
1861 1862
		const remoteCharCnt = remotePick.label.length;

1863
		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1864 1865
	}

J
Joao Moreno 已提交
1866
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1867 1868
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1869 1870 1871 1872 1873 1874

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

J
Joao Moreno 已提交
1875
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1876 1877
	}

J
Joao Moreno 已提交
1878
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1879 1880
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1881 1882 1883 1884 1885 1886

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

J
Joao Moreno 已提交
1887
		await repository.pullWithRebase(repository.HEAD);
J
Joao Moreno 已提交
1888 1889
	}

J
Joao Moreno 已提交
1890
	private async _push(repository: Repository, pushOptions: PushOptions) {
J
Joao Moreno 已提交
1891
		const remotes = repository.remotes;
1892

J
Joao Moreno 已提交
1893
		if (remotes.length === 0) {
J
Joao Moreno 已提交
1894 1895 1896
			if (!pushOptions.silent) {
				window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
			}
J
Joao Moreno 已提交
1897 1898
			return;
		}
1899

J
Joao Moreno 已提交
1900 1901 1902 1903 1904 1905
		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."));
1906 1907
				return;
			}
J
Joao Moreno 已提交
1908

J
Joao Moreno 已提交
1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922
			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 已提交
1923 1924
		}

1925 1926
		if (pushOptions.pushType === PushType.PushFollowTags) {
			await repository.pushFollowTags(undefined, forcePushMode);
1927 1928 1929
			return;
		}

1930
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1931 1932 1933
			if (!pushOptions.silent) {
				window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			}
1934 1935 1936
			return;
		}

1937 1938 1939 1940 1941 1942 1943
		if (pushOptions.pushType === PushType.Push) {
			try {
				await repository.push(repository.HEAD, forcePushMode);
			} catch (err) {
				if (err.gitErrorCode !== GitErrorCodes.NoUpstreamBranch) {
					throw err;
				}
1944

J
Joao Moreno 已提交
1945 1946 1947 1948
				if (pushOptions.silent) {
					return;
				}

1949 1950 1951 1952 1953 1954 1955 1956 1957 1958
				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 {
1959
			const branchName = repository.HEAD.name;
J
Joao Moreno 已提交
1960 1961
			const addRemote = new AddRemoteItem(this);
			const picks = [...remotes.filter(r => r.pushUrl !== undefined).map(r => ({ label: r.name, description: r.pushUrl })), addRemote];
1962
			const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
J
Joao Moreno 已提交
1963
			const choice = await window.showQuickPick(picks, { placeHolder });
1964

J
Joao Moreno 已提交
1965
			if (!choice) {
1966
				return;
1967
			}
1968

J
Joao Moreno 已提交
1969 1970 1971 1972 1973 1974 1975 1976 1977
			if (choice === addRemote) {
				const newRemote = await this.addRemote(repository);

				if (newRemote) {
					await repository.pushTo(newRemote, branchName, undefined, forcePushMode);
				}
			} else {
				await repository.pushTo(choice.label, branchName, undefined, forcePushMode);
			}
1978
		}
J
Joao Moreno 已提交
1979 1980
	}

1981 1982
	@command('git.push', { repository: true })
	async push(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1983
		await this._push(repository, { pushType: PushType.Push });
1984
	}
1985

1986 1987
	@command('git.pushForce', { repository: true })
	async pushForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1988
		await this._push(repository, { pushType: PushType.Push, forcePush: true });
1989
	}
1990

1991
	@command('git.pushWithTags', { repository: true })
1992 1993
	async pushFollowTags(repository: Repository): Promise<void> {
		await this._push(repository, { pushType: PushType.PushFollowTags });
1994
	}
1995

1996
	@command('git.pushWithTagsForce', { repository: true })
1997 1998
	async pushFollowTagsForce(repository: Repository): Promise<void> {
		await this._push(repository, { pushType: PushType.PushFollowTags, forcePush: true });
1999 2000
	}

J
Joao Moreno 已提交
2001
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
2002
	async pushTo(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
2003
		await this._push(repository, { pushType: PushType.PushTo });
2004
	}
J
Joao Moreno 已提交
2005

2006 2007
	@command('git.pushToForce', { repository: true })
	async pushToForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
2008
		await this._push(repository, { pushType: PushType.PushTo, forcePush: true });
J
Joao Moreno 已提交
2009 2010
	}

O
Omkar Manjrekar 已提交
2011
	@command('git.addRemote', { repository: true })
2012
	async addRemote(repository: Repository): Promise<string | undefined> {
2013 2014
		const remotes = repository.remotes;

O
Omkar Manjrekar 已提交
2015 2016
		const sanitize = (name: string) => {
			name = name.trim();
J
Joao Moreno 已提交
2017
			return name && name.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, '-');
O
Omkar Manjrekar 已提交
2018
		};
O
Omkar Manjrekar 已提交
2019

O
Omkar Manjrekar 已提交
2020
		const resultName = await window.showInputBox({
O
Omkar Manjrekar 已提交
2021 2022 2023 2024
			placeHolder: localize('remote name', "Remote name"),
			prompt: localize('provide remote name', "Please provide a remote name"),
			ignoreFocusOut: true,
			validateInput: (name: string) => {
O
Omkar Manjrekar 已提交
2025
				if (sanitize(name)) {
O
Omkar Manjrekar 已提交
2026 2027
					return null;
				}
O
Omkar Manjrekar 已提交
2028
				return localize('remote name format invalid', "Remote name format invalid");
O
Omkar Manjrekar 已提交
2029
			}
O
Omkar Manjrekar 已提交
2030
		});
O
Omkar Manjrekar 已提交
2031

O
Omkar Manjrekar 已提交
2032
		const name = sanitize(resultName || '');
O
Omkar Manjrekar 已提交
2033

O
Omkar Manjrekar 已提交
2034 2035 2036 2037 2038
		if (!name) {
			return;
		}

		if (remotes.find(r => r.name === name)) {
J
Joao Moreno 已提交
2039
			window.showErrorMessage(localize('remote already exists', "Remote '{0}' already exists.", name));
O
Omkar Manjrekar 已提交
2040
			return;
O
Omkar Manjrekar 已提交
2041
		}
O
Omkar Manjrekar 已提交
2042

J
Joao Moreno 已提交
2043
		const url = await window.showInputBox({
O
Omkar Manjrekar 已提交
2044
			placeHolder: localize('remote url', "Remote URL"),
O
Omkar Manjrekar 已提交
2045
			prompt: localize('provide remote URL', "Enter URL for remote \"{0}\"", name),
2046
			ignoreFocusOut: true
O
Omkar Manjrekar 已提交
2047 2048 2049 2050 2051 2052 2053
		});

		if (!url) {
			return;
		}

		await repository.addRemote(name, url);
2054 2055

		return name;
O
Omkar Manjrekar 已提交
2056 2057
	}

O
Omkar Manjrekar 已提交
2058 2059
	@command('git.removeRemote', { repository: true })
	async removeRemote(repository: Repository): Promise<void> {
O
Omkar Manjrekar 已提交
2060 2061 2062
		const remotes = repository.remotes;

		if (remotes.length === 0) {
2063
			window.showErrorMessage(localize('no remotes added', "Your repository has no remotes."));
O
Omkar Manjrekar 已提交
2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074
			return;
		}

		const picks = remotes.map(r => r.name);
		const placeHolder = localize('remove remote', "Pick a remote to remove");

		const remoteName = await window.showQuickPick(picks, { placeHolder });

		if (!remoteName) {
			return;
		}
O
Omkar Manjrekar 已提交
2075

O
Omkar Manjrekar 已提交
2076
		await repository.removeRemote(remoteName);
O
Omkar Manjrekar 已提交
2077
	}
O
Omkar Manjrekar 已提交
2078

J
Joao Moreno 已提交
2079
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
2080
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
2081

2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092
		if (!HEAD) {
			return;
		} else if (!HEAD.upstream) {
			const branchName = 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);
			}
J
Joao Moreno 已提交
2093 2094 2095
			return;
		}

J
Joao Moreno 已提交
2096 2097 2098 2099
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
2100
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
2101
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
2102 2103

		if (shouldPrompt) {
J
Joao Moreno 已提交
2104
			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 已提交
2105
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
2106
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
2107 2108 2109 2110 2111 2112 2113 2114 2115
			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 已提交
2116
		if (rebase) {
J
Joao Moreno 已提交
2117
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
2118
		} else {
J
Joao Moreno 已提交
2119
			await repository.sync(HEAD);
J
Joao Moreno 已提交
2120 2121 2122 2123
		}
	}

	@command('git.sync', { repository: true })
2124 2125 2126 2127 2128 2129 2130 2131 2132 2133
	async sync(repository: Repository): Promise<void> {
		try {
			await this._sync(repository, false);
		} catch (err) {
			if (/Cancelled/i.test(err && (err.message || err.stderr || ''))) {
				return;
			}

			throw err;
		}
J
Joao Moreno 已提交
2134 2135
	}

J
Joao 已提交
2136 2137 2138 2139 2140 2141 2142 2143 2144
	@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 已提交
2145
			await repository.sync(HEAD);
J
Joao 已提交
2146 2147 2148
		}));
	}

2149
	@command('git.syncRebase', { repository: true })
2150 2151 2152 2153 2154 2155 2156 2157 2158 2159
	async syncRebase(repository: Repository): Promise<void> {
		try {
			await this._sync(repository, true);
		} catch (err) {
			if (/Cancelled/i.test(err && (err.message || err.stderr || ''))) {
				return;
			}

			throw err;
		}
J
Joao Moreno 已提交
2160 2161
	}

J
Joao Moreno 已提交
2162
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
2163 2164
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
2165 2166 2167 2168 2169 2170

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

2171 2172 2173 2174 2175 2176
		const branchName = repository.HEAD && repository.HEAD.name || '';

		if (remotes.length === 1) {
			return await repository.pushTo(remotes[0].name, branchName, true);
		}

2177
		const addRemote = new AddRemoteItem(this);
J
Joao Moreno 已提交
2178
		const picks = [...repository.remotes.map(r => ({ label: r.name, description: r.pushUrl })), addRemote];
2179 2180
		const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
2181 2182 2183 2184 2185

		if (!choice) {
			return;
		}

2186 2187 2188 2189
		if (choice === addRemote) {
			const newRemote = await this.addRemote(repository);

			if (newRemote) {
J
Joao Moreno 已提交
2190
				await repository.pushTo(newRemote, branchName, true);
2191
			}
J
Joao Moreno 已提交
2192 2193
		} else {
			await repository.pushTo(choice.label, branchName, true);
2194
		}
J
Joao Moreno 已提交
2195 2196
	}

2197 2198
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
2199 2200
		resourceStates = resourceStates.filter(s => !!s);

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

2204
			if (!resource) {
J
Joao Moreno 已提交
2205 2206 2207
				return;
			}

2208
			resourceStates = [resource];
J
Joao Moreno 已提交
2209 2210
		}

2211
		const resources = resourceStates
J
Joao Moreno 已提交
2212 2213 2214
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

2215
		if (!resources.length) {
N
NKumar2 已提交
2216 2217 2218
			return;
		}

2219
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
2220 2221
	}

J
Joao Moreno 已提交
2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234
	@command('git.revealInExplorer')
	async revealInExplorer(resourceState: SourceControlResourceState): Promise<void> {
		if (!resourceState) {
			return;
		}

		if (!(resourceState.resourceUri instanceof Uri)) {
			return;
		}

		await commands.executeCommand('revealInExplorer', resourceState.resourceUri);
	}

J
Joao Moreno 已提交
2235
	private async _stash(repository: Repository, includeUntracked = false): Promise<void> {
2236 2237
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0
			&& (!includeUntracked || repository.untrackedGroup.resourceStates.length === 0);
2238
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
2239

2240
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
2241 2242 2243
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
2244

2245
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
2246 2247 2248 2249 2250

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

J
Joao Moreno 已提交
2251
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
2252 2253
	}

2254 2255 2256 2257 2258 2259 2260
	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 已提交
2261 2262 2263 2264 2265 2266 2267 2268 2269 2270
	@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 已提交
2271
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
2272
	async stashPop(repository: Repository): Promise<void> {
2273
		const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
J
Joao Moreno 已提交
2274
		const stash = await this.pickStash(repository, placeHolder);
2275

J
Joao Moreno 已提交
2276
		if (!stash) {
2277 2278 2279
			return;
		}

J
Joao Moreno 已提交
2280
		await repository.popStash(stash.index);
2281 2282 2283 2284
	}

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

J
Joao Moreno 已提交
2287 2288
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
2289 2290 2291
			return;
		}

2292 2293 2294 2295 2296 2297
		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 已提交
2298
		const stash = await this.pickStash(repository, placeHolder);
K
Krzysztof Cieślak 已提交
2299

J
Joao Moreno 已提交
2300
		if (!stash) {
K
Krzysztof Cieślak 已提交
2301 2302
			return;
		}
J
Joao Moreno 已提交
2303

J
Joao Moreno 已提交
2304
		await repository.applyStash(stash.index);
K
Krzysztof Cieślak 已提交
2305 2306
	}

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

J
Joao Moreno 已提交
2311 2312
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
2313 2314 2315 2316 2317 2318
			return;
		}

		await repository.applyStash();
	}

2319 2320
	@command('git.stashDrop', { repository: true })
	async stashDrop(repository: Repository): Promise<void> {
2321 2322 2323 2324 2325 2326 2327 2328 2329 2330
		const placeHolder = localize('pick stash to drop', "Pick a stash to drop");
		const stash = await this.pickStash(repository, placeHolder);

		if (!stash) {
			return;
		}

		await repository.dropStash(stash.index);
	}

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

J
Joao Moreno 已提交
2334 2335
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
2336 2337 2338
			return;
		}

J
Joao Moreno 已提交
2339 2340 2341
		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 已提交
2342
	}
K
Krzysztof Cieślak 已提交
2343

2344 2345 2346 2347 2348 2349 2350
	@command('git.timeline.openDiff', { repository: false })
	async timelineOpenDiff(item: TimelineItem, uri: Uri | undefined, _source: string) {
		// eslint-disable-next-line eqeqeq
		if (uri == null || !GitTimelineItem.is(item)) {
			return undefined;
		}

E
Eric Amodio 已提交
2351 2352
		const basename = path.basename(uri.fsPath);

2353
		let title;
2354
		if ((item.previousRef === 'HEAD' || item.previousRef === '~') && item.ref === '') {
E
Eric Amodio 已提交
2355
			title = localize('git.title.workingTree', '{0} (Working Tree)', basename);
2356
		}
2357
		else if (item.previousRef === 'HEAD' && item.ref === '~') {
E
Eric Amodio 已提交
2358
			title = localize('git.title.index', '{0} (Index)', basename);
2359
		} else {
E
Eric Amodio 已提交
2360
			title = localize('git.title.diffRefs', '{0} ({1}) \u27f7 {0} ({2})', basename, item.shortPreviousRef, item.shortRef);
2361 2362 2363 2364 2365 2366 2367 2368 2369
		}

		return commands.executeCommand('vscode.diff', toGitUri(uri, item.previousRef), item.ref === '' ? uri : toGitUri(uri, item.ref), title);
	}

	@command('git.timeline.copyCommitId', { repository: false })
	async timelineCopyCommitId(item: TimelineItem, _uri: Uri | undefined, _source: string) {
		if (!GitTimelineItem.is(item)) {
			return;
2370 2371
		}

2372
		env.clipboard.writeText(item.ref);
2373 2374
	}

2375 2376 2377 2378 2379 2380 2381 2382 2383 2384
	@command('git.timeline.copyCommitMessage', { repository: false })
	async timelineCopyCommitMessage(item: TimelineItem, _uri: Uri | undefined, _source: string) {
		if (!GitTimelineItem.is(item)) {
			return;
		}

		env.clipboard.writeText(item.message);
	}


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

J
Joao Moreno 已提交
2389
			if (!options.repository) {
J
Joao Moreno 已提交
2390 2391
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
2392 2393
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
2394 2395 2396 2397 2398 2399 2400 2401 2402
				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();
				}
2403

J
Joao Moreno 已提交
2404
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
2405
					if (!repository) {
J
Joao 已提交
2406
						return Promise.resolve();
J
Joao Moreno 已提交
2407 2408
					}

J
Joao Moreno 已提交
2409
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
2410
				});
J
Joao Moreno 已提交
2411 2412
			}

K
kieferrm 已提交
2413
			/* __GDPR__
K
kieferrm 已提交
2414 2415 2416 2417
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
2418 2419
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
2420
			return result.catch(async err => {
J
Joao Moreno 已提交
2421
				const options: MessageOptions = {
2422
					modal: true
J
Joao Moreno 已提交
2423 2424
				};

J
Joao Moreno 已提交
2425
				let message: string;
2426
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
2427

J
Joao Moreno 已提交
2428 2429 2430 2431 2432
				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 已提交
2433
				switch (err.gitErrorCode) {
2434
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
2435 2436
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
2437
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
2438
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
2439
						break;
2440 2441 2442 2443 2444
					case GitErrorCodes.Conflict:
						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
						type = 'warning';
						options.modal = false;
						break;
J
Joao Moreno 已提交
2445 2446 2447 2448 2449
					case GitErrorCodes.StashConflict:
						message = localize('stash merge conflicts', "There were merge conflicts while applying the stash.");
						type = 'warning';
						options.modal = false;
						break;
2450 2451
					case GitErrorCodes.NoUserNameConfigured:
					case GitErrorCodes.NoUserEmailConfigured:
J
Joao Moreno 已提交
2452 2453
						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')));
2454
						break;
J
Joao Moreno 已提交
2455
					default:
2456 2457 2458
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
2459
							.split(/[\r\n]/)
J
João Moreno 已提交
2460
							.filter((line: string) => !!line)
2461 2462 2463 2464 2465
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
2466 2467 2468 2469 2470 2471 2472 2473 2474

						break;
				}

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

J
Joao Moreno 已提交
2475 2476 2477 2478 2479 2480 2481
				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 已提交
2482

J
Joao Moreno 已提交
2483 2484 2485
					if (resultFn) {
						resultFn();
					}
J
Joao Moreno 已提交
2486 2487 2488
				}
			});
		};
2489 2490

		// patch this object, so people can call methods directly
2491
		(this as any)[key] = result;
2492 2493

		return result;
J
Joao Moreno 已提交
2494 2495
	}

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

J
Joao Moreno 已提交
2499
		this.outputChannel.appendLine(`git.getSCMResource.uri ${uri && uri.toString()}`);
J
Joao Moreno 已提交
2500

J
Joao Moreno 已提交
2501 2502 2503
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
2504

J
Joao Moreno 已提交
2505
		if (!uri) {
2506
			return undefined;
J
Joao Moreno 已提交
2507 2508
		}

J
Joao Moreno 已提交
2509
		if (isGitUri(uri)) {
J
Joao Moreno 已提交
2510 2511
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
2512 2513 2514 2515
		}

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

J
Joao Moreno 已提交
2518
			if (!repository) {
2519 2520
				return undefined;
			}
J
Joao Moreno 已提交
2521

J
Joao Moreno 已提交
2522 2523
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
2524
		}
2525
		return undefined;
J
Joao Moreno 已提交
2526 2527
	}

J
Joao Moreno 已提交
2528
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
2529 2530 2531 2532 2533 2534
	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) => {
2535
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
2536 2537 2538 2539 2540 2541

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

2542
			// Could it be a submodule?
2543
			if (pathEquals(resource.fsPath, repository.root)) {
2544 2545 2546
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
2547
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563

			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 已提交
2564 2565 2566
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
2567
}