commands.ts 80.2 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 14 15 16 17 18
import { Branch, GitErrorCodes, Ref, RefType, Status } from './api/git';
import { CommitOptions, ForcePushMode, Git, Stash } from './git';
import { Model } from './model';
import { Repository, Resource, ResourceGroupType } from './repository';
import { applyLineChanges, getModifiedRange, intersectDiffWithRange, invertLineChange, toLineRanges } from './staging';
import { fromGitUri, toGitUri } from './uri';
import { grep, isDescendant, pathEquals } from './util';
J
Joao Moreno 已提交
19 20

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

J
Joao Moreno 已提交
22 23 24 25 26 27
class CheckoutItem implements QuickPickItem {

	protected get shortCommit(): string { return (this.ref.commit || '').substr(0, 8); }
	get label(): string { return this.ref.name || this.shortCommit; }
	get description(): string { return this.shortCommit; }

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

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

		if (!ref) {
			return;
		}

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

class CheckoutTagItem extends CheckoutItem {

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

class CheckoutRemoteHeadItem extends CheckoutItem {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

J
Joao Moreno 已提交
112 113 114 115 116 117 118 119 120 121 122 123 124 125
class CreateBranchFromItem implements QuickPickItem {

	constructor(private cc: CommandCenter) { }

	get label(): string { return localize('create branch from', '$(plus) Create new branch from...'); }
	get description(): string { return ''; }

	get alwaysShow(): boolean { return true; }

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

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

135 136 137 138 139 140 141 142 143 144 145 146 147 148
class AddRemoteItem implements QuickPickItem {

	constructor(private cc: CommandCenter) { }

	get label(): string { return localize('add remote', '$(plus) Add a new remote...'); }
	get description(): string { return ''; }

	get alwaysShow(): boolean { return true; }

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

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

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

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

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

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

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

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

J
Joao Moreno 已提交
200
function createCheckoutItems(repository: Repository): CheckoutItem[] {
201 202 203 204 205 206 207 208 209 210 211 212 213 214 215
	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 已提交
216 217 218 219
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) { }
220 221
}

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

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

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

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

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

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

J
Joao Moreno 已提交
255 256
	@command('git.refresh', { repository: true })
	async refresh(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
257
		await repository.status();
J
Joao Moreno 已提交
258
	}
J
Joao Moreno 已提交
259

J
Joao Moreno 已提交
260 261
	@command('git.openResource')
	async openResource(resource: Resource): Promise<void> {
J
Joao Moreno 已提交
262 263 264 265 266 267 268 269 270 271 272 273 274 275
		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 已提交
276 277
	}

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

281 282 283 284
		try {
			stat = await new Promise<Stats>((c, e) => lstat(resource.resourceUri.fsPath, (err, stat) => err ? e(err) : c(stat)));
		} catch (err) {
			// noop
285
		}
286

287 288 289 290
		let left: Uri | undefined;
		let right: Uri | undefined;

