commands.ts 84.9 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
import { Branch, GitErrorCodes, Ref, RefType, Status, CommitOptions, RemoteSourceProvider } from './api/git';
13
import { ForcePushMode, Git, Stash } from './git';
14
import { Model } from './model';
15 16
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
João Moreno 已提交
21
import { ApiRepository } from './api/api1';
22
import { pickRemoteSource } from './remoteSource';
J
Joao Moreno 已提交
23 24

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

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

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

		if (!ref) {
			return;
		}

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

class CheckoutTagItem extends CheckoutItem {

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

class CheckoutRemoteHeadItem extends CheckoutItem {

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

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

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

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

M
Maik Riechert 已提交
73 74
class BranchDeleteItem implements QuickPickItem {

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

80
	constructor(private ref: Ref) { }
M
Maik Riechert 已提交
81

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

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

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

J
Joao Moreno 已提交
102 103
class CreateBranchItem implements QuickPickItem {

J
Joao Moreno 已提交
104 105
	constructor(private cc: CommandCenter) { }

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

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

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

J
Joao Moreno 已提交
116 117 118 119
class CreateBranchFromItem implements QuickPickItem {

	constructor(private cc: CommandCenter) { }

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

	get alwaysShow(): boolean { return true; }

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

J
Joao Moreno 已提交
130 131 132 133 134 135 136 137 138
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; }
}

139 140 141 142
class AddRemoteItem implements QuickPickItem {

	constructor(private cc: CommandCenter) { }

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

	get alwaysShow(): boolean { return true; }

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

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

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

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

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

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

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

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

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

J
Joao Moreno 已提交
204
function createCheckoutItems(repository: Repository): CheckoutItem[] {
205 206 207 208 209 210 211 212 213 214 215 216 217 218 219
	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
João Moreno 已提交
220 221 222 223 224
function sanitizeRemoteName(name: string) {
	name = name.trim();
	return name && name.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, '-');
}

J
Joao Moreno 已提交
225 226 227 228
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) { }
229 230
}

231 232 233
enum PushType {
	Push,
	PushTo,
234
	PushFollowTags,
235 236 237 238 239
}

interface PushOptions {
	pushType: PushType;
	forcePush?: boolean;
J
Joao Moreno 已提交
240
	silent?: boolean;
241 242
}

J
Joao Moreno 已提交
243
export class CommandCenter {
J
Joao Moreno 已提交
244 245

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

J
Joao Moreno 已提交
247
	constructor(
J
Joao Moreno 已提交
248
		private git: Git,
J
Joao Moreno 已提交
249
		private model: Model,
J
Joao Moreno 已提交
250 251
		private outputChannel: OutputChannel,
		private telemetryReporter: TelemetryReporter
J
Joao Moreno 已提交
252
	) {
J
Joao Moreno 已提交
253 254
		this.disposables = Commands.map(({ commandId, key, method, options }) => {
			const command = this.createCommand(commandId, key, method, options);
255

J
Joao Moreno 已提交
256
			if (options.diff) {
J
Joao Moreno 已提交
257 258 259 260 261
				return commands.registerDiffInformationCommand(commandId, command);
			} else {
				return commands.registerCommand(commandId, command);
			}
		});
J
Joao Moreno 已提交
262 263
	}

J
Joao Moreno 已提交
264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293
	@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 已提交
294 295
	@command('git.refresh', { repository: true })
	async refresh(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
296
		await repository.status();
J
Joao Moreno 已提交
297
	}
J
Joao Moreno 已提交
298

J
Joao Moreno 已提交
299
	@command('git.openResource')
J
João Moreno 已提交
300
	async openResource(resource: Resource, preserveFocus: boolean): Promise<void> {
J
Joao Moreno 已提交
301 302 303 304 305 306 307 308 309 310
		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) {
J
João Moreno 已提交
311
			await this._openResource(resource, undefined, preserveFocus, false);
J
Joao Moreno 已提交
312 313 314
		} else {
			await this.openFile(resource);
		}
J
Joao Moreno 已提交
315 316
	}

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

320 321 322 323
		try {
			stat = await new Promise<Stats>((c, e) => lstat(resource.resourceUri.fsPath, (err, stat) => err ? e(err) : c(stat)));
		} catch (err) {
			// noop
324
		}
325

326 327 328 329
		let left: Uri | undefined;
		let right: Uri | undefined;

		if (stat && stat.isDirectory()) {
330 331 332 333
			const repository = this.model.getRepositoryForSubmodule(resource.resourceUri);

			if (repository) {
				right = toGitUri(resource.resourceUri, resource.resourceGroupType === ResourceGroupType.Index ? 'index' : 'wt', { submoduleOf: repository.root });
334 335
			}
		} else {
J
Joao Moreno 已提交
336
			if (resource.type !== Status.DELETED_BY_THEM) {
J
Joao Moreno 已提交
337
				left = this.getLeftResource(resource);
J
Joao Moreno 已提交
338 339
			}

J
Joao Moreno 已提交
340
			right = this.getRightResource(resource);
341
		}
342

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

J
Joao Moreno 已提交
345 346 347 348 349
		if (!right) {
			// TODO
			console.error('oh no');
			return;
		}
J
Joao Moreno 已提交
350

J
Joao Moreno 已提交
351
		const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
352 353
			preserveFocus,
			preview,
354
			viewColumn: ViewColumn.Active
J
Joao Moreno 已提交
355 356
		};

J
Joao Moreno 已提交
357 358
		const activeTextEditor = window.activeTextEditor;

359 360 361
		// 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 已提交
362 363 364
			opts.selection = activeTextEditor.selection;
		}

365
		if (!left) {
J
Joao Moreno 已提交
366
			await commands.executeCommand<void>('vscode.open', right, opts, title);
J
Joao Moreno 已提交
367 368 369 370
		} else {
			await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
		}
	}
J
Joao Moreno 已提交
371

J
Joao Moreno 已提交
372
	private getLeftResource(resource: Resource): Uri | undefined {
J
Joao Moreno 已提交
373 374 375
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
D
Darrien Singleton 已提交
376
			case Status.INDEX_ADDED:
J
Joao Moreno 已提交
377
				return toGitUri(resource.original, 'HEAD');
J
Joao Moreno 已提交
378 379

			case Status.MODIFIED:
380
			case Status.UNTRACKED:
J
Joao Moreno 已提交
381
				return toGitUri(resource.resourceUri, '~');
382 383

			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
384
				return toGitUri(resource.resourceUri, '');
J
Joao Moreno 已提交
385
		}
386
		return undefined;
J
Joao Moreno 已提交
387
	}
J
Joao Moreno 已提交
388

J
Joao Moreno 已提交
389
	private getRightResource(resource: Resource): Uri | undefined {
J
Joao Moreno 已提交
390 391 392 393 394
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_ADDED:
			case Status.INDEX_COPIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
395
				return toGitUri(resource.resourceUri, '');
J
Joao Moreno 已提交
396 397 398

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

J
Joao Moreno 已提交
401
			case Status.DELETED_BY_US:
J
Joao Moreno 已提交
402
				return toGitUri(resource.resourceUri, '~3');
J
Joao Moreno 已提交
403 404

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

J
Joao Moreno 已提交
407 408 409
			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
410
			case Status.INTENT_TO_ADD:
J
Joao Moreno 已提交
411 412 413 414 415 416
				const repository = this.model.getRepository(resource.resourceUri);

				if (!repository) {
					return;
				}

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

J
Joao Moreno 已提交
420 421
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
422 423
				}

