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

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

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

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

		if (!ref) {
			return;
		}

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

class CheckoutTagItem extends CheckoutItem {

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

class CheckoutRemoteHeadItem extends CheckoutItem {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	constructor(private cc: CommandCenter) { }

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

	get alwaysShow(): boolean { return true; }

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

J
Joao Moreno 已提交
127 128 129 130 131 132 133 134 135
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; }
}

136 137 138 139
class AddRemoteItem implements QuickPickItem {

	constructor(private cc: CommandCenter) { }

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

	get alwaysShow(): boolean { return true; }

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

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

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

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

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

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

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

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

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

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

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

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

J
Joao Moreno 已提交
217 218 219 220
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) { }
221 222
}

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

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

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

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

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

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

J
Joao Moreno 已提交
256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285
	@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 已提交
286 287
	@command('git.refresh', { repository: true })
	async refresh(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
288
		await repository.status();
J
Joao Moreno 已提交
289
	}
J
Joao Moreno 已提交
290

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

		if (!repository) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

				if (!repository) {
					return;
				}

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

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

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

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

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

		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
D
Darrien Singleton 已提交
431
			case Status.INDEX_ADDED:
J
Joao Moreno 已提交
432 433 434
				return `${basename} (Index)`;

			case Status.MODIFIED:
M
Marc Kassay 已提交
435 436
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
437
				return `${basename} (Working Tree)`;
J
Joao Moreno 已提交
438 439 440 441 442 443

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

			case Status.DELETED_BY_THEM:
				return `${basename} (Ours)`;
D
Darrien Singleton 已提交
444 445 446 447

			case Status.UNTRACKED:

				return `${basename} (Untracked)`;
J
Joao Moreno 已提交
448 449 450 451 452
		}

		return '';
	}

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

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

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

474 475 476 477 478 479 480 481 482 483 484 485
		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 已提交
486

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

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

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

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

J
Joao Moreno 已提交
513 514 515 516
			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];
517 518 519

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

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

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

			const uri = Uri.file(repositoryPath);

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

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

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

J
Joao Moreno 已提交
572
		if (workspace.workspaceFolders) {
J
Joao Moreno 已提交
573
			const placeHolder = localize('init', "Pick workspace folder to initialize git repo in");
J
Joao Moreno 已提交
574 575 576 577 578
			const pick = { label: localize('choose', "Choose Folder...") };
			const items: { label: string, folder?: WorkspaceFolder }[] = [
				...workspace.workspaceFolders.map(folder => ({ label: folder.name, description: folder.uri.fsPath, folder })),
				pick
			];
J
Joao Moreno 已提交
579 580 581 582
			const item = await window.showQuickPick(items, { placeHolder, ignoreFocusOut: true });

			if (!item) {
				return;
J
Joao Moreno 已提交
583 584
			} else if (item.folder) {
				repositoryPath = item.folder.uri.fsPath;
J
Joao Moreno 已提交
585
				askToOpen = false;
J
Joao Moreno 已提交
586 587
			}
		}
J
Joao Moreno 已提交
588

J
Joao Moreno 已提交
589
		if (!repositoryPath) {
J
Joao Moreno 已提交
590 591 592 593 594 595 596 597 598 599 600 601
			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 已提交
602

J
Joao Moreno 已提交
603
			if (!result || result.length === 0) {
J
Joao Moreno 已提交
604 605
				return;
			}
J
Joao Moreno 已提交
606 607 608 609 610 611 612 613 614 615 616 617

			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 已提交
618
			repositoryPath = uri.fsPath;
J
Joao Moreno 已提交
619 620 621 622

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

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

J
Joao Moreno 已提交
627 628 629 630
		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 已提交
631

J
Joao Moreno 已提交
632 633 634 635
		if (!askToOpen) {
			return;
		}

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

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

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

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

J
Joao Moreno 已提交
667
			if (!result || result.length === 0) {
668 669 670
				return;
			}

J
Joao Moreno 已提交
671
			path = result[0].fsPath;
672
		}
J
Joao Moreno 已提交
673 674

		await this.model.openRepository(path);
675 676
	}

J
Joao Moreno 已提交
677 678 679 680 681
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

686
		let uris: Uri[] | undefined;
687 688

		if (arg instanceof Uri) {
J
Joao Moreno 已提交
689
			if (isGitUri(arg)) {
690
				uris = [Uri.file(fromGitUri(arg).path)];
691
			} else if (arg.scheme === 'file') {
692
				uris = [arg];
693 694 695 696 697 698
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
699
				resource = this.getSCMResource();
700 701 702
			}

			if (resource) {
J
Joao Moreno 已提交
703 704 705 706 707
				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];
708
			}
J
Joao Moreno 已提交
709 710
		}

711
		if (!uris) {
J
Joao Moreno 已提交
712
			return;
J
Joao Moreno 已提交
713 714
		}

715
		const activeTextEditor = window.activeTextEditor;
J
Joao Moreno 已提交
716

717 718
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
719
				preserveFocus,
J
Joao Moreno 已提交
720
				preview: false,
721
				viewColumn: ViewColumn.Active
722 723
			};

M
Micah Smith 已提交
724 725 726 727 728 729 730
			let document;
			try {
				document = await workspace.openTextDocument(uri);
			} catch (error) {
				await commands.executeCommand<void>('vscode.open', uri, opts);
				continue;
			}
E
Eric Gang 已提交
731

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