		if (stat && stat.isDirectory()) {
291 292 293 294
			const repository = this.model.getRepositoryForSubmodule(resource.resourceUri);

			if (repository) {
				right = toGitUri(resource.resourceUri, resource.resourceGroupType === ResourceGroupType.Index ? 'index' : 'wt', { submoduleOf: repository.root });
295 296
			}
		} else {
J
Joao Moreno 已提交
297 298 299 300
			if (resource.type !== Status.DELETED_BY_THEM) {
				left = await this.getLeftResource(resource);
			}

301 302
			right = await this.getRightResource(resource);
		}
303

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

J
Joao Moreno 已提交
306 307 308 309 310
		if (!right) {
			// TODO
			console.error('oh no');
			return;
		}
J
Joao Moreno 已提交
311

J
Joao Moreno 已提交
312
		const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
313 314
			preserveFocus,
			preview,
315
			viewColumn: ViewColumn.Active
J
Joao Moreno 已提交
316 317
		};

J
Joao Moreno 已提交
318 319
		const activeTextEditor = window.activeTextEditor;

320 321 322
		// 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 已提交
323 324 325
			opts.selection = activeTextEditor.selection;
		}

326
		if (!left) {
J
Joao Moreno 已提交
327
			await commands.executeCommand<void>('vscode.open', right, opts, title);
J
Joao Moreno 已提交
328 329 330 331
		} else {
			await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
		}
	}
J
Joao Moreno 已提交
332

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

J
Joao Moreno 已提交
336 337 338
		if (!repository) {
			return toGitUri(uri, ref);
		}
J
Joao Moreno 已提交
339

J
Joao Moreno 已提交
340
		try {
J
Joao Moreno 已提交
341 342 343
			let gitRef = ref;

			if (gitRef === '~') {
J
Joao Moreno 已提交
344
				const uriString = uri.toString();
J
Joao Moreno 已提交
345
				const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString);
J
Joao Moreno 已提交
346
				gitRef = indexStatus ? '' : 'HEAD';
J
Joao Moreno 已提交
347 348
			}

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

J
Joao Moreno 已提交
352 353 354
			if (mimetype === 'text/plain') {
				return toGitUri(uri, ref);
			}
355

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

J
Joao Moreno 已提交
360
			if (ImageMimetypes.indexOf(mimetype) > -1) {
J
Joao Moreno 已提交
361 362
				const contents = await repository.buffer(gitRef, uri.fsPath);
				return Uri.parse(`data:${mimetype};label:${path.basename(uri.fsPath)};description:${gitRef};size:${size};base64,${contents.toString('base64')}`);
J
Joao Moreno 已提交
363 364
			}

J
Joao Moreno 已提交
365
			return Uri.parse(`data:;label:${path.basename(uri.fsPath)};description:${gitRef},`);
J
Joao Moreno 已提交
366 367 368 369

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

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

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

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

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

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

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

			case Status.DELETED_BY_THEM:
				return this.getURI(resource.resourceUri, '~2');

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

				if (!repository) {
					return;
				}

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

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

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

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

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

		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
D
Darrien Singleton 已提交
439
			case Status.INDEX_ADDED:
J
Joao Moreno 已提交
440 441 442
				return `${basename} (Index)`;

			case Status.MODIFIED:
M
Marc Kassay 已提交
443 444
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
445
				return `${basename} (Working Tree)`;
J
Joao Moreno 已提交
446 447 448 449 450 451

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

			case Status.DELETED_BY_THEM:
				return `${basename} (Ours)`;
D
Darrien Singleton 已提交
452 453 454 455

			case Status.UNTRACKED:

				return `${basename} (Untracked)`;
J
Joao Moreno 已提交
456 457 458 459 460
		}

		return '';
	}

J
Joao Moreno 已提交
461
	@command('git.clone')
462 463 464 465 466 467 468
	async clone(url?: string): Promise<void> {
		if (!url) {
			url = await window.showInputBox({
				prompt: localize('repourl', "Repository URL"),
				ignoreFocusOut: true
			});
		}
J
Joao Moreno 已提交
469 470

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

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

482
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
483 484 485 486 487 488 489 490 491
		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 已提交
492 493
		});

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

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

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

514 515
			const repositoryPath = await window.withProgress(
				opts,
J
Joao Moreno 已提交
516
				(progress, token) => this.git.clone(url!, parentPath, progress, token)
517
			);
518

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

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

			const result = await window.showInformationMessage(message, ...choices);
531 532

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

			const uri = Uri.file(repositoryPath);

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

569
			throw err;
J
Joao Moreno 已提交
570 571 572
		}
	}

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