J
Joao Moreno 已提交
424
				return resource.resourceUri;
J
Joao Moreno 已提交
425

426
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
427
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
428
				return resource.resourceUri;
J
Joao Moreno 已提交
429
		}
430
		return undefined;
J
Joao Moreno 已提交
431 432 433
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
434
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
435 436 437 438

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

			case Status.MODIFIED:
M
Marc Kassay 已提交
443 444
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
E
Eric Amodio 已提交
445
				return localize('git.title.workingTree', '{0} (Working Tree)', basename);
J
Joao Moreno 已提交
446 447

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

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

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

E
Eric Amodio 已提交
456 457
			default:
				return '';
J
Joao Moreno 已提交
458 459 460
		}
	}

J
Joao Moreno 已提交
461
	@command('git.clone')
462
	async clone(url?: string, parentPath?: string): Promise<void> {
463
		if (!url) {
464 465 466 467
			url = await pickRemoteSource(this.model, {
				providerLabel: provider => localize('clonefrom', "Clone from {0}", provider.name),
				urlLabel: localize('repourl', "Clone from URL")
			});
468
		}
J
Joao Moreno 已提交
469 470

		if (!url) {
K
kieferrm 已提交
471
			/* __GDPR__
K
kieferrm 已提交
472 473 474 475
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
476 477
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
478 479
		}

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

482 483 484 485 486 487 488 489 490 491 492 493
		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 已提交
494

495 496 497 498 499 500 501 502 503
			if (!uris || uris.length === 0) {
				/* __GDPR__
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
				return;
			}
J
Joao Moreno 已提交
504

505 506
			const uri = uris[0];
			parentPath = uri.fsPath;
J
Joao Moreno 已提交
507 508
		}

509
		try {
510 511 512 513 514
			const opts = {
				location: ProgressLocation.Notification,
				title: localize('cloning', "Cloning git repository '{0}'...", url),
				cancellable: true
			};
M
Maryam Archie 已提交
515

516 517
			const repositoryPath = await window.withProgress(
				opts,
518
				(progress, token) => this.git.clone(url!, parentPath!, progress, token)
519
			);
520

J
Joao Moreno 已提交
521 522 523 524
			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];
525 526 527

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

			const result = await window.showInformationMessage(message, ...choices);
533 534

			const openFolder = result === open;
K
kieferrm 已提交
535
			/* __GDPR__
K
kieferrm 已提交
536 537 538 539 540
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
					"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
				}
			*/
541
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
542 543 544

			const uri = Uri.file(repositoryPath);

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

571
			throw err;
J
Joao Moreno 已提交
572 573 574
		}
	}

J
Joao Moreno 已提交
575
	@command('git.init')
J
Joao Moreno 已提交
576
	async init(skipFolderPrompt = false): Promise<void> {
J
Joao Moreno 已提交
577
		let repositoryPath: string | undefined = undefined;
J
Joao Moreno 已提交
578
		let askToOpen = true;
J
Joao Moreno 已提交
579

J
Joao Moreno 已提交
580
		if (workspace.workspaceFolders) {
J
Joao Moreno 已提交
581 582
			if (skipFolderPrompt && workspace.workspaceFolders.length === 1) {
				repositoryPath = workspace.workspaceFolders[0].uri.fsPath;
J
Joao Moreno 已提交
583
				askToOpen = false;
J
Joao Moreno 已提交
584 585 586 587 588 589 590 591 592 593 594 595 596 597 598
			} 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 已提交
599 600
			}
		}
J
Joao Moreno 已提交
601

J
Joao Moreno 已提交
602
		if (!repositoryPath) {
J
Joao Moreno 已提交
603 604 605 606 607 608 609 610 611 612 613 614
			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 已提交
615

J
Joao Moreno 已提交
616
			if (!result || result.length === 0) {
J
Joao Moreno 已提交
617 618
				return;
			}
J
Joao Moreno 已提交
619 620 621 622 623 624 625 626 627 628 629 630

			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 已提交
631
			repositoryPath = uri.fsPath;
J
Joao Moreno 已提交
632 633 634 635

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

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

J
Joao Moreno 已提交
640 641 642 643
		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 已提交
644

J
Joao Moreno 已提交
645 646 647 648
		if (!askToOpen) {
			return;
		}

J
Joao Moreno 已提交
649 650
		const addToWorkspace = localize('add', "Add to Workspace");
		if (workspace.workspaceFolders) {
J
Joao Moreno 已提交
651
			message = localize('proposeopen2 init', "Would you like to open the initialized repository, or add it to the current workspace?");
J
Joao Moreno 已提交
652 653
			choices.push(addToWorkspace);
		}
I
Ivan Sučić 已提交
654 655

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

J
Joao Moreno 已提交
658 659 660 661
		if (result === open) {
			commands.executeCommand('vscode.openFolder', uri);
		} else if (result === addToWorkspace) {
			workspace.updateWorkspaceFolders(workspace.workspaceFolders!.length, 0, { uri });
662 663
		} else if (result === openNewWindow) {
			commands.executeCommand('vscode.openFolder', uri, true);
J
Joao Moreno 已提交
664 665
		} else {
			await this.model.openRepository(repositoryPath);
I
Ivan Sučić 已提交
666
		}
J
Joao Moreno 已提交
667 668
	}

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

J
Joao Moreno 已提交
680
			if (!result || result.length === 0) {
681 682 683
				return;
			}

J
Joao Moreno 已提交
684
			path = result[0].fsPath;
685
		}
J
Joao Moreno 已提交
686 687

		await this.model.openRepository(path);
688 689
	}

J
Joao Moreno 已提交
690 691 692 693 694
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

699
		let uris: Uri[] | undefined;
700 701

		if (arg instanceof Uri) {
J
Joao Moreno 已提交
702
			if (isGitUri(arg)) {
703
				uris = [Uri.file(fromGitUri(arg).path)];
704
			} else if (arg.scheme === 'file') {
705
				uris = [arg];
706 707 708 709 710 711
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
712
				resource = this.getSCMResource();
713 714 715
			}

			if (resource) {
J
Joao Moreno 已提交
716 717 718 719 720
				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];
721
			}
J
Joao Moreno 已提交
722 723
		}

724
		if (!uris) {
J
Joao Moreno 已提交
725
			return;
J
Joao Moreno 已提交
726 727
		}

728
		const activeTextEditor = window.activeTextEditor;
J
Joao Moreno 已提交
729

730 731
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
732
				preserveFocus,
J
Joao Moreno 已提交
733
				preview: false,
734
				viewColumn: ViewColumn.Active
735 736
			};

M
Micah Smith 已提交
737 738 739 740
			let document;
			try {
				document = await workspace.openTextDocument(uri);
			} catch (error) {
J
João Moreno 已提交
741
				await commands.executeCommand('vscode.open', uri, opts);
M
Micah Smith 已提交
742 743
				continue;
			}