J
Joao Moreno 已提交
746 747 748 749 750
	@command('git.openFile2')
	async openFile2(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
		this.openFile(arg, ...resourceStates);
	}

J
Joao Moreno 已提交
751 752
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
753
		let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
754
		const preview = !(arg instanceof Resource);
D
Duroktar 已提交
755 756 757 758

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
759
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
760
		} else {
761
			resource = this.getSCMResource();
D
Duroktar 已提交
762 763 764 765 766 767
		}

		if (!resource) {
			return;
		}

J
Joao Moreno 已提交
768
		const HEAD = this.getLeftResource(resource);
769 770
		const basename = path.basename(resource.resourceUri.fsPath);
		const title = `${basename} (HEAD)`;
D
Duroktar 已提交
771

J
Joao Moreno 已提交
772 773 774
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
775
		}
J
Joao Moreno 已提交
776

J
Joao Moreno 已提交
777 778 779 780
		const opts: TextDocumentShowOptions = {
			preview
		};

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

J
Joao Moreno 已提交
784 785
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
786
		const preserveFocus = arg instanceof Resource;
J
Joao Moreno 已提交
787 788
		const preview = !(arg instanceof Resource);

J
Joao 已提交
789
		const preserveSelection = arg instanceof Uri || !arg;
790
		let resources: Resource[] | undefined = undefined;
791

792
		if (arg instanceof Uri) {
793
			const resource = this.getSCMResource(arg);
794 795 796
			if (resource !== undefined) {
				resources = [resource];
			}
797
		} else {
798
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
799

800 801 802
			if (arg instanceof Resource) {
				resource = arg;
			} else {
803
				resource = this.getSCMResource();
804 805 806 807 808
			}

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

811
		if (!resources) {
J
Joao Moreno 已提交
812
			return;
J
Joao Moreno 已提交
813
		}
J
Joao Moreno 已提交
814

815
		for (const resource of resources) {
J
Joao 已提交
816
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
817
		}
J
Joao Moreno 已提交
818 819
	}

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

824 825
		resourceStates = resourceStates.filter(s => !!s);

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

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

831 832 833 834 835 836 837
			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

838
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
839
		const { resolved, unresolved, deletionConflicts } = await categorizeResourceByResolution(selection);
840 841 842 843 844

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

846 847 848 849 850 851 852 853
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
854 855 856 857 858 859 860 861 862 863 864 865 866 867
		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 已提交
868
		const workingTree = selection.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
869 870
		const untracked = selection.filter(s => s.resourceGroupType === ResourceGroupType.Untracked);
		const scmResources = [...workingTree, ...untracked, ...resolved, ...unresolved];
871

J
Joao Moreno 已提交
872
		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
873
		if (!scmResources.length) {
J
Joao Moreno 已提交
874 875
			return;
		}
J
Joao Moreno 已提交
876

877
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
878
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
879 880
	}

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

		if (unresolved.length > 0) {
			const message = unresolved.length > 1
J
Joao Moreno 已提交
900 901
				? 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));
902 903 904 905 906 907 908 909 910

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

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

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

J
Joao Moreno 已提交
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 941 942 943 944 945 946 947 948 949 950
	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');
			}
		}
	}

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

960 961 962 963 964 965 966 967 968
	@command('git.stageAllUntracked', { repository: true })
	async stageAllUntracked(repository: Repository): Promise<void> {
		const resources = [...repository.workingTreeGroup.resourceStates, ...repository.untrackedGroup.resourceStates]
			.filter(r => r.type === Status.UNTRACKED || r.type === Status.IGNORED);
		const uris = resources.map(r => r.resourceUri);

		await repository.add(uris);
	}

J
Joao Moreno 已提交
969
	@command('git.stageChange')
J
Joao Moreno 已提交
970 971 972 973 974 975 976 977
	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 已提交
978 979
	}

J
Joao Moreno 已提交
980
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
981
	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
982 983 984 985 986 987 988
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
989 990 991 992
		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 已提交
993

J
Joao Moreno 已提交
994
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
995 996 997
			return;
		}

J
Joao Moreno 已提交
998 999
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
1000

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

J
Joao Moreno 已提交
1005
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
1006 1007 1008
			return;
		}

J
Joao Moreno 已提交
1009
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
1010
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
1011
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
1012

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

J
Joao Moreno 已提交
1016
	@command('git.revertChange')
J
Joao Moreno 已提交
1017 1018 1019 1020
	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 已提交
1021 1022 1023
			return;
		}

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

J
Joao Moreno 已提交
1027
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
1028
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
1029 1030 1031 1032 1033 1034 1035
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
1036 1037
		const selections = textEditor.selections;
		const selectedChanges = changes.filter(change => {
J
Joao Moreno 已提交
1038
			const modifiedRange = getModifiedRange(modifiedDocument, change);
J
Joao Moreno 已提交
1039 1040 1041 1042
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
1043 1044 1045
			return;
		}

J
Joao Moreno 已提交
1046 1047
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
1048

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

J
Joao Moreno 已提交
1053
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
1054 1055 1056
			return;
		}

J
Joao Moreno 已提交
1057 1058
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
1059 1060
		const selectionsBeforeRevert = textEditor.selections;
		const visibleRangesBeforeRevert = textEditor.visibleRanges;
J
Joao Moreno 已提交
1061
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
1062

J
Joao Moreno 已提交
1063 1064 1065
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
1066

J
Joao Moreno 已提交
1067 1068
		await modifiedDocument.save();