J
Joao Moreno 已提交
578
		if (workspace.workspaceFolders) {
J
Joao Moreno 已提交
579
			const placeHolder = localize('init', "Pick workspace folder to initialize git repo in");
J
Joao Moreno 已提交
580 581 582 583 584
			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 已提交
585 586 587 588
			const item = await window.showQuickPick(items, { placeHolder, ignoreFocusOut: true });

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

J
Joao Moreno 已提交
595
		if (!repositoryPath) {
J
Joao Moreno 已提交
596 597 598 599 600 601 602 603 604 605 606 607
			const homeUri = Uri.file(os.homedir());
			const defaultUri = workspace.workspaceFolders && workspace.workspaceFolders.length > 0
				? Uri.file(workspace.workspaceFolders[0].uri.fsPath)
				: homeUri;

			const result = await window.showOpenDialog({
				canSelectFiles: false,
				canSelectFolders: true,
				canSelectMany: false,
				defaultUri,
				openLabel: localize('init repo', "Initialize Repository")
			});
J
Joao Moreno 已提交
608

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

			const uri = result[0];

			if (homeUri.toString().startsWith(uri.toString())) {
				const yes = localize('create repo', "Initialize Repository");
				const answer = await window.showWarningMessage(localize('are you sure', "This will create a Git repository in '{0}'. Are you sure you want to continue?", uri.fsPath), yes);

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

J
Joao Moreno 已提交
624
			repositoryPath = uri.fsPath;
J
Joao Moreno 已提交
625 626 627 628

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

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

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

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

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

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

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

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

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

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

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

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

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

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

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
696
				uris = [Uri.file(fromGitUri(arg).path)];
697
			} else if (arg.scheme === 'file') {
698
				uris = [arg];
699 700 701 702 703 704
			}
		} else {
			let resource = arg;

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

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

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

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

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

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

738 739 740
			// Check if active text editor has same path as other editor. we cannot compare via
			// URI.toString() here because the schemas can be different. Instead we just go by path.
			if (activeTextEditor && activeTextEditor.document.uri.path === uri.path) {
E
Eric Gang 已提交
741
				// preserve not only selection but also visible range
B
Benjamin Pasero 已提交
742
				opts.selection = activeTextEditor.selection;
E
Eric Gang 已提交
743 744 745 746 747
				const previousVisibleRanges = activeTextEditor.visibleRanges;
				const editor = await window.showTextDocument(document, opts);
				editor.revealRange(previousVisibleRanges[0]);
			} else {
				await window.showTextDocument(document, opts);
B
Benjamin Pasero 已提交
748
			}
J
Joao Moreno 已提交
749
		}
J
Joao Moreno 已提交
750 751
	}

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

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

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

		if (!resource) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

			resourceStates = [resource];
		}

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

		if (unresolved.length > 0) {
			const message = unresolved.length > 1
				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", unresolved.length)
				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(unresolved[0].resourceUri.fsPath));
851

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

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

J
Joao Moreno 已提交
860 861 862 863 864 865 866 867 868 869 870 871 872 873
		try {
			await this.runByRepository(deletionConflicts.map(r => r.resourceUri), async (repository, resources) => {
				for (const resource of resources) {
					await this._stageDeletionConflict(repository, resource);
				}
			});
		} catch (err) {
			if (/Cancelled/.test(err.message)) {
				return;
			}

			throw err;
		}

J
Joao Moreno 已提交
874
		const workingTree = selection.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
875 876
		const untracked = selection.filter(s => s.resourceGroupType === ResourceGroupType.Untracked);
		const scmResources = [...workingTree, ...untracked, ...resolved, ...unresolved];
877

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

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

J
Joao Moreno 已提交
887 888
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
889
		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
890 891 892 893 894 895 896 897 898 899 900 901 902
		const { merge, unresolved, deletionConflicts } = await categorizeResourceByResolution(resources);

		try {
			for (const deletionConflict of deletionConflicts) {
				await this._stageDeletionConflict(repository, deletionConflict.resourceUri);
			}
		} catch (err) {
			if (/Cancelled/.test(err.message)) {
				return;
			}

			throw err;
		}
903 904 905

		if (unresolved.length > 0) {
			const message = unresolved.length > 1
J
Joao Moreno 已提交
906 907
				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", merge.length)
				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(merge[0].resourceUri.fsPath));
908 909 910 911 912 913 914 915 916

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

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

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