E
Eric Gang 已提交
744

745 746 747
			// 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 已提交
748
				// preserve not only selection but also visible range
B
Benjamin Pasero 已提交
749
				opts.selection = activeTextEditor.selection;
E
Eric Gang 已提交
750 751 752 753
				const previousVisibleRanges = activeTextEditor.visibleRanges;
				const editor = await window.showTextDocument(document, opts);
				editor.revealRange(previousVisibleRanges[0]);
			} else {
J
João Moreno 已提交
754
				await commands.executeCommand('vscode.open', uri, opts);
B
Benjamin Pasero 已提交
755
			}
J
Joao Moreno 已提交
756
		}
J
Joao Moreno 已提交
757 758
	}

J
Joao Moreno 已提交
759 760 761 762 763
	@command('git.openFile2')
	async openFile2(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
		this.openFile(arg, ...resourceStates);
	}

J
Joao Moreno 已提交
764 765
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
766
		let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
767
		const preview = !(arg instanceof Resource);
D
Duroktar 已提交
768 769 770 771

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
772
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
773
		} else {
774
			resource = this.getSCMResource();
D
Duroktar 已提交
775 776 777 778 779 780
		}

		if (!resource) {
			return;
		}

J
Joao Moreno 已提交
781
		const HEAD = this.getLeftResource(resource);
782 783
		const basename = path.basename(resource.resourceUri.fsPath);
		const title = `${basename} (HEAD)`;
D
Duroktar 已提交
784

J
Joao Moreno 已提交
785 786 787
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
788
		}
J
Joao Moreno 已提交
789

J
Joao Moreno 已提交
790 791 792 793
		const opts: TextDocumentShowOptions = {
			preview
		};

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

J
Joao Moreno 已提交
797 798
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
799
		const preserveFocus = arg instanceof Resource;
J
Joao Moreno 已提交
800 801
		const preview = !(arg instanceof Resource);

J
Joao 已提交
802
		const preserveSelection = arg instanceof Uri || !arg;
803
		let resources: Resource[] | undefined = undefined;
804

805
		if (arg instanceof Uri) {
806
			const resource = this.getSCMResource(arg);
807 808 809
			if (resource !== undefined) {
				resources = [resource];
			}
810
		} else {
811
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
812

813 814 815
			if (arg instanceof Resource) {
				resource = arg;
			} else {
816
				resource = this.getSCMResource();
817 818 819 820 821
			}

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

824
		if (!resources) {
J
Joao Moreno 已提交
825
			return;
J
Joao Moreno 已提交
826
		}
J
Joao Moreno 已提交
827

828
		for (const resource of resources) {
J
Joao 已提交
829
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
830
		}
J
Joao Moreno 已提交
831 832
	}

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

837 838
		resourceStates = resourceStates.filter(s => !!s);

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

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

844 845 846 847 848 849 850
			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

851
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
852
		const { resolved, unresolved, deletionConflicts } = await categorizeResourceByResolution(selection);
853 854 855 856 857

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

859 860 861 862 863 864 865 866
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
867 868 869 870 871 872 873 874 875 876 877 878 879 880
		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 已提交
881
		const workingTree = selection.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
882 883
		const untracked = selection.filter(s => s.resourceGroupType === ResourceGroupType.Untracked);
		const scmResources = [...workingTree, ...untracked, ...resolved, ...unresolved];
884

J
Joao Moreno 已提交
885
		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
886
		if (!scmResources.length) {
J
Joao Moreno 已提交
887 888
			return;
		}
J
Joao Moreno 已提交
889

890
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
891
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
892 893
	}

J
Joao Moreno 已提交
894 895
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
P
Pascal Fong Kye 已提交
896 897
		const resources = [...repository.workingTreeGroup.resourceStates, ...repository.untrackedGroup.resourceStates];
		const uris = resources.map(r => r.resourceUri);
J
Joao Moreno 已提交
898

P
Pascal Fong Kye 已提交
899 900 901 902
		if (uris.length > 0) {
			const config = workspace.getConfiguration('git', Uri.file(repository.root));
			const untrackedChanges = config.get<'mixed' | 'separate' | 'hidden'>('untrackedChanges');
			await repository.add(uris, untrackedChanges === 'mixed' ? undefined : { update: true });
J
Joao Moreno 已提交
903
		}
J
Joao Moreno 已提交
904 905
	}

J
Joao Moreno 已提交
906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940
	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');
			}
		}
	}

941 942 943 944 945 946 947 948 949
	@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);
	}

950 951 952 953 954 955 956 957 958
	@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);
	}

959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995
	@command('git.stageAllMerge', { repository: true })
	async stageAllMerge(repository: Repository): Promise<void> {
		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
		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;
		}

		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?", 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));

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

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

		const uris = resources.map(r => r.resourceUri);

		if (uris.length > 0) {
			await repository.add(uris);
		}
	}

J
Joao Moreno 已提交
996
	@command('git.stageChange')
J
Joao Moreno 已提交
997 998 999 1000 1001 1002 1003 1004
	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 已提交
1005 1006
	}

J
Joao Moreno 已提交
1007
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
1008
	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
1009 1010 1011 1012 1013 1014 1015
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
1016 1017 1018 1019
		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 已提交
1020

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

J
Joao Moreno 已提交
1025 1026
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
1027

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

J
Joao Moreno 已提交
1032
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
1033 1034 1035
			return;
		}

J
Joao Moreno 已提交
1036
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
1037
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
1038
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
1039

J
Joao Moreno 已提交
1040
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
1041
	}
J
Joao Moreno 已提交
1042

J
Joao Moreno 已提交
1043
	@command('git.revertChange')
J
Joao Moreno 已提交
1044 1045 1046 1047
	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 已提交
1048 1049 1050
			return;
		}

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

J
Joao Moreno 已提交
1054
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
1055
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
1056 1057 1058 1059 1060 1061 1062
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
1063 1064
		const selections = textEditor.selections;
		const selectedChanges = changes.filter(change => {
J
Joao Moreno 已提交
1065
			const modifiedRange = getModifiedRange(modifiedDocument, change);
J
Joao Moreno 已提交
1066 1067 1068 1069
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
1070 1071 1072
			return;
		}

J
Joao Moreno 已提交
1073 1074
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
1075

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

J
Joao Moreno 已提交
1080
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
1081 1082 1083
			return;
		}

J
Joao Moreno 已提交
1084 1085
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
1086 1087
		const selectionsBeforeRevert = textEditor.selections;
		const visibleRangesBeforeRevert = textEditor.visibleRanges;
J
Joao Moreno 已提交
1088
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
1089

J
Joao Moreno 已提交
1090 1091 1092
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
1093

J
Joao Moreno 已提交
1094 1095
		await modifiedDocument.save();

1096 1097
		textEditor.selections = selectionsBeforeRevert;
		textEditor.revealRange(visibleRangesBeforeRevert[0]);
J
Joao Moreno 已提交
1098 1099
	}

J
Joao Moreno 已提交
1100 1101
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
1102 1103
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1104
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1105
			const resource = this.getSCMResource();
1106 1107 1108 1109 1110 1111 1112 1113

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

1117
		if (!scmResources.length) {
J
Joao Moreno 已提交
1118 1119 1120
			return;
		}