1069 1070
		textEditor.selections = selectionsBeforeRevert;
		textEditor.revealRange(visibleRangesBeforeRevert[0]);
J
Joao Moreno 已提交
1071 1072
	}

J
Joao Moreno 已提交
1073 1074
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
1075 1076
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1077
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1078
			const resource = this.getSCMResource();
1079 1080 1081 1082 1083 1084 1085 1086

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

1090
		if (!scmResources.length) {
J
Joao Moreno 已提交
1091 1092 1093
			return;
		}

1094
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1095
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
1096 1097
	}

J
Joao Moreno 已提交
1098 1099
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
1100
		await repository.revert([]);
J
Joao Moreno 已提交
1101
	}
J
Joao Moreno 已提交
1102

J
Joao Moreno 已提交
1103 1104
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
1105 1106 1107 1108 1109 1110 1111 1112 1113
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

J
Joao Moreno 已提交
1114
		if (!isGitUri(modifiedUri)) {
1115 1116 1117 1118 1119 1120
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
1121 1122 1123
			return;
		}

J
Joao Moreno 已提交
1124
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
1125
		const originalDocument = await workspace.openTextDocument(originalUri);
1126 1127 1128 1129
		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 已提交
1130 1131 1132 1133 1134

		if (!selectedDiffs.length) {
			return;
		}

1135 1136
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
1137

J
Joao Moreno 已提交
1138
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
1139 1140
	}

J
Joao Moreno 已提交
1141 1142
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
1143 1144
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1145
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1146
			const resource = this.getSCMResource();
1147 1148 1149 1150 1151 1152 1153 1154

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

1155 1156
		const scmResources = resourceStates.filter(s => s instanceof Resource
			&& (s.resourceGroupType === ResourceGroupType.WorkingTree || s.resourceGroupType === ResourceGroupType.Untracked)) as Resource[];
1157

J
Joao Moreno 已提交
1158
		if (!scmResources.length) {
J
Joao Moreno 已提交
1159 1160
			return;
		}
J
Joao Moreno 已提交
1161

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

J
Joao Moreno 已提交
1166
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
1167
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
1168
				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 已提交
1169 1170
				yes = localize('delete file', "Delete file");
			} else {
1171 1172 1173 1174 1175 1176
				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 已提交
1177 1178
			}
		} else {
1179 1180 1181 1182 1183 1184
			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 已提交
1185 1186

			if (untrackedCount > 0) {
J
Joao Moreno 已提交
1187
				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 已提交
1188 1189
			}
		}
1190

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

J
Joao Moreno 已提交
1193 1194 1195 1196
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
1197
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1198
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
1199
	}
J
Joao Moreno 已提交
1200

J
Joao Moreno 已提交
1201 1202
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1203
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
1204 1205 1206 1207 1208

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

J
Joao Moreno 已提交
1209 1210
		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 已提交
1211

J
Joao Moreno 已提交
1212
		if (untrackedResources.length === 0) {
1213
			await this._cleanTrackedChanges(repository, resources);
1214 1215
		} else if (resources.length === 1) {
			await this._cleanUntrackedChange(repository, resources[0]);
J
Joao Moreno 已提交
1216
		} else if (trackedResources.length === 0) {
1217
			await this._cleanUntrackedChanges(repository, resources);
J
Joao Moreno 已提交
1218 1219 1220 1221
		} 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 已提交
1222

J
Joao Moreno 已提交
1223 1224 1225 1226 1227
			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 已提交
1228

J
Joao Moreno 已提交
1229
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1230 1231 1232 1233 1234 1235 1236 1237
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
1238
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1239
		}
J
Joao Moreno 已提交
1240 1241
	}

1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253
	@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);
	}

1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269
	@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);
		}
	}

1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285
	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));
	}

1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309
	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 已提交
1310
	private async smartCommit(
J
Joao Moreno 已提交
1311
		repository: Repository,
1312
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
1313 1314
		opts?: CommitOptions
	): Promise<boolean> {
1315
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
1316
		let promptToSaveFilesBeforeCommit = config.get<'always' | 'staged' | 'never'>('promptToSaveFilesBeforeCommit');
J
Joao Moreno 已提交
1317

1318 1319 1320 1321 1322 1323 1324
		// migration
		if (promptToSaveFilesBeforeCommit as any === true) {
			promptToSaveFilesBeforeCommit = 'always';
		} else if (promptToSaveFilesBeforeCommit as any === false) {
			promptToSaveFilesBeforeCommit = 'never';
		}

J
Joao Moreno 已提交
1325
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
J
Joao Moreno 已提交
1326 1327 1328
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
J
Joao Moreno 已提交
1329

1330 1331 1332 1333
		if (promptToSaveFilesBeforeCommit !== 'never') {
			let documents = workspace.textDocuments
				.filter(d => !d.isUntitled && d.isDirty && isDescendant(repository.root, d.uri.fsPath));

J
Joao Moreno 已提交
1334
			if (promptToSaveFilesBeforeCommit === 'staged' || repository.indexGroup.resourceStates.length > 0) {
1335
				documents = documents
J
Joao Moreno 已提交
1336
					.filter(d => repository.indexGroup.resourceStates.some(s => pathEquals(s.resourceUri.fsPath, d.uri.fsPath)));
1337
			}
1338

1339 1340
			if (documents.length > 0) {
				const message = documents.length === 1
J
Joao Moreno 已提交
1341
					? 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 已提交
1342
					: localize('unsaved files', "There are {0} unsaved files.\n\nWould you like to save them before committing?", documents.length);
J
Joao Moreno 已提交
1343 1344 1345 1346 1347
				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) {
1348
					await Promise.all(documents.map(d => d.save()));
J
Joao Moreno 已提交
1349
					await repository.add(documents.map(d => d.uri));
J
Joao Moreno 已提交
1350 1351 1352
				} else if (pick !== commit) {
					return false; // do not commit on cancel
				}
1353 1354 1355
			}
		}

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