J
Joao Moreno 已提交
922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956
	private async _stageDeletionConflict(repository: Repository, uri: Uri): Promise<void> {
		const uriString = uri.toString();
		const resource = repository.mergeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];

		if (!resource) {
			return;
		}

		if (resource.type === Status.DELETED_BY_THEM) {
			const keepIt = localize('keep ours', "Keep Our Version");
			const deleteIt = localize('delete', "Delete File");
			const result = await window.showInformationMessage(localize('deleted by them', "File '{0}' was deleted by them and modified by us.\n\nWhat would you like to do?", path.basename(uri.fsPath)), { modal: true }, keepIt, deleteIt);

			if (result === keepIt) {
				await repository.add([uri]);
			} else if (result === deleteIt) {
				await repository.rm([uri]);
			} else {
				throw new Error('Cancelled');
			}
		} else if (resource.type === Status.DELETED_BY_US) {
			const keepIt = localize('keep theirs', "Keep Their Version");
			const deleteIt = localize('delete', "Delete File");
			const result = await window.showInformationMessage(localize('deleted by us', "File '{0}' was deleted by us and modified by them.\n\nWhat would you like to do?", path.basename(uri.fsPath)), { modal: true }, keepIt, deleteIt);

			if (result === keepIt) {
				await repository.add([uri]);
			} else if (result === deleteIt) {
				await repository.rm([uri]);
			} else {
				throw new Error('Cancelled');
			}
		}
	}

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

		await repository.add(uris);
	}

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

		await repository.add(uris);
	}

J
Joao Moreno 已提交
975
	@command('git.stageChange')
J
Joao Moreno 已提交
976 977 978 979 980 981 982 983
	async stageChange(uri: Uri, changes: LineChange[], index: number): Promise<void> {
		const textEditor = window.visibleTextEditors.filter(e => e.document.uri.toString() === uri.toString())[0];

		if (!textEditor) {
			return;
		}

		await this._stageChanges(textEditor, [changes[index]]);
J
Joao Moreno 已提交
984 985
	}

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

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
995 996 997 998
		const selectedLines = toLineRanges(textEditor.selections, modifiedDocument);
		const selectedChanges = changes
			.map(diff => selectedLines.reduce<LineChange | null>((result, range) => result || intersectDiffWithRange(modifiedDocument, diff, range), null))
			.filter(d => !!d) as LineChange[];
J
Joao Moreno 已提交
999

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

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

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

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

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

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

J
Joao Moreno 已提交
1022
	@command('git.revertChange')
J
Joao Moreno 已提交
1023 1024 1025 1026
	async revertChange(uri: Uri, changes: LineChange[], index: number): Promise<void> {
		const textEditor = window.visibleTextEditors.filter(e => e.document.uri.toString() === uri.toString())[0];

		if (!textEditor) {
J
Joao Moreno 已提交
1027 1028 1029
			return;
		}

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

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

		if (!textEditor) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

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

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

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

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

		if (!textEditor) {
			return;
		}

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

1120 1121 1122 1123 1124 1125 1126
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

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

J
Joao Moreno 已提交
1130
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
1131
		const originalDocument = await workspace.openTextDocument(originalUri);
1132 1133 1134 1135
		const selectedLines = toLineRanges(textEditor.selections, modifiedDocument);
		const selectedDiffs = diffs
			.map(diff => selectedLines.reduce<LineChange | null>((result, range) => result || intersectDiffWithRange(modifiedDocument, diff, range), null))
			.filter(d => !!d) as LineChange[];
J
Joao Moreno 已提交
1136 1137 1138 1139 1140

		if (!selectedDiffs.length) {
			return;
		}

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

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

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

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

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

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

J
Joao Moreno 已提交
1172
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
1173
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
1174
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?\nThis is IRREVERSIBLE!\nThis file will be FOREVER LOST.", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
1175 1176
				yes = localize('delete file', "Delete file");
			} else {
1177 1178 1179 1180 1181 1182
				if (scmResources[0].type === Status.DELETED) {
					yes = localize('restore file', "Restore file");
					message = localize('confirm restore', "Are you sure you want to restore {0}?", path.basename(scmResources[0].resourceUri.fsPath));
				} else {
					message = localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(scmResources[0].resourceUri.fsPath));
				}