1121
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1122
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
1123 1124
	}

J
Joao Moreno 已提交
1125 1126
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
1127
		await repository.revert([]);
J
Joao Moreno 已提交
1128
	}
J
Joao Moreno 已提交
1129

J
Joao Moreno 已提交
1130 1131
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
1132 1133 1134 1135 1136 1137 1138 1139 1140
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

J
Joao Moreno 已提交
1141
		if (!isGitUri(modifiedUri)) {
1142 1143 1144 1145 1146 1147
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
1148 1149 1150
			return;
		}

J
Joao Moreno 已提交
1151
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
1152
		const originalDocument = await workspace.openTextDocument(originalUri);
1153 1154 1155 1156
		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 已提交
1157 1158 1159 1160 1161

		if (!selectedDiffs.length) {
			return;
		}

1162 1163
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
1164

J
Joao Moreno 已提交
1165
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
1166 1167
	}

J
Joao Moreno 已提交
1168 1169
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
1170 1171
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1172
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1173
			const resource = this.getSCMResource();
1174 1175 1176 1177 1178 1179 1180 1181

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

1182 1183
		const scmResources = resourceStates.filter(s => s instanceof Resource
			&& (s.resourceGroupType === ResourceGroupType.WorkingTree || s.resourceGroupType === ResourceGroupType.Untracked)) as Resource[];
1184

J
Joao Moreno 已提交
1185
		if (!scmResources.length) {
J
Joao Moreno 已提交
1186 1187
			return;
		}
J
Joao Moreno 已提交
1188

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

J
Joao Moreno 已提交
1193
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
1194
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
1195
				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 已提交
1196 1197
				yes = localize('delete file', "Delete file");
			} else {
1198 1199 1200 1201 1202 1203
				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 已提交
1204 1205
			}
		} else {
1206 1207 1208 1209 1210 1211
			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 已提交
1212 1213

			if (untrackedCount > 0) {
J
Joao Moreno 已提交
1214
				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 已提交
1215 1216
			}
		}
1217

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

J
Joao Moreno 已提交
1220 1221 1222 1223
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
1224
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1225
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
1226
	}
J
Joao Moreno 已提交
1227

J
Joao Moreno 已提交
1228 1229
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1230
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
1231 1232 1233 1234 1235

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

J
Joao Moreno 已提交
1236 1237
		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 已提交
1238

J
Joao Moreno 已提交
1239
		if (untrackedResources.length === 0) {
1240
			await this._cleanTrackedChanges(repository, resources);
1241 1242
		} else if (resources.length === 1) {
			await this._cleanUntrackedChange(repository, resources[0]);
J
Joao Moreno 已提交
1243
		} else if (trackedResources.length === 0) {
1244
			await this._cleanUntrackedChanges(repository, resources);
J
Joao Moreno 已提交
1245 1246 1247 1248
		} 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 已提交
1249

J
Joao Moreno 已提交
1250 1251 1252 1253 1254
			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 已提交
1255

J
Joao Moreno 已提交
1256
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1257 1258 1259 1260 1261 1262 1263 1264
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
1265
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1266
		}
J
Joao Moreno 已提交
1267 1268
	}

1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280
	@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);
	}

1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296
	@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);
		}
	}

1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312
	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));
	}

1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336
	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 已提交
1337
	private async smartCommit(
J
Joao Moreno 已提交
1338
		repository: Repository,
1339
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
1340 1341
		opts?: CommitOptions
	): Promise<boolean> {
1342
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
1343
		let promptToSaveFilesBeforeCommit = config.get<'always' | 'staged' | 'never'>('promptToSaveFilesBeforeCommit');
J
Joao Moreno 已提交
1344

1345 1346 1347 1348 1349 1350 1351
		// migration
		if (promptToSaveFilesBeforeCommit as any === true) {
			promptToSaveFilesBeforeCommit = 'always';
		} else if (promptToSaveFilesBeforeCommit as any === false) {
			promptToSaveFilesBeforeCommit = 'never';
		}

J
Joao Moreno 已提交
1352
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
J
Joao Moreno 已提交
1353 1354 1355
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
J
Joao Moreno 已提交
1356

1357 1358 1359 1360
		if (promptToSaveFilesBeforeCommit !== 'never') {
			let documents = workspace.textDocuments
				.filter(d => !d.isUntitled && d.isDirty && isDescendant(repository.root, d.uri.fsPath));

J
Joao Moreno 已提交
1361
			if (promptToSaveFilesBeforeCommit === 'staged' || repository.indexGroup.resourceStates.length > 0) {
1362
				documents = documents
J
Joao Moreno 已提交
1363
					.filter(d => repository.indexGroup.resourceStates.some(s => pathEquals(s.resourceUri.fsPath, d.uri.fsPath)));
1364
			}
1365

1366 1367
			if (documents.length > 0) {
				const message = documents.length === 1
J
Joao Moreno 已提交
1368
					? 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 已提交
1369
					: localize('unsaved files', "There are {0} unsaved files.\n\nWould you like to save them before committing?", documents.length);
J
Joao Moreno 已提交
1370 1371 1372 1373 1374
				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) {
1375
					await Promise.all(documents.map(d => d.save()));
J
Joao Moreno 已提交
1376
					await repository.add(documents.map(d => d.uri));
J
Joao Moreno 已提交
1377 1378 1379
				} else if (pick !== commit) {
					return false; // do not commit on cancel
				}
1380 1381 1382
			}
		}

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

1387 1388 1389 1390
			if (!suggestSmartCommit) {
				return false;
			}

J
Joao Moreno 已提交
1391 1392
			// 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?");
1393 1394
			const yes = localize('yes', "Yes");
			const always = localize('always', "Always");
1395 1396
			const never = localize('never', "Never");
			const pick = await window.showWarningMessage(message, { modal: true }, yes, always, never);
1397 1398

			if (pick === always) {
J
Joao Moreno 已提交
1399
				config.update('enableSmartCommit', true, true);
1400 1401 1402
			} else if (pick === never) {
				config.update('suggestSmartCommit', false, true);
				return false;
J
Joao Moreno 已提交
1403 1404
			} else if (pick !== yes) {
				return false; // do not commit on cancel
1405 1406 1407
			}
		}

J
Joao Moreno 已提交
1408
		if (!opts) {
1409
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
1410 1411
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
1412 1413
		}

1414 1415 1416
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

1417 1418 1419 1420
		if (config.get<boolean>('alwaysSignOff')) {
			opts.signoff = true;
		}

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

J
Joao Moreno 已提交
1423
		if (
1424
			(
J
Joao Moreno 已提交
1425 1426 1427 1428
				// no changes
				(noStagedChanges && noUnstagedChanges)
				// or no staged changes and not `all`
				|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
1429 1430
				// no staged changes and no tracked unstaged changes
				|| (noStagedChanges && smartCommitChanges === 'tracked' && repository.workingTreeGroup.resourceStates.every(r => r.type === Status.UNTRACKED))
J
Joao Moreno 已提交
1431
			)
1432
			&& !opts.empty
J
Joao Moreno 已提交
1433
		) {
J
Joao Moreno 已提交
1434 1435 1436 1437
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1438
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1439 1440 1441 1442 1443

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
1444
		if (opts.all && smartCommitChanges === 'tracked') {
J
Joao Moreno 已提交
1445
			opts.all = 'tracked';
1446 1447
		}

1448
		if (opts.all && config.get<'mixed' | 'separate' | 'hidden'>('untrackedChanges') !== 'mixed') {
1449
			opts.all = 'tracked';
J
Joao Moreno 已提交
1450 1451
		}

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

J
Joao Moreno 已提交
1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464
		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 已提交
1465 1466 1467
		return true;
	}