1360 1361 1362 1363
			if (!suggestSmartCommit) {
				return false;
			}

J
Joao Moreno 已提交
1364 1365
			// 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?");
1366 1367
			const yes = localize('yes', "Yes");
			const always = localize('always', "Always");
1368 1369
			const never = localize('never', "Never");
			const pick = await window.showWarningMessage(message, { modal: true }, yes, always, never);
1370 1371

			if (pick === always) {
J
Joao Moreno 已提交
1372
				config.update('enableSmartCommit', true, true);
1373 1374 1375
			} else if (pick === never) {
				config.update('suggestSmartCommit', false, true);
				return false;
J
Joao Moreno 已提交
1376 1377
			} else if (pick !== yes) {
				return false; // do not commit on cancel
1378 1379 1380
			}
		}

J
Joao Moreno 已提交
1381
		if (!opts) {
1382
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
1383 1384
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
1385 1386
		}

1387 1388 1389
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

1390 1391 1392 1393
		if (config.get<boolean>('alwaysSignOff')) {
			opts.signoff = true;
		}

J
Joao Moreno 已提交
1394
		if (
1395
			(
J
Joao Moreno 已提交
1396 1397 1398 1399 1400
				// no changes
				(noStagedChanges && noUnstagedChanges)
				// or no staged changes and not `all`
				|| (!opts.all && noStagedChanges)
			)
1401
			&& !opts.empty
J
Joao Moreno 已提交
1402
		) {
J
Joao Moreno 已提交
1403 1404 1405 1406
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1407
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1408 1409 1410 1411 1412

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
1413 1414
		if (opts.all && config.get<'all' | 'tracked'>('smartCommitChanges') === 'tracked') {
			opts.all = 'tracked';
1415 1416
		}

1417
		if (opts.all && config.get<'mixed' | 'separate' | 'hidden'>('untrackedChanges') !== 'mixed') {
1418
			opts.all = 'tracked';
J
Joao Moreno 已提交
1419 1420
		}

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

J
Joao Moreno 已提交
1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433
		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 已提交
1434 1435 1436
		return true;
	}

J
Joao Moreno 已提交
1437
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1438
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1439
		const getCommitMessage = async () => {
1440
			let _message: string | undefined = message;
1441

1442 1443
			if (!_message) {
				let value: string | undefined = undefined;
J
Joao Moreno 已提交
1444

1445 1446 1447
				if (opts && opts.amend && repository.HEAD && repository.HEAD.commit) {
					value = (await repository.getCommit(repository.HEAD.commit)).message;
				}
1448

1449 1450
				const branchName = repository.headShortName;
				let placeHolder: string;
1451

1452 1453 1454 1455 1456
				if (branchName) {
					placeHolder = localize('commitMessageWithHeadLabel2', "Message (commit on '{0}')", branchName);
				} else {
					placeHolder = localize('commit message', "Commit message");
				}
J
Joao Moreno 已提交
1457

1458 1459
				_message = await window.showInputBox({
					value,
1460
					placeHolder,
1461 1462 1463
					prompt: localize('provide commit message', "Please provide a commit message"),
					ignoreFocusOut: true
				});
A
💄  
al 已提交
1464
			}
J
Joao Moreno 已提交
1465

1466
			return _message;
J
Joao Moreno 已提交
1467 1468
		};

J
Joao Moreno 已提交
1469
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1470 1471

		if (message && didCommit) {
J
Joao Moreno 已提交
1472
			repository.inputBox.value = await repository.getInputTemplate();
J
Joao Moreno 已提交
1473
		}
J
Joao Moreno 已提交
1474 1475
	}

J
Joao Moreno 已提交
1476
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
1477 1478
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
1479 1480
	}

J
Joao Moreno 已提交
1481
	@command('git.commitStaged', { repository: true })
J
Joao Moreno 已提交
1482 1483
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
1484 1485
	}

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

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

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

J
Joao Moreno 已提交
1501
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1502 1503
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1504 1505
	}

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

J
Joao Moreno 已提交
1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532
	@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 已提交
1533 1534 1535 1536 1537
	@command('git.restoreCommitTemplate', { repository: true })
	async restoreCommitTemplate(repository: Repository): Promise<void> {
		repository.inputBox.value = await repository.getCommitTemplate();
	}

J
Joao Moreno 已提交
1538
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
1539 1540
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1541 1542

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

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

1549 1550
		if (commit.parents.length > 1) {
			const yes = localize('undo commit', "Undo merge commit");
J
Joao Moreno 已提交
1551
			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);
1552 1553 1554 1555 1556 1557

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

J
Joao Moreno 已提交
1558
		if (commit.parents.length > 0) {
1559 1560 1561 1562 1563
			await repository.reset('HEAD~');
		} else {
			await repository.deleteRef('HEAD');
			await this.unstageAll(repository);
		}
J
Joao Moreno 已提交
1564

J
Joao Moreno 已提交
1565
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1566 1567
	}