J
Joao Moreno 已提交
1183 1184
			}
		} else {
1185 1186 1187 1188 1189 1190
			if (scmResources.every(resource => resource.type === Status.DELETED)) {
				yes = localize('restore files', "Restore files");
				message = localize('confirm restore multiple', "Are you sure you want to restore {0} files?", scmResources.length);
			} else {
				message = localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", scmResources.length);
			}
J
Joao Moreno 已提交
1191 1192

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

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

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

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

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

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

J
Joao Moreno 已提交
1215 1216
		const trackedResources = resources.filter(r => r.type !== Status.UNTRACKED && r.type !== Status.IGNORED);
		const untrackedResources = resources.filter(r => r.type === Status.UNTRACKED || r.type === Status.IGNORED);
J
Joao Moreno 已提交
1217

J
Joao Moreno 已提交
1218
		if (untrackedResources.length === 0) {
1219
			await this._cleanTrackedChanges(repository, resources);
1220 1221
		} else if (resources.length === 1) {
			await this._cleanUntrackedChange(repository, resources[0]);
J
Joao Moreno 已提交
1222
		} else if (trackedResources.length === 0) {
1223
			await this._cleanUntrackedChanges(repository, resources);
J
Joao Moreno 已提交
1224 1225 1226 1227
		} else { // resources.length > 1 && untrackedResources.length > 0 && trackedResources.length > 0
			const untrackedMessage = untrackedResources.length === 1
				? localize('there are untracked files single', "The following untracked file will be DELETED FROM DISK if discarded: {0}.", path.basename(untrackedResources[0].resourceUri.fsPath))
				: localize('there are untracked files', "There are {0} untracked files which will be DELETED FROM DISK if discarded.", untrackedResources.length);
J
Joao Moreno 已提交
1228

J
Joao Moreno 已提交
1229 1230 1231 1232 1233
			const message = localize('confirm discard all 2', "{0}\n\nThis is IRREVERSIBLE, your current working set will be FOREVER LOST.", untrackedMessage, resources.length);

			const yesTracked = trackedResources.length === 1
				? localize('yes discard tracked', "Discard 1 Tracked File", trackedResources.length)
				: localize('yes discard tracked multiple', "Discard {0} Tracked Files", trackedResources.length);
J
Joao Moreno 已提交
1234

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

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

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

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

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

		await this._cleanTrackedChanges(repository, resources);
	}

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

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

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

1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291
	private async _cleanTrackedChanges(repository: Repository, resources: Resource[]): Promise<void> {
		const message = resources.length === 1
			? localize('confirm discard all single', "Are you sure you want to discard changes in {0}?", path.basename(resources[0].resourceUri.fsPath))
			: localize('confirm discard all', "Are you sure you want to discard ALL changes in {0} files?\nThis is IRREVERSIBLE!\nYour current working set will be FOREVER LOST.", resources.length);
		const yes = resources.length === 1
			? localize('discardAll multiple', "Discard 1 File")
			: localize('discardAll', "Discard All {0} Files", resources.length);
		const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

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

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

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

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

	private async _cleanUntrackedChanges(repository: Repository, resources: Resource[]): Promise<void> {
		const message = localize('confirm delete multiple', "Are you sure you want to DELETE {0} files?", resources.length);
		const yes = localize('delete files', "Delete Files");
		const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

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

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

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

J
Joao Moreno 已提交
1331 1332
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;

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

J
Joao Moreno 已提交
1337
			if (promptToSaveFilesBeforeCommit === 'staged' || repository.indexGroup.resourceStates.length > 0) {
1338 1339 1340
				documents = documents
					.filter(d => repository.indexGroup.resourceStates.some(s => s.resourceUri.path === d.uri.fsPath));
			}
1341

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

1359
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
1360 1361
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
1362 1363

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

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

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

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

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

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

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

J
Joao Moreno 已提交
1401
		if (
1402
			(
J
Joao Moreno 已提交
1403 1404 1405 1406 1407
				// no changes
				(noStagedChanges && noUnstagedChanges)
				// or no staged changes and not `all`
				|| (!opts.all && noStagedChanges)
			)
1408
			&& !opts.empty
J
Joao Moreno 已提交
1409
		) {
J
Joao Moreno 已提交
1410 1411 1412 1413
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1414
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1415 1416 1417 1418 1419

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
1420 1421 1422 1423
		if (opts.all && config.get<'all' | 'tracked'>('smartCommitChanges') === 'tracked') {
			opts.all = 'tracked';
		}

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

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

J
Joao Moreno 已提交
1440
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1441
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1442
		const getCommitMessage = async () => {
1443 1444 1445
			let _message: string | undefined = message;
			if (!_message) {
				let value: string | undefined = undefined;
J
Joao Moreno 已提交
1446

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

1451 1452
				const branchName = repository.headShortName;
				let placeHolder: string;
1453

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

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

1468
			return _message ? repository.cleanUpCommitEditMessage(_message) : _message;
J
Joao Moreno 已提交
1469 1470
		};

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

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

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

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

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

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

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

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

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

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

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

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

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

1551 1552 1553 1554 1555 1556 1557 1558 1559
		if (commit.parents.length > 1) {
			const yes = localize('undo commit', "Undo merge commit");
			const result = await window.showWarningMessage(localize('merge commit', "The last commit was a merge commit. Are you sure you want to undo it?"), yes);

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

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

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

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

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

		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 已提交
1589 1590

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

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

1602
		return true;
J
Joao Moreno 已提交
1603 1604
	}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1701 1702
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1703
		const branchName = await this.promptForBranchName();
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
		const addRemote = new AddRemoteItem(this);
J
Joao Moreno 已提交
2162
		const picks = [...repository.remotes.map(r => ({ label: r.name, description: r.pushUrl })), addRemote];
J
Joao Moreno 已提交
2163
		const branchName = repository.HEAD && repository.HEAD.name || '';
2164 2165
		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 已提交
2166 2167 2168 2169 2170

		if (!choice) {
			return;
		}

2171 2172 2173 2174
		if (choice === addRemote) {
			const newRemote = await this.addRemote(repository);

			if (newRemote) {
J
Joao Moreno 已提交
2175
				await repository.pushTo(newRemote, branchName, true);
2176
			}
J
Joao Moreno 已提交
2177 2178
		} else {
			await repository.pushTo(choice.label, branchName, true);
2179
		}
J
Joao Moreno 已提交
2180 2181
	}

2182 2183
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
2184 2185
		resourceStates = resourceStates.filter(s => !!s);

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

2189
			if (!resource) {
J
Joao Moreno 已提交
2190 2191 2192
				return;
			}

2193
			resourceStates = [resource];
J
Joao Moreno 已提交
2194 2195
		}

2196
		const resources = resourceStates
J
Joao Moreno 已提交
2197 2198 2199
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

2200
		if (!resources.length) {
N
NKumar2 已提交
2201 2202 2203
			return;
		}

2204
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
2205 2206
	}

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

2225
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
2226 2227 2228
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
2229

2230
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
2231 2232 2233 2234 2235

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

J
Joao Moreno 已提交
2236
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
2237 2238
	}

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

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

J
Joao Moreno 已提交
2265
		await repository.popStash(stash.index);
2266 2267 2268 2269
	}

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