J
Joao Moreno 已提交
1468
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1469
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1470
		const getCommitMessage = async () => {
1471
			let _message: string | undefined = message;
1472

1473 1474
			if (!_message) {
				let value: string | undefined = undefined;
J
Joao Moreno 已提交
1475

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

1480 1481
				const branchName = repository.headShortName;
				let placeHolder: string;
1482

1483 1484 1485 1486 1487
				if (branchName) {
					placeHolder = localize('commitMessageWithHeadLabel2', "Message (commit on '{0}')", branchName);
				} else {
					placeHolder = localize('commit message', "Commit message");
				}
J
Joao Moreno 已提交
1488

1489 1490
				_message = await window.showInputBox({
					value,
1491
					placeHolder,
1492 1493 1494
					prompt: localize('provide commit message', "Please provide a commit message"),
					ignoreFocusOut: true
				});
A
💄  
al 已提交
1495
			}
J
Joao Moreno 已提交
1496

1497
			return _message;
J
Joao Moreno 已提交
1498 1499
		};

J
Joao Moreno 已提交
1500
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1501 1502

		if (message && didCommit) {
J
Joao Moreno 已提交
1503
			repository.inputBox.value = await repository.getInputTemplate();
J
Joao Moreno 已提交
1504
		}
J
Joao Moreno 已提交
1505 1506
	}

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

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

J
Joao Moreno 已提交
1517
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
1518 1519
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
1520 1521
	}

J
Joao Moreno 已提交
1522
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
1523
	async commitStagedAmend(repository: Repository): Promise<void> {
1524
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
1525 1526
	}

J
Joao Moreno 已提交
1527
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
1528 1529
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
1530 1531
	}

J
Joao Moreno 已提交
1532
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1533 1534
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1535 1536
	}

J
Joao Moreno 已提交
1537
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
1538 1539
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
1540 1541
	}

J
Joao Moreno 已提交
1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563
	@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 已提交
1564 1565 1566 1567 1568
	@command('git.restoreCommitTemplate', { repository: true })
	async restoreCommitTemplate(repository: Repository): Promise<void> {
		repository.inputBox.value = await repository.getCommitTemplate();
	}

J
Joao Moreno 已提交
1569
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
1570 1571
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1572 1573

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

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

1580 1581
		if (commit.parents.length > 1) {
			const yes = localize('undo commit', "Undo merge commit");
J
Joao Moreno 已提交
1582
			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);
1583 1584 1585 1586 1587 1588

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

J
Joao Moreno 已提交
1589
		if (commit.parents.length > 0) {
1590 1591 1592 1593 1594
			await repository.reset('HEAD~');
		} else {
			await repository.deleteRef('HEAD');
			await this.unstageAll(repository);
		}
J
Joao Moreno 已提交
1595

J
Joao Moreno 已提交
1596
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1597 1598
	}

J
Joao Moreno 已提交
1599
	@command('git.checkout', { repository: true })
1600
	async checkout(repository: Repository, treeish: string): Promise<boolean> {
J
Joao Moreno 已提交
1601
		if (typeof treeish === 'string') {
1602 1603
			await repository.checkout(treeish);
			return true;
J
Joao Moreno 已提交
1604
		}
J
Joao Moreno 已提交
1605

J
Joao Moreno 已提交
1606 1607 1608
		const createBranch = new CreateBranchItem(this);
		const createBranchFrom = new CreateBranchFromItem(this);
		const picks = [createBranch, createBranchFrom, ...createCheckoutItems(repository)];
1609
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
1610 1611 1612 1613 1614 1615 1616 1617

		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 已提交
1618 1619

		if (!choice) {
1620
			return false;
J
Joao Moreno 已提交
1621 1622
		}

1623 1624
		if (choice === createBranch) {
			await this._branch(repository, quickpick.value);
J
Joao Moreno 已提交
1625 1626
		} else if (choice === createBranchFrom) {
			await this._branch(repository, quickpick.value, true);
1627 1628 1629 1630
		} else {
			await (choice as CheckoutItem).run(repository);
		}

1631
		return true;
J
Joao Moreno 已提交
1632 1633
	}

J
Joao Moreno 已提交
1634
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1635
	async branch(repository: Repository): Promise<void> {
1636 1637
		await this._branch(repository);
	}
J
Joao Moreno 已提交
1638

J
Joao Moreno 已提交
1639 1640 1641 1642 1643
	@command('git.branchFrom', { repository: true })
	async branchFrom(repository: Repository): Promise<void> {
		await this._branch(repository, undefined, true);
	}

1644
	private async promptForBranchName(defaultName?: string, initialValue?: string): Promise<string> {
1645 1646 1647 1648
		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 已提交
1649
			name.trim().replace(/^-+/, '').replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, branchWhitespaceChar)
1650 1651
			: name;

J
Joao Moreno 已提交
1652
		const rawBranchName = defaultName || await window.showInputBox({
1653
			placeHolder: localize('branch name', "Branch name"),
1654
			prompt: localize('provide branch name', "Please provide a new branch name"),
1655
			value: initialValue,
1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666
			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 已提交
1667 1668 1669 1670 1671
		return sanitize(rawBranchName || '');
	}

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

		if (!branchName) {
1674 1675
			return;
		}
J
Joao Moreno 已提交
1676

J
Joao Moreno 已提交
1677
		let target = 'HEAD';
J
Joao Moreno 已提交
1678

J
Joao Moreno 已提交
1679 1680 1681 1682 1683 1684 1685 1686 1687 1688
		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 已提交
1689
		}
J
Joao Moreno 已提交
1690

J
Joao Moreno 已提交
1691
		await repository.branch(branchName, true, target);
J
Joao Moreno 已提交
1692 1693
	}

J
Joao Moreno 已提交
1694
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1695
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1696 1697
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1698
			run = force => repository.deleteBranch(name, force);
1699
		} else {
J
Joao Moreno 已提交
1700 1701
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1702
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1703

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

M
Maik Riechert 已提交
1707
			if (!choice || !choice.branchName) {
1708 1709
				return;
			}
M
Maik Riechert 已提交
1710
			name = choice.branchName;
J
Joao Moreno 已提交
1711
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1712 1713
		}

1714 1715 1716 1717 1718 1719 1720 1721 1722
		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");
1723
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1724 1725 1726 1727 1728

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

1731 1732
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
1733 1734
		const currentBranchName = repository.HEAD && repository.HEAD.name;
		const branchName = await this.promptForBranchName(undefined, currentBranchName);
J
Justin Horner 已提交
1735