J
Joao Moreno 已提交
1568
	@command('git.checkout', { repository: true })
1569
	async checkout(repository: Repository, treeish: string): Promise<boolean> {
J
Joao Moreno 已提交
1570
		if (typeof treeish === 'string') {
1571 1572
			await repository.checkout(treeish);
			return true;
J
Joao Moreno 已提交
1573
		}
J
Joao Moreno 已提交
1574

J
Joao Moreno 已提交
1575 1576 1577
		const createBranch = new CreateBranchItem(this);
		const createBranchFrom = new CreateBranchFromItem(this);
		const picks = [createBranch, createBranchFrom, ...createCheckoutItems(repository)];
1578
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
1579 1580 1581 1582 1583 1584 1585 1586

		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 已提交
1587 1588

		if (!choice) {
1589
			return false;
J
Joao Moreno 已提交
1590 1591
		}

1592 1593
		if (choice === createBranch) {
			await this._branch(repository, quickpick.value);
J
Joao Moreno 已提交
1594 1595
		} else if (choice === createBranchFrom) {
			await this._branch(repository, quickpick.value, true);
1596 1597 1598 1599
		} else {
			await (choice as CheckoutItem).run(repository);
		}

1600
		return true;
J
Joao Moreno 已提交
1601 1602
	}

J
Joao Moreno 已提交
1603
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1604
	async branch(repository: Repository): Promise<void> {
1605 1606
		await this._branch(repository);
	}
J
Joao Moreno 已提交
1607

J
Joao Moreno 已提交
1608 1609 1610 1611 1612
	@command('git.branchFrom', { repository: true })
	async branchFrom(repository: Repository): Promise<void> {
		await this._branch(repository, undefined, true);
	}

1613
	private async promptForBranchName(defaultName?: string, initialValue?: string): Promise<string> {
1614 1615 1616 1617
		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 已提交
1618
			name.trim().replace(/^-+/, '').replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, branchWhitespaceChar)
1619 1620
			: name;

J
Joao Moreno 已提交
1621
		const rawBranchName = defaultName || await window.showInputBox({
1622 1623
			placeHolder: localize('branch name', "Branch name"),
			prompt: localize('provide branch name', "Please provide a branch name"),
1624
			value: initialValue,
1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635
			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 已提交
1636 1637 1638 1639 1640
		return sanitize(rawBranchName || '');
	}

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

		if (!branchName) {
1643 1644
			return;
		}
J
Joao Moreno 已提交
1645

J
Joao Moreno 已提交
1646
		let target = 'HEAD';
J
Joao Moreno 已提交
1647

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

J
Joao Moreno 已提交
1660
		await repository.branch(branchName, true, target);
J
Joao Moreno 已提交
1661 1662
	}

J
Joao Moreno 已提交
1663
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1664
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1665 1666
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1667
			run = force => repository.deleteBranch(name, force);
1668
		} else {
J
Joao Moreno 已提交
1669 1670
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1671
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1672

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

M
Maik Riechert 已提交
1676
			if (!choice || !choice.branchName) {
1677 1678
				return;
			}
M
Maik Riechert 已提交
1679
			name = choice.branchName;
J
Joao Moreno 已提交
1680
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1681 1682
		}

1683 1684 1685 1686 1687 1688 1689 1690 1691
		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");
1692
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1693 1694 1695 1696 1697

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

1700 1701
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
1702 1703
		const currentBranchName = repository.HEAD && repository.HEAD.name;
		const branchName = await this.promptForBranchName(undefined, currentBranchName);
J
Justin Horner 已提交
1704

J
Joao Moreno 已提交
1705
		if (!branchName) {
J
Justin Horner 已提交
1706 1707 1708 1709
			return;
		}

		try {
J
Joao Moreno 已提交
1710
			await repository.renameBranch(branchName);
J
Justin Horner 已提交
1711 1712 1713
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1714 1715
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1716
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1717
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", branchName));
1718 1719 1720
					return;
				default:
					throw err;
J
Justin Horner 已提交
1721 1722 1723 1724
			}
		}
	}

J
Joao Moreno 已提交
1725
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1726
	async merge(repository: Repository): Promise<void> {
1727 1728 1729 1730
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1731
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1732 1733
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1734

J
Joao Moreno 已提交
1735
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1736 1737
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1738 1739

		const picks = [...heads, ...remoteHeads];
1740 1741
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1742 1743 1744 1745 1746

		if (!choice) {
			return;
		}

1747
		await choice.run(repository);
1748 1749
	}

J
Joao Moreno 已提交
1750
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1751
	async createTag(repository: Repository): Promise<void> {
1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763
		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 已提交
1764
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1765 1766 1767 1768 1769
			ignoreFocusOut: true
		});

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

X
Xhulio Hasani 已提交
1773 1774
	@command('git.deleteTag', { repository: true })
	async deleteTag(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1775 1776 1777 1778
		const picks = repository.refs.filter(ref => ref.type === RefType.Tag)
			.map(ref => new TagItem(ref));

		if (picks.length === 0) {
1779
			window.showWarningMessage(localize('no tags', "This repository has no tags."));
J
Joao Moreno 已提交
1780
			return;
1781
		}
J
Joao Moreno 已提交
1782

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

1786
		if (!choice) {
X
Xhulio Hasani 已提交
1787 1788
			return;
		}
J
Joao Moreno 已提交
1789 1790

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

J
Joao Moreno 已提交
1793 1794 1795 1796 1797 1798 1799
	@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 已提交
1800
		await repository.fetchDefault();
J
Joao Moreno 已提交
1801 1802
	}