J
Joao Moreno 已提交
2272 2273
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
2274 2275 2276
			return;
		}

2277 2278 2279 2280 2281 2282
		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 已提交
2283
		const stash = await this.pickStash(repository, placeHolder);
K
Krzysztof Cieślak 已提交
2284

J
Joao Moreno 已提交
2285
		if (!stash) {
K
Krzysztof Cieślak 已提交
2286 2287
			return;
		}
J
Joao Moreno 已提交
2288

J
Joao Moreno 已提交
2289
		await repository.applyStash(stash.index);
K
Krzysztof Cieślak 已提交
2290 2291
	}

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

J
Joao Moreno 已提交
2296 2297
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
2298 2299 2300 2301 2302 2303
			return;
		}

		await repository.applyStash();
	}

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

J
Joao Moreno 已提交
2319 2320
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
2321 2322 2323
			return;
		}

J
Joao Moreno 已提交
2324 2325 2326
		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 已提交
2327
	}
K
Krzysztof Cieślak 已提交
2328

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

J
Joao Moreno 已提交
2333
			if (!options.repository) {
J
Joao Moreno 已提交
2334 2335
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
2336 2337
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
2338 2339 2340 2341 2342 2343 2344 2345 2346
				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();
				}
2347

J
Joao Moreno 已提交
2348
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
2349
					if (!repository) {
J
Joao 已提交
2350
						return Promise.resolve();
J
Joao Moreno 已提交
2351 2352
					}