J
Joao Moreno 已提交
1736
		if (!branchName) {
J
Justin Horner 已提交
1737 1738 1739 1740
			return;
		}

		try {
J
Joao Moreno 已提交
1741
			await repository.renameBranch(branchName);
J
Justin Horner 已提交
1742 1743 1744
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1745 1746
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1747
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1748
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", branchName));
1749 1750 1751
					return;
				default:
					throw err;
J
Justin Horner 已提交
1752 1753 1754 1755
			}
		}
	}

J
Joao Moreno 已提交
1756
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1757
	async merge(repository: Repository): Promise<void> {
1758 1759 1760 1761
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1762
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1763 1764
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1765

J
Joao Moreno 已提交
1766
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1767 1768
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1769 1770

		const picks = [...heads, ...remoteHeads];
1771 1772
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1773 1774 1775 1776 1777

		if (!choice) {
			return;
		}

1778
		await choice.run(repository);
1779 1780
	}

J
Joao Moreno 已提交
1781
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1782
	async createTag(repository: Repository): Promise<void> {
1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794
		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 已提交
1795
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1796 1797 1798 1799 1800
			ignoreFocusOut: true
		});

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

X
Xhulio Hasani 已提交
1804 1805
	@command('git.deleteTag', { repository: true })
	async deleteTag(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1806 1807 1808 1809
		const picks = repository.refs.filter(ref => ref.type === RefType.Tag)
			.map(ref => new TagItem(ref));

		if (picks.length === 0) {
1810
			window.showWarningMessage(localize('no tags', "This repository has no tags."));
J
Joao Moreno 已提交
1811
			return;
1812
		}
J
Joao Moreno 已提交
1813

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

1817
		if (!choice) {
X
Xhulio Hasani 已提交
1818 1819
			return;
		}
J
Joao Moreno 已提交
1820 1821

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

J
Joao Moreno 已提交
1824 1825 1826 1827 1828 1829 1830
	@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 已提交
1831
		await repository.fetchDefault();
J
Joao Moreno 已提交
1832 1833
	}

R
Ryan Scott 已提交
1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844
	@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 已提交
1845 1846 1847 1848 1849 1850 1851 1852 1853 1854
	@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 已提交
1855
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1856 1857
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1858 1859 1860 1861 1862 1863

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

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

D
Dozed12 已提交
1868
		if (!remotePick) {
1869 1870 1871
			return;
		}

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

D
Dozed12 已提交
1878
		if (!branchPick) {
1879 1880 1881
			return;
		}

F
Francisco Moreira 已提交
1882 1883
		const remoteCharCnt = remotePick.label.length;

1884
		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1885 1886
	}

J
Joao Moreno 已提交
1887
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1888 1889
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1890 1891 1892 1893 1894 1895

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

J
Joao Moreno 已提交
1896
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1897 1898
	}

J
Joao Moreno 已提交
1899
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1900 1901
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1902 1903 1904 1905 1906 1907

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

J
Joao Moreno 已提交
1908
		await repository.pullWithRebase(repository.HEAD);
J
Joao Moreno 已提交
1909 1910
	}

J
Joao Moreno 已提交
1911
	private async _push(repository: Repository, pushOptions: PushOptions) {
J
Joao Moreno 已提交
1912
		const remotes = repository.remotes;
1913

J
Joao Moreno 已提交
1914
		if (remotes.length === 0) {
J
João Moreno 已提交
1915 1916
			if (pushOptions.silent) {
				return;
J
Joao Moreno 已提交
1917
			}
J
João Moreno 已提交
1918 1919 1920 1921 1922 1923 1924 1925

			const addRemote = localize('addremote', 'Add Remote');
			const result = await window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."), addRemote);

			if (result === addRemote) {
				await this.addRemote(repository);
			}

J
Joao Moreno 已提交
1926 1927
			return;
		}
1928

J
Joao Moreno 已提交
1929 1930 1931 1932 1933 1934
		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."));
1935 1936
				return;
			}
J
Joao Moreno 已提交
1937

J
Joao Moreno 已提交
1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951
			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 已提交
1952 1953
		}

1954 1955
		if (pushOptions.pushType === PushType.PushFollowTags) {
			await repository.pushFollowTags(undefined, forcePushMode);
1956 1957 1958
			return;
		}

1959
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1960 1961 1962
			if (!pushOptions.silent) {
				window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			}
1963 1964 1965
			return;
		}

1966 1967 1968 1969 1970 1971 1972
		if (pushOptions.pushType === PushType.Push) {
			try {
				await repository.push(repository.HEAD, forcePushMode);
			} catch (err) {
				if (err.gitErrorCode !== GitErrorCodes.NoUpstreamBranch) {
					throw err;
				}
1973

J
Joao Moreno 已提交
1974 1975 1976 1977
				if (pushOptions.silent) {
					return;
				}

1978 1979 1980 1981 1982 1983 1984 1985 1986 1987
				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 {
1988
			const branchName = repository.HEAD.name;
J
Joao Moreno 已提交
1989 1990
			const addRemote = new AddRemoteItem(this);
			const picks = [...remotes.filter(r => r.pushUrl !== undefined).map(r => ({ label: r.name, description: r.pushUrl })), addRemote];
1991
			const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
J
Joao Moreno 已提交
1992
			const choice = await window.showQuickPick(picks, { placeHolder });
1993

J
Joao Moreno 已提交
1994
			if (!choice) {
1995
				return;
1996
			}
1997

J
Joao Moreno 已提交
1998 1999 2000 2001 2002 2003 2004 2005 2006
			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);
			}
2007
		}
J
Joao Moreno 已提交
2008 2009
	}

2010 2011
	@command('git.push', { repository: true })
	async push(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
2012
		await this._push(repository, { pushType: PushType.Push });
2013
	}
2014

2015 2016
	@command('git.pushForce', { repository: true })
	async pushForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
2017
		await this._push(repository, { pushType: PushType.Push, forcePush: true });
2018
	}
2019

2020
	@command('git.pushWithTags', { repository: true })
2021 2022
	async pushFollowTags(repository: Repository): Promise<void> {
		await this._push(repository, { pushType: PushType.PushFollowTags });
2023
	}
2024

2025
	@command('git.pushWithTagsForce', { repository: true })
2026 2027
	async pushFollowTagsForce(repository: Repository): Promise<void> {
		await this._push(repository, { pushType: PushType.PushFollowTags, forcePush: true });
2028 2029
	}

2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044
	@command('git.cherryPick', { repository: true })
	async cherryPick(repository: Repository): Promise<void> {
		const inputCommitHash = await window.showInputBox({
			placeHolder: localize('commit hash', "Commit Hash"),
			prompt: localize('provide commit hash', "Please provide the commit hash"),
			ignoreFocusOut: true
		});

		if (!inputCommitHash) {
			return;
		}

		await repository.cherryPick(inputCommitHash);
	}

J
Joao Moreno 已提交
2045
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
2046
	async pushTo(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
2047
		await this._push(repository, { pushType: PushType.PushTo });
2048
	}
J
Joao Moreno 已提交
2049

2050 2051
	@command('git.pushToForce', { repository: true })
	async pushToForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
2052
		await this._push(repository, { pushType: PushType.PushTo, forcePush: true });
J
Joao Moreno 已提交
2053 2054
	}

O
Omkar Manjrekar 已提交
2055
	@command('git.addRemote', { repository: true })