R
Ryan Scott 已提交
1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813
	@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 已提交
1814 1815 1816 1817 1818 1819 1820 1821 1822 1823
	@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 已提交
1824
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1825 1826
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1827 1828 1829 1830 1831 1832

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

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

D
Dozed12 已提交
1837
		if (!remotePick) {
1838 1839 1840
			return;
		}

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

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

F
Francisco Moreira 已提交
1851 1852
		const remoteCharCnt = remotePick.label.length;

1853
		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1854 1855
	}

J
Joao Moreno 已提交
1856
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1857 1858
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1859 1860 1861 1862 1863 1864

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

J
Joao Moreno 已提交
1865
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1866 1867
	}

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

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

J
Joao Moreno 已提交
1877
		await repository.pullWithRebase(repository.HEAD);
J
Joao Moreno 已提交
1878 1879
	}

J
Joao Moreno 已提交
1880
	private async _push(repository: Repository, pushOptions: PushOptions) {
J
Joao Moreno 已提交
1881
		const remotes = repository.remotes;
1882

J
Joao Moreno 已提交
1883
		if (remotes.length === 0) {
J
Joao Moreno 已提交
1884 1885 1886
			if (!pushOptions.silent) {
				window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
			}
J
Joao Moreno 已提交
1887 1888
			return;
		}
1889

J
Joao Moreno 已提交
1890 1891 1892 1893 1894 1895
		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."));
1896 1897
				return;
			}
J
Joao Moreno 已提交
1898

J
Joao Moreno 已提交
1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912
			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 已提交
1913 1914
		}

1915 1916
		if (pushOptions.pushType === PushType.PushFollowTags) {
			await repository.pushFollowTags(undefined, forcePushMode);
1917 1918 1919
			return;
		}

1920
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1921 1922 1923
			if (!pushOptions.silent) {
				window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			}
1924 1925 1926
			return;
		}

1927 1928 1929 1930 1931 1932 1933
		if (pushOptions.pushType === PushType.Push) {
			try {
				await repository.push(repository.HEAD, forcePushMode);
			} catch (err) {
				if (err.gitErrorCode !== GitErrorCodes.NoUpstreamBranch) {
					throw err;
				}
1934

J
Joao Moreno 已提交
1935 1936 1937 1938
				if (pushOptions.silent) {
					return;
				}

1939 1940 1941 1942 1943 1944 1945 1946 1947 1948
				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 {
1949
			const branchName = repository.HEAD.name;
J
Joao Moreno 已提交
1950 1951
			const addRemote = new AddRemoteItem(this);
			const picks = [...remotes.filter(r => r.pushUrl !== undefined).map(r => ({ label: r.name, description: r.pushUrl })), addRemote];
1952
			const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
J
Joao Moreno 已提交
1953
			const choice = await window.showQuickPick(picks, { placeHolder });
1954

J
Joao Moreno 已提交
1955
			if (!choice) {
1956
				return;
1957
			}
1958

J
Joao Moreno 已提交
1959 1960 1961 1962 1963 1964 1965 1966 1967
			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);
			}
1968
		}
J
Joao Moreno 已提交
1969 1970
	}

1971 1972
	@command('git.push', { repository: true })
	async push(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1973
		await this._push(repository, { pushType: PushType.Push });
1974
	}
1975

1976 1977
	@command('git.pushForce', { repository: true })
	async pushForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1978
		await this._push(repository, { pushType: PushType.Push, forcePush: true });
1979
	}
1980

1981
	@command('git.pushWithTags', { repository: true })
1982 1983
	async pushFollowTags(repository: Repository): Promise<void> {
		await this._push(repository, { pushType: PushType.PushFollowTags });
1984
	}
1985

1986
	@command('git.pushWithTagsForce', { repository: true })
1987 1988
	async pushFollowTagsForce(repository: Repository): Promise<void> {
		await this._push(repository, { pushType: PushType.PushFollowTags, forcePush: true });
1989 1990
	}

J
Joao Moreno 已提交
1991
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1992
	async pushTo(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1993
		await this._push(repository, { pushType: PushType.PushTo });
1994
	}
J
Joao Moreno 已提交
1995

1996 1997
	@command('git.pushToForce', { repository: true })
	async pushToForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1998
		await this._push(repository, { pushType: PushType.PushTo, forcePush: true });
J
Joao Moreno 已提交
1999 2000
	}

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

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

O
Omkar Manjrekar 已提交
2010
		const resultName = await window.showInputBox({
O
Omkar Manjrekar 已提交
2011 2012 2013 2014
			placeHolder: localize('remote name', "Remote name"),
			prompt: localize('provide remote name', "Please provide a remote name"),
			ignoreFocusOut: true,
			validateInput: (name: string) => {
O
Omkar Manjrekar 已提交
2015
				if (sanitize(name)) {
O
Omkar Manjrekar 已提交
2016 2017
					return null;
				}
O
Omkar Manjrekar 已提交
2018
				return localize('remote name format invalid', "Remote name format invalid");
O
Omkar Manjrekar 已提交
2019
			}
O
Omkar Manjrekar 已提交
2020
		});
O
Omkar Manjrekar 已提交
2021

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

O
Omkar Manjrekar 已提交
2024 2025 2026 2027 2028
		if (!name) {
			return;
		}

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