J
Joao Moreno 已提交
2353
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
2354
				});
J
Joao Moreno 已提交
2355 2356
			}

K
kieferrm 已提交
2357
			/* __GDPR__
K
kieferrm 已提交
2358 2359 2360 2361
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
2362 2363
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
2364
			return result.catch(async err => {
J
Joao Moreno 已提交
2365
				const options: MessageOptions = {
2366
					modal: true
J
Joao Moreno 已提交
2367 2368
				};

J
Joao Moreno 已提交
2369
				let message: string;
2370
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
2371

J
Joao Moreno 已提交
2372 2373 2374 2375 2376
				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 已提交
2377
				switch (err.gitErrorCode) {
2378
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
2379 2380
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
2381
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
2382
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
2383
						break;
2384 2385 2386 2387 2388
					case GitErrorCodes.Conflict:
						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
						type = 'warning';
						options.modal = false;
						break;
J
Joao Moreno 已提交
2389 2390 2391 2392 2393
					case GitErrorCodes.StashConflict:
						message = localize('stash merge conflicts', "There were merge conflicts while applying the stash.");
						type = 'warning';
						options.modal = false;
						break;
2394 2395
					case GitErrorCodes.NoUserNameConfigured:
					case GitErrorCodes.NoUserEmailConfigured:
J
Joao Moreno 已提交
2396 2397
						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')));
2398
						break;
J
Joao Moreno 已提交
2399
					default:
2400 2401 2402
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
2403
							.split(/[\r\n]/)
J
João Moreno 已提交
2404
							.filter((line: string) => !!line)
2405 2406 2407 2408 2409
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
2410 2411 2412 2413 2414 2415 2416 2417 2418

						break;
				}

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

J
Joao Moreno 已提交
2419 2420 2421 2422 2423 2424 2425
				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 已提交
2426

J
Joao Moreno 已提交
2427 2428 2429
					if (resultFn) {
						resultFn();
					}
J
Joao Moreno 已提交
2430 2431 2432
				}
			});
		};
2433 2434

		// patch this object, so people can call methods directly
2435
		(this as any)[key] = result;
2436 2437

		return result;
J
Joao Moreno 已提交
2438 2439
	}

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

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

J
Joao Moreno 已提交
2445 2446 2447
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
2448

J
Joao Moreno 已提交
2449
		if (!uri) {
2450
			return undefined;
J
Joao Moreno 已提交
2451 2452 2453
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
2454 2455
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
2456 2457 2458 2459
		}

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

J
Joao Moreno 已提交
2462
			if (!repository) {
2463 2464
				return undefined;
			}
J
Joao Moreno 已提交
2465

J
Joao Moreno 已提交
2466 2467
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
2468
		}
2469
		return undefined;
J
Joao Moreno 已提交
2470 2471
	}

J
Joao Moreno 已提交
2472
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
2473 2474 2475 2476 2477 2478
	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) => {
2479
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
2480 2481 2482 2483 2484 2485

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

2486
			// Could it be a submodule?
2487
			if (pathEquals(resource.fsPath, repository.root)) {
2488 2489 2490
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
2491
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507

			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 已提交
2508 2509 2510
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
2511
}