2056
	async addRemote(repository: Repository): Promise<string | undefined> {
2057 2058 2059 2060
		const url = await pickRemoteSource(this.model, {
			providerLabel: provider => localize('addfrom', "Add remote from {0}", provider.name),
			urlLabel: localize('addFrom', "Add remote from URL")
		});
J
João Moreno 已提交
2061 2062 2063 2064 2065

		if (!url) {
			return;
		}

O
Omkar Manjrekar 已提交
2066
		const resultName = await window.showInputBox({
O
Omkar Manjrekar 已提交
2067 2068 2069 2070
			placeHolder: localize('remote name', "Remote name"),
			prompt: localize('provide remote name', "Please provide a remote name"),
			ignoreFocusOut: true,
			validateInput: (name: string) => {
J
João Moreno 已提交
2071 2072 2073 2074
				if (!sanitizeRemoteName(name)) {
					return localize('remote name format invalid', "Remote name format invalid");
				} else if (repository.remotes.find(r => r.name === name)) {
					return localize('remote already exists', "Remote '{0}' already exists.", name);
O
Omkar Manjrekar 已提交
2075
				}
J
João Moreno 已提交
2076 2077

				return null;
O
Omkar Manjrekar 已提交
2078
			}
O
Omkar Manjrekar 已提交
2079
		});
O
Omkar Manjrekar 已提交
2080

J
João Moreno 已提交
2081
		const name = sanitizeRemoteName(resultName || '');
O
Omkar Manjrekar 已提交
2082

O
Omkar Manjrekar 已提交
2083 2084 2085 2086
		if (!name) {
			return;
		}

O
Omkar Manjrekar 已提交
2087
		await repository.addRemote(name, url);
2088
		return name;
O
Omkar Manjrekar 已提交
2089 2090
	}

O
Omkar Manjrekar 已提交
2091 2092
	@command('git.removeRemote', { repository: true })
	async removeRemote(repository: Repository): Promise<void> {
O
Omkar Manjrekar 已提交
2093 2094 2095
		const remotes = repository.remotes;

		if (remotes.length === 0) {
2096
			window.showErrorMessage(localize('no remotes added', "Your repository has no remotes."));
O
Omkar Manjrekar 已提交
2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107
			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 已提交
2108

O
Omkar Manjrekar 已提交
2109
		await repository.removeRemote(remoteName);
O
Omkar Manjrekar 已提交
2110
	}
O
Omkar Manjrekar 已提交
2111

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

2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125
		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 已提交
2126 2127 2128
			return;
		}

J
Joao Moreno 已提交
2129 2130 2131 2132
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
2133
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
2134
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
2135 2136

		if (shouldPrompt) {
J
Joao Moreno 已提交
2137
			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 已提交
2138
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
2139
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
2140 2141 2142 2143 2144 2145 2146 2147 2148
			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 已提交
2149
		if (rebase) {
J
Joao Moreno 已提交
2150
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
2151
		} else {
J
Joao Moreno 已提交
2152
			await repository.sync(HEAD);
J
Joao Moreno 已提交
2153 2154 2155 2156
		}
	}

	@command('git.sync', { repository: true })
2157 2158 2159 2160 2161 2162 2163 2164 2165 2166
	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 已提交
2167 2168
	}

J
Joao 已提交
2169 2170 2171 2172 2173 2174 2175 2176 2177
	@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 已提交
2178
			await repository.sync(HEAD);
J
Joao 已提交
2179 2180 2181
		}));
	}

2182
	@command('git.syncRebase', { repository: true })
2183 2184 2185 2186 2187 2188 2189 2190 2191 2192
	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 已提交
2193 2194
	}

J
Joao Moreno 已提交
2195
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
2196
	async publish(repository: Repository): Promise<void> {
J
João Moreno 已提交
2197
		const branchName = repository.HEAD && repository.HEAD.name || '';
J
Joao Moreno 已提交
2198
		const remotes = repository.remotes;
J
Joao Moreno 已提交
2199 2200

		if (remotes.length === 0) {
J
João Moreno 已提交
2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225
			const providers = this.model.getRemoteProviders().filter(p => !!p.publishRepository);

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

			let provider: RemoteSourceProvider;

			if (providers.length === 1) {
				provider = providers[0];
			} else {
				const picks = providers
					.map(provider => ({ label: (provider.icon ? `$(${provider.icon}) ` : '') + localize('publish to', "Publish to {0}", provider.name), alwaysShow: true, provider }));
				const placeHolder = localize('pick provider', "Pick a provider to publish the branch '{0}' to:", branchName);
				const choice = await window.showQuickPick(picks, { placeHolder });

				if (!choice) {
					return;
				}

				provider = choice.provider;
			}

			await provider.publishRepository!(new ApiRepository(repository));
J
Joao Moreno 已提交
2226 2227 2228
			return;
		}

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

2233
		const addRemote = new AddRemoteItem(this);
J
Joao Moreno 已提交
2234
		const picks = [...repository.remotes.map(r => ({ label: r.name, description: r.pushUrl })), addRemote];
2235 2236
		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 已提交
2237 2238 2239 2240 2241

		if (!choice) {
			return;
		}

2242 2243 2244 2245
		if (choice === addRemote) {
			const newRemote = await this.addRemote(repository);

			if (newRemote) {
J
Joao Moreno 已提交
2246
				await repository.pushTo(newRemote, branchName, true);
2247
			}
J
Joao Moreno 已提交
2248 2249
		} else {
			await repository.pushTo(choice.label, branchName, true);
2250
		}
J
Joao Moreno 已提交
2251 2252
	}

2253 2254
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
2255 2256
		resourceStates = resourceStates.filter(s => !!s);

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

2260
			if (!resource) {
J
Joao Moreno 已提交
2261 2262 2263
				return;
			}

2264
			resourceStates = [resource];
J
Joao Moreno 已提交
2265 2266
		}

2267
		const resources = resourceStates
J
Joao Moreno 已提交
2268 2269 2270
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

2271
		if (!resources.length) {
N
NKumar2 已提交
2272 2273 2274
			return;
		}

2275
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
2276 2277
	}

J
Joao Moreno 已提交
2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290
	@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 已提交
2291
	private async _stash(repository: Repository, includeUntracked = false): Promise<void> {
2292 2293
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0
			&& (!includeUntracked || repository.untrackedGroup.resourceStates.length === 0);
2294
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
2295

2296
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
2297 2298 2299
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
2300

2301
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
2302 2303 2304 2305 2306

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

J
Joao Moreno 已提交
2307
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
2308 2309
	}

2310 2311 2312 2313 2314 2315 2316
	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 已提交
2317 2318 2319 2320 2321 2322 2323 2324 2325 2326
	@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 已提交
2327
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
2328
	async stashPop(repository: Repository): Promise<void> {
2329
		const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
J
Joao Moreno 已提交
2330
		const stash = await this.pickStash(repository, placeHolder);
2331

J
Joao Moreno 已提交
2332
		if (!stash) {
2333 2334 2335
			return;
		}

J
Joao Moreno 已提交
2336
		await repository.popStash(stash.index);
2337 2338 2339 2340
	}

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