J
Joao Moreno 已提交
2033
		const url = await window.showInputBox({
O
Omkar Manjrekar 已提交
2034
			placeHolder: localize('remote url', "Remote URL"),
O
Omkar Manjrekar 已提交
2035
			prompt: localize('provide remote URL', "Enter URL for remote \"{0}\"", name),
2036
			ignoreFocusOut: true
O
Omkar Manjrekar 已提交
2037 2038 2039 2040 2041 2042 2043
		});

		if (!url) {
			return;
		}

		await repository.addRemote(name, url);
2044 2045

		return name;
O
Omkar Manjrekar 已提交
2046 2047
	}

O
Omkar Manjrekar 已提交
2048 2049
	@command('git.removeRemote', { repository: true })
	async removeRemote(repository: Repository): Promise<void> {
O
Omkar Manjrekar 已提交
2050 2051 2052
		const remotes = repository.remotes;

		if (remotes.length === 0) {
2053
			window.showErrorMessage(localize('no remotes added', "Your repository has no remotes."));
O
Omkar Manjrekar 已提交
2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064
			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 已提交
2065

O
Omkar Manjrekar 已提交
2066
		await repository.removeRemote(remoteName);
O
Omkar Manjrekar 已提交
2067
	}
O
Omkar Manjrekar 已提交
2068

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

2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082
		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 已提交
2083 2084 2085
			return;
		}

J
Joao Moreno 已提交
2086 2087 2088 2089
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
2090
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
2091
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
2092 2093

		if (shouldPrompt) {
J
Joao Moreno 已提交
2094
			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 已提交
2095
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
2096
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
2097 2098 2099 2100 2101 2102 2103 2104 2105
			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 已提交
2106
		if (rebase) {
J
Joao Moreno 已提交
2107
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
2108
		} else {
J
Joao Moreno 已提交
2109
			await repository.sync(HEAD);
J
Joao Moreno 已提交
2110 2111 2112 2113
		}
	}

	@command('git.sync', { repository: true })
2114 2115 2116 2117 2118 2119 2120 2121 2122 2123
	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 已提交
2124 2125
	}

J
Joao 已提交
2126 2127 2128 2129 2130 2131 2132 2133 2134
	@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 已提交
2135
			await repository.sync(HEAD);
J
Joao 已提交
2136 2137 2138
		}));
	}

2139
	@command('git.syncRebase', { repository: true })
2140 2141 2142 2143 2144 2145 2146 2147 2148 2149
	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 已提交
2150 2151
	}

J
Joao Moreno 已提交
2152
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
2153 2154
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
2155 2156 2157 2158 2159 2160

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

2161 2162 2163 2164 2165 2166
		const branchName = repository.HEAD && repository.HEAD.name || '';

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

2167
		const addRemote = new AddRemoteItem(this);
J
Joao Moreno 已提交
2168
		const picks = [...repository.remotes.map(r => ({ label: r.name, description: r.pushUrl })), addRemote];
2169 2170
		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 已提交
2171 2172 2173 2174 2175

		if (!choice) {
			return;
		}

2176 2177 2178 2179
		if (choice === addRemote) {
			const newRemote = await this.addRemote(repository);

			if (newRemote) {
J
Joao Moreno 已提交
2180
				await repository.pushTo(newRemote, branchName, true);
2181
			}
J
Joao Moreno 已提交
2182 2183
		} else {
			await repository.pushTo(choice.label, branchName, true);
2184
		}
J
Joao Moreno 已提交
2185 2186
	}

2187 2188
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
2189 2190
		resourceStates = resourceStates.filter(s => !!s);

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

2194
			if (!resource) {
J
Joao Moreno 已提交
2195 2196 2197
				return;
			}

2198
			resourceStates = [resource];
J
Joao Moreno 已提交
2199 2200
		}

2201
		const resources = resourceStates
J
Joao Moreno 已提交
2202 2203 2204
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

2205
		if (!resources.length) {
N
NKumar2 已提交
2206 2207 2208
			return;
		}

2209
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
2210 2211
	}

J
Joao Moreno 已提交
2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224
	@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 已提交
2225
	private async _stash(repository: Repository, includeUntracked = false): Promise<void> {
2226 2227
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0
			&& (!includeUntracked || repository.untrackedGroup.resourceStates.length === 0);
2228
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
2229

2230
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
2231 2232 2233
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
2234

2235
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
2236 2237 2238 2239 2240

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

J
Joao Moreno 已提交
2241
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
2242 2243
	}

2244 2245 2246 2247 2248 2249 2250
	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 已提交
2251 2252 2253 2254 2255 2256 2257 2258 2259 2260
	@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 已提交
2261
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
2262
	async stashPop(repository: Repository): Promise<void> {
2263
		const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
J
Joao Moreno 已提交
2264
		const stash = await this.pickStash(repository, placeHolder);
2265

J
Joao Moreno 已提交
2266
		if (!stash) {
2267 2268 2269
			return;
		}

J
Joao Moreno 已提交
2270
		await repository.popStash(stash.index);
2271 2272 2273 2274
	}

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

J
Joao Moreno 已提交
2277 2278
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
2279 2280 2281
			return;
		}

2282 2283 2284 2285 2286 2287
		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 已提交
2288
		const stash = await this.pickStash(repository, placeHolder);
K
Krzysztof Cieślak 已提交
2289

J
Joao Moreno 已提交
2290
		if (!stash) {
K
Krzysztof Cieślak 已提交
2291 2292
			return;
		}
J
Joao Moreno 已提交
2293

J
Joao Moreno 已提交
2294
		await repository.applyStash(stash.index);
K
Krzysztof Cieślak 已提交
2295 2296
	}

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

J
Joao Moreno 已提交
2301 2302
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
2303 2304 2305 2306 2307 2308
			return;
		}

		await repository.applyStash();
	}

2309 2310
	@command('git.stashDrop', { repository: true })
	async stashDrop(repository: Repository): Promise<void> {
2311 2312 2313 2314 2315 2316 2317 2318 2319 2320
		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 已提交
2321
	private async pickStash(repository: Repository, placeHolder: string): Promise<Stash | undefined> {
2322 2323
		const stashes = await repository.getStashes();

J
Joao Moreno 已提交
2324 2325
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
2326 2327 2328
			return;
		}

J
Joao Moreno 已提交
2329 2330 2331
		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 已提交
2332
	}
K
Krzysztof Cieślak 已提交
2333

2334 2335
	@command('git.openDiff', { repository: false })
	async openDiff(uri: Uri, hash: string) {
E
Eric Amodio 已提交
2336 2337
		const basename = path.basename(uri.fsPath);

2338
		if (hash === '~') {
E
Eric Amodio 已提交
2339
			return commands.executeCommand('vscode.diff', toGitUri(uri, hash), toGitUri(uri, `HEAD`), `${basename} (Index)`);
2340 2341
		}

2342
		return commands.executeCommand('vscode.diff', toGitUri(uri, `${hash}^`), toGitUri(uri, hash), `${basename} (${hash.substr(0, 8)}^) \u27f7 ${basename} (${hash.substr(0, 8)})`);
2343 2344
	}

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

J
Joao Moreno 已提交
2349
			if (!options.repository) {
J
Joao Moreno 已提交
2350 2351
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
2352 2353
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
2354 2355 2356 2357 2358 2359 2360 2361 2362
				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();
				}
2363

J
Joao Moreno 已提交
2364
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
2365
					if (!repository) {
J
Joao 已提交
2366
						return Promise.resolve();
J
Joao Moreno 已提交
2367 2368
					}

J
Joao Moreno 已提交
2369
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
2370
				});
J
Joao Moreno 已提交
2371 2372
			}

K
kieferrm 已提交
2373
			/* __GDPR__
K
kieferrm 已提交
2374 2375 2376 2377
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
2378 2379
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
2380
			return result.catch(async err => {
J
Joao Moreno 已提交
2381
				const options: MessageOptions = {
2382
					modal: true
J
Joao Moreno 已提交
2383 2384
				};

J
Joao Moreno 已提交
2385
				let message: string;
2386
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
2387

J
Joao Moreno 已提交
2388 2389 2390 2391 2392
				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 已提交
2393
				switch (err.gitErrorCode) {
2394
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
2395 2396
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
2397
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
2398
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
2399
						break;
2400 2401 2402 2403 2404
					case GitErrorCodes.Conflict:
						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
						type = 'warning';
						options.modal = false;
						break;
J
Joao Moreno 已提交
2405 2406 2407 2408 2409
					case GitErrorCodes.StashConflict:
						message = localize('stash merge conflicts', "There were merge conflicts while applying the stash.");
						type = 'warning';
						options.modal = false;
						break;
2410 2411
					case GitErrorCodes.NoUserNameConfigured:
					case GitErrorCodes.NoUserEmailConfigured:
J
Joao Moreno 已提交
2412 2413
						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')));
2414
						break;
J
Joao Moreno 已提交
2415
					default:
2416 2417 2418
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
2419
							.split(/[\r\n]/)
J
João Moreno 已提交
2420
							.filter((line: string) => !!line)
2421 2422 2423 2424 2425
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
2426 2427 2428 2429 2430 2431 2432 2433 2434

						break;
				}

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

J
Joao Moreno 已提交
2435 2436 2437 2438 2439 2440 2441
				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 已提交
2442

J
Joao Moreno 已提交
2443 2444 2445
					if (resultFn) {
						resultFn();
					}
J
Joao Moreno 已提交
2446 2447 2448
				}
			});
		};
2449 2450

		// patch this object, so people can call methods directly
2451
		(this as any)[key] = result;
2452 2453

		return result;
J
Joao Moreno 已提交
2454 2455
	}

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

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

J
Joao Moreno 已提交
2461 2462 2463
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
2464

J
Joao Moreno 已提交
2465
		if (!uri) {
2466
			return undefined;
J
Joao Moreno 已提交
2467 2468
		}

J
Joao Moreno 已提交
2469
		if (isGitUri(uri)) {
J
Joao Moreno 已提交
2470 2471
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
2472 2473 2474 2475
		}

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

J
Joao Moreno 已提交
2478
			if (!repository) {
2479 2480
				return undefined;
			}
J
Joao Moreno 已提交
2481

J
Joao Moreno 已提交
2482 2483
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
2484
		}
2485
		return undefined;
J
Joao Moreno 已提交
2486 2487
	}

J
Joao Moreno 已提交
2488
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
2489 2490 2491 2492 2493 2494
	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) => {
2495
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
2496 2497 2498 2499 2500 2501

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

2502
			// Could it be a submodule?
2503
			if (pathEquals(resource.fsPath, repository.root)) {
2504 2505 2506
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
2507
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523

			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 已提交
2524 2525 2526
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
2527
}