J
Joao Moreno 已提交
2343 2344
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
2345 2346 2347
			return;
		}

2348 2349 2350 2351 2352 2353
		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 已提交
2354
		const stash = await this.pickStash(repository, placeHolder);
K
Krzysztof Cieślak 已提交
2355

J
Joao Moreno 已提交
2356
		if (!stash) {
K
Krzysztof Cieślak 已提交
2357 2358
			return;
		}
J
Joao Moreno 已提交
2359

J
Joao Moreno 已提交
2360
		await repository.applyStash(stash.index);
K
Krzysztof Cieślak 已提交
2361 2362
	}

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

J
Joao Moreno 已提交
2367 2368
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
2369 2370 2371 2372 2373 2374
			return;
		}

		await repository.applyStash();
	}

2375 2376
	@command('git.stashDrop', { repository: true })
	async stashDrop(repository: Repository): Promise<void> {
2377 2378 2379 2380 2381 2382 2383 2384 2385 2386
		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 已提交
2387
	private async pickStash(repository: Repository, placeHolder: string): Promise<Stash | undefined> {
2388 2389
		const stashes = await repository.getStashes();

J
Joao Moreno 已提交
2390 2391
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
2392 2393 2394
			return;
		}

J
Joao Moreno 已提交
2395 2396 2397
		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 已提交
2398
	}
K
Krzysztof Cieślak 已提交
2399

2400 2401
	@command('git.timeline.openDiff', { repository: false })
	async timelineOpenDiff(item: TimelineItem, uri: Uri | undefined, _source: string) {
E
Eric Amodio 已提交
2402
		if (uri === undefined || uri === null || !GitTimelineItem.is(item)) {
2403 2404 2405
			return undefined;
		}

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

2408
		let title;
2409
		if ((item.previousRef === 'HEAD' || item.previousRef === '~') && item.ref === '') {
E
Eric Amodio 已提交
2410
			title = localize('git.title.workingTree', '{0} (Working Tree)', basename);
2411
		}
2412
		else if (item.previousRef === 'HEAD' && item.ref === '~') {
E
Eric Amodio 已提交
2413
			title = localize('git.title.index', '{0} (Index)', basename);
2414
		} else {
2415
			title = localize('git.title.diffRefs', '{0} ({1}) ⟷ {0} ({2})', basename, item.shortPreviousRef, item.shortRef);
2416 2417
		}

E
Eric Amodio 已提交
2418 2419 2420 2421 2422 2423 2424
		const options: TextDocumentShowOptions = {
			preserveFocus: true,
			preview: true,
			viewColumn: ViewColumn.Active
		};

		return commands.executeCommand('vscode.diff', toGitUri(uri, item.previousRef), item.ref === '' ? uri : toGitUri(uri, item.ref), title, options);
2425 2426 2427 2428 2429 2430
	}

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

2433
		env.clipboard.writeText(item.ref);
2434 2435
	}

2436 2437 2438 2439 2440 2441 2442 2443 2444
	@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);
	}

2445 2446 2447 2448
	@command('git.rebaseAbort', { repository: true })
	async rebaseAbort(repository: Repository): Promise<void> {
		await repository.rebaseAbort();
	}
2449

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

J
Joao Moreno 已提交
2454
			if (!options.repository) {
J
Joao Moreno 已提交
2455 2456
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
2457 2458
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
2459 2460 2461 2462 2463 2464 2465 2466 2467
				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();
				}
2468

J
Joao Moreno 已提交
2469
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
2470
					if (!repository) {
J
Joao 已提交
2471
						return Promise.resolve();
J
Joao Moreno 已提交
2472 2473
					}

J
Joao Moreno 已提交
2474
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
2475
				});
J
Joao Moreno 已提交
2476 2477
			}

K
kieferrm 已提交
2478
			/* __GDPR__
K
kieferrm 已提交
2479 2480 2481 2482
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
2483 2484
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
2485
			return result.catch(async err => {
J
Joao Moreno 已提交
2486
				const options: MessageOptions = {
2487
					modal: true
J
Joao Moreno 已提交
2488 2489
				};

J
Joao Moreno 已提交
2490
				let message: string;
2491
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
2492

J
Joao Moreno 已提交
2493 2494 2495 2496 2497
				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 已提交
2498
				switch (err.gitErrorCode) {
2499
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
2500 2501
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
2502
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
2503
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
2504
						break;
2505 2506 2507 2508 2509
					case GitErrorCodes.Conflict:
						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
						type = 'warning';
						options.modal = false;
						break;
J
Joao Moreno 已提交
2510 2511 2512 2513 2514
					case GitErrorCodes.StashConflict:
						message = localize('stash merge conflicts', "There were merge conflicts while applying the stash.");
						type = 'warning';
						options.modal = false;
						break;
2515 2516 2517 2518 2519 2520 2521 2522
					case GitErrorCodes.AuthenticationFailed:
						const regex = /Authentication failed for '(.*)'/i;
						const match = regex.exec(err.stderr || String(err));

						message = match
							? localize('auth failed specific', "Failed to authenticate to git remote:\n\n{0}", match[1])
							: localize('auth failed', "Failed to authenticate to git remote.");
						break;
2523 2524
					case GitErrorCodes.NoUserNameConfigured:
					case GitErrorCodes.NoUserEmailConfigured:
J
Joao Moreno 已提交
2525 2526
						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')));
2527
						break;
J
Joao Moreno 已提交
2528
					default:
2529 2530 2531
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
2532
							.split(/[\r\n]/)
J
João Moreno 已提交
2533
							.filter((line: string) => !!line)
2534 2535 2536 2537 2538
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
2539 2540 2541 2542 2543 2544 2545 2546 2547

						break;
				}

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

J
Joao Moreno 已提交
2548 2549 2550 2551 2552 2553 2554
				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 已提交
2555

J
Joao Moreno 已提交
2556 2557 2558
					if (resultFn) {
						resultFn();
					}
J
Joao Moreno 已提交
2559 2560 2561
				}
			});
		};
2562 2563

		// patch this object, so people can call methods directly
2564
		(this as any)[key] = result;
2565 2566

		return result;
J
Joao Moreno 已提交
2567 2568
	}

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

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

J
Joao Moreno 已提交
2574 2575 2576
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
2577

J
Joao Moreno 已提交
2578
		if (!uri) {
2579
			return undefined;
J
Joao Moreno 已提交
2580 2581
		}

J
Joao Moreno 已提交
2582
		if (isGitUri(uri)) {
J
Joao Moreno 已提交
2583 2584
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
2585 2586 2587 2588
		}

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

J
Joao Moreno 已提交
2591
			if (!repository) {
2592 2593
				return undefined;
			}
J
Joao Moreno 已提交
2594

J
Joao Moreno 已提交
2595 2596
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
2597
		}
2598
		return undefined;
J
Joao Moreno 已提交
2599 2600
	}

J
Joao Moreno 已提交
2601
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
2602 2603 2604 2605 2606 2607
	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) => {
2608
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
2609 2610 2611 2612 2613 2614

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

2615
			// Could it be a submodule?
2616
			if (pathEquals(resource.fsPath, repository.root)) {
2617 2618 2619
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
2620
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636

			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 已提交
2637 2638 2639
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
2640
}