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

'use strict';

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

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

J
Joao Moreno 已提交
24 25 26 27 28 29
class CheckoutItem implements QuickPickItem {

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

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

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

		if (!ref) {
			return;
		}

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

class CheckoutTagItem extends CheckoutItem {

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

class CheckoutRemoteHeadItem extends CheckoutItem {

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

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

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

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

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

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

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

82 83 84 85 86 87
class MergeItem implements QuickPickItem {

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

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

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

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

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

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

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

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

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

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

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

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

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

139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154
async function categorizeResourceByResolution(resources: Resource[]): Promise<{ merge: Resource[], resolved: Resource[], unresolved: Resource[] }> {
	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;
	const possibleUnresolved = merge.filter(isBothAddedOrModified);
	const promises = possibleUnresolved.map(s => grep(s.resourceUri.fsPath, /^<{7}|^={7}|^>{7}/));
	const unresolvedBothModified = await Promise.all<boolean>(promises);
	const resolved = possibleUnresolved.filter((s, i) => !unresolvedBothModified[i]);
	const unresolved = [
		...merge.filter(s => !isBothAddedOrModified(s)),
		...possibleUnresolved.filter((s, i) => unresolvedBothModified[i])
	];

	return { merge, resolved, unresolved };
}

155 156 157 158 159 160 161 162 163 164 165
enum PushType {
	Push,
	PushTo,
	PushTags,
}

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

J
Joao Moreno 已提交
166
export class CommandCenter {
J
Joao Moreno 已提交
167 168

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

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

J
Joao Moreno 已提交
179
			if (options.diff) {
J
Joao Moreno 已提交
180 181 182 183 184
				return commands.registerDiffInformationCommand(commandId, command);
			} else {
				return commands.registerCommand(commandId, command);
			}
		});
J
Joao Moreno 已提交
185 186
	}

J
Joao Moreno 已提交
187 188
	@command('git.refresh', { repository: true })
	async refresh(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
189
		await repository.status();
J
Joao Moreno 已提交
190
	}
J
Joao Moreno 已提交
191

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

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

200 201 202 203
		try {
			stat = await new Promise<Stats>((c, e) => lstat(resource.resourceUri.fsPath, (err, stat) => err ? e(err) : c(stat)));
		} catch (err) {
			// noop
204
		}
205

206 207 208 209
		let left: Uri | undefined;
		let right: Uri | undefined;

		if (stat && stat.isDirectory()) {
210 211 212 213
			const repository = this.model.getRepositoryForSubmodule(resource.resourceUri);

			if (repository) {
				right = toGitUri(resource.resourceUri, resource.resourceGroupType === ResourceGroupType.Index ? 'index' : 'wt', { submoduleOf: repository.root });
214 215 216 217 218
			}
		} else {
			left = await this.getLeftResource(resource);
			right = await this.getRightResource(resource);
		}
219

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

J
Joao Moreno 已提交
222 223 224 225 226
		if (!right) {
			// TODO
			console.error('oh no');
			return;
		}
J
Joao Moreno 已提交
227

J
Joao Moreno 已提交
228
		const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
229 230
			preserveFocus,
			preview,
231
			viewColumn: ViewColumn.Active
J
Joao Moreno 已提交
232 233
		};

J
Joao Moreno 已提交
234 235
		const activeTextEditor = window.activeTextEditor;

236 237 238
		// 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 已提交
239 240 241
			opts.selection = activeTextEditor.selection;
		}

242
		if (!left) {
J
Joao Moreno 已提交
243 244 245 246 247
			await commands.executeCommand<void>('vscode.open', right, opts);
		} else {
			await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
		}
	}
J
Joao Moreno 已提交
248

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

J
Joao Moreno 已提交
252 253 254
		if (!repository) {
			return toGitUri(uri, ref);
		}
J
Joao Moreno 已提交
255

J
Joao Moreno 已提交
256
		try {
J
Joao Moreno 已提交
257 258 259
			let gitRef = ref;

			if (gitRef === '~') {
J
Joao Moreno 已提交
260
				const uriString = uri.toString();
J
Joao Moreno 已提交
261
				const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString);
J
Joao Moreno 已提交
262
				gitRef = indexStatus ? '' : 'HEAD';
J
Joao Moreno 已提交
263 264
			}

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

J
Joao Moreno 已提交
268 269 270
			if (mimetype === 'text/plain') {
				return toGitUri(uri, ref);
			}
271

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

J
Joao Moreno 已提交
276
			if (ImageMimetypes.indexOf(mimetype) > -1) {
J
Joao Moreno 已提交
277 278
				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 已提交
279 280
			}

J
Joao Moreno 已提交
281
			return Uri.parse(`data:;label:${path.basename(uri.fsPath)};description:${gitRef},`);
J
Joao Moreno 已提交
282 283 284 285

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

J
Joao Moreno 已提交
288
	private async getLeftResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
289 290 291
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
292
				return this.getURI(resource.original, 'HEAD');
J
Joao Moreno 已提交
293 294

			case Status.MODIFIED:
J
Joao Moreno 已提交
295
				return this.getURI(resource.resourceUri, '~');
296 297

			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
298
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
299
		}
J
Joao Moreno 已提交
300
	}
J
Joao Moreno 已提交
301

J
Joao Moreno 已提交
302
	private async getRightResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
303 304 305 306 307
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_ADDED:
			case Status.INDEX_COPIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
308
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
309 310

			case Status.INDEX_DELETED:
311
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
312
			case Status.DELETED:
J
Joao Moreno 已提交
313
				return this.getURI(resource.resourceUri, 'HEAD');
J
Joao Moreno 已提交
314 315 316 317

			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
J
Joao Moreno 已提交
318 319 320 321 322 323
				const repository = this.model.getRepository(resource.resourceUri);

				if (!repository) {
					return;
				}

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

J
Joao Moreno 已提交
327 328
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
329 330
				}

J
Joao Moreno 已提交
331
				return resource.resourceUri;
J
Joao Moreno 已提交
332

333
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
334
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
335
				return resource.resourceUri;
J
Joao Moreno 已提交
336 337 338 339
		}
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
340
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
341 342 343 344

		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
M
Marc Kassay 已提交
345
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
346 347 348
				return `${basename} (Index)`;

			case Status.MODIFIED:
M
Marc Kassay 已提交
349 350
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
351 352 353 354 355 356
				return `${basename} (Working Tree)`;
		}

		return '';
	}

J
Joao Moreno 已提交
357
	@command('git.clone')
358 359 360 361 362 363 364
	async clone(url?: string): Promise<void> {
		if (!url) {
			url = await window.showInputBox({
				prompt: localize('repourl', "Repository URL"),
				ignoreFocusOut: true
			});
		}
J
Joao Moreno 已提交
365 366

		if (!url) {
K
kieferrm 已提交
367
			/* __GDPR__
K
kieferrm 已提交
368 369 370 371
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
372 373
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
374 375
		}

376
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
377 378 379 380 381 382 383 384 385
		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 已提交
386 387
		});

J
Joao Moreno 已提交
388
		if (!uris || uris.length === 0) {
K
kieferrm 已提交
389
			/* __GDPR__
K
kieferrm 已提交
390 391 392 393
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
394 395
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
			return;
J
Joao Moreno 已提交
396 397
		}

J
Joao Moreno 已提交
398 399 400
		const uri = uris[0];
		const parentPath = uri.fsPath;

401
		try {
402 403 404 405 406
			const opts = {
				location: ProgressLocation.Notification,
				title: localize('cloning', "Cloning git repository '{0}'...", url),
				cancellable: true
			};
M
Maryam Archie 已提交
407

408 409
			const repositoryPath = await window.withProgress(
				opts,
J
Joao Moreno 已提交
410
				(_, token) => this.git.clone(url!, parentPath, token)
411
			);
412

413 414
			const choices = [];
			let message = localize('proposeopen', "Would you like to open the cloned repository?");
415
			const open = localize('openrepo', "Open Repository");
416 417 418 419 420 421 422 423 424
			choices.push(open);

			const addToWorkspace = localize('add', "Add to Workspace");
			if (workspace.workspaceFolders) {
				message = localize('proposeopen2', "Would you like to open the cloned repository, or add it to the current workspace?");
				choices.push(addToWorkspace);
			}

			const result = await window.showInformationMessage(message, ...choices);
425 426

			const openFolder = result === open;
K
kieferrm 已提交
427
			/* __GDPR__
K
kieferrm 已提交
428 429 430 431 432
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
					"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
				}
			*/
433
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
434 435 436

			const uri = Uri.file(repositoryPath);

437
			if (openFolder) {
438 439 440
				commands.executeCommand('vscode.openFolder', uri);
			} else if (result === addToWorkspace) {
				workspace.updateWorkspaceFolders(workspace.workspaceFolders!.length, 0, { uri });
441
			}
442 443
		} catch (err) {
			if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
K
kieferrm 已提交
444
				/* __GDPR__
K
kieferrm 已提交
445 446 447 448
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
449
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'directory_not_empty' });
J
Joao Moreno 已提交
450 451
			} else if (/Cancelled/i.test(err && (err.message || err.stderr || ''))) {
				return;
452
			} else {
K
kieferrm 已提交
453
				/* __GDPR__
K
kieferrm 已提交
454 455 456 457
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
458
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'error' });
459
			}
J
Joao Moreno 已提交
460

461
			throw err;
J
Joao Moreno 已提交
462 463 464
		}
	}

J
Joao Moreno 已提交
465
	@command('git.init')
J
Joao Moreno 已提交
466
	async init(): Promise<void> {
J
Joao Moreno 已提交
467
		let repositoryPath: string | undefined;
J
Joao Moreno 已提交
468

J
Joao Moreno 已提交
469 470 471 472 473 474 475 476
		if (workspace.workspaceFolders && workspace.workspaceFolders.length > 1) {
			const placeHolder = localize('init', "Pick workspace folder to initialize git repo in");
			const items = workspace.workspaceFolders.map(folder => ({ label: folder.name, description: folder.uri.fsPath, folder }));
			const item = await window.showQuickPick(items, { placeHolder, ignoreFocusOut: true });

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

J
Joao Moreno 已提交
478
			repositoryPath = item.folder.uri.fsPath;
J
Joao Moreno 已提交
479
		}
J
Joao Moreno 已提交
480

J
Joao Moreno 已提交
481
		if (!repositoryPath) {
J
Joao Moreno 已提交
482 483 484 485 486 487 488 489 490 491 492 493
			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 已提交
494

J
Joao Moreno 已提交
495
			if (!result || result.length === 0) {
J
Joao Moreno 已提交
496 497
				return;
			}
J
Joao Moreno 已提交
498 499 500 501 502 503 504 505 506 507 508 509

			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 已提交
510
			repositoryPath = uri.fsPath;
J
Joao Moreno 已提交
511 512
		}

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

		const choices = [];
J
Joao Moreno 已提交
516 517
		let message = localize('proposeopen init', "Would you like to open the initialized repository?");
		const open = localize('openrepo', "Open Repository");
I
Ivan Sučić 已提交
518
		choices.push(open);
J
Joao Moreno 已提交
519 520 521 522 523 524

		const addToWorkspace = localize('add', "Add to Workspace");
		if (workspace.workspaceFolders) {
			message = localize('proposeopen2 init', "Would you like to open the initialized repository, or add it to the current workspace?");
			choices.push(addToWorkspace);
		}
I
Ivan Sučić 已提交
525 526

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

J
Joao Moreno 已提交
529 530 531 532 533 534
		if (result === open) {
			commands.executeCommand('vscode.openFolder', uri);
		} else if (result === addToWorkspace) {
			workspace.updateWorkspaceFolders(workspace.workspaceFolders!.length, 0, { uri });
		} else {
			await this.model.openRepository(repositoryPath);
I
Ivan Sučić 已提交
535
		}
J
Joao Moreno 已提交
536 537
	}

J
Joao Moreno 已提交
538 539
	@command('git.openRepository', { repository: false })
	async openRepository(path?: string): Promise<void> {
540
		if (!path) {
J
Joao Moreno 已提交
541 542 543 544 545 546
			const result = await window.showOpenDialog({
				canSelectFiles: false,
				canSelectFolders: true,
				canSelectMany: false,
				defaultUri: Uri.file(os.homedir()),
				openLabel: localize('open repo', "Open Repository")
547 548
			});

J
Joao Moreno 已提交
549
			if (!result || result.length === 0) {
550 551 552
				return;
			}

J
Joao Moreno 已提交
553
			path = result[0].fsPath;
554
		}
J
Joao Moreno 已提交
555 556

		await this.model.openRepository(path);
557 558
	}

J
Joao Moreno 已提交
559 560 561 562 563
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

568
		let uris: Uri[] | undefined;
569 570 571

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
572
				uris = [Uri.file(fromGitUri(arg).path)];
573
			} else if (arg.scheme === 'file') {
574
				uris = [arg];
575 576 577 578 579 580
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
581
				resource = this.getSCMResource();
582 583 584
			}

			if (resource) {
J
Joao Moreno 已提交
585 586 587 588
				const resources = ([resource, ...resourceStates] as Resource[])
					.filter(r => r.type !== Status.DELETED && r.type !== Status.INDEX_DELETED);

				uris = resources.map(r => r.resourceUri);
589
			}
J
Joao Moreno 已提交
590 591
		}

592
		if (!uris) {
J
Joao Moreno 已提交
593
			return;
J
Joao Moreno 已提交
594 595
		}

596 597 598 599
		const preview = uris.length === 1 ? true : false;
		const activeTextEditor = window.activeTextEditor;
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
600
				preserveFocus,
601
				preview,
602
				viewColumn: ViewColumn.Active
603 604
			};

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

607 608 609
			// 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 已提交
610
				// preserve not only selection but also visible range
B
Benjamin Pasero 已提交
611
				opts.selection = activeTextEditor.selection;
E
Eric Gang 已提交
612 613 614 615 616
				const previousVisibleRanges = activeTextEditor.visibleRanges;
				const editor = await window.showTextDocument(document, opts);
				editor.revealRange(previousVisibleRanges[0]);
			} else {
				await window.showTextDocument(document, opts);
B
Benjamin Pasero 已提交
617
			}
J
Joao Moreno 已提交
618
		}
J
Joao Moreno 已提交
619 620
	}

J
Joao Moreno 已提交
621 622 623 624 625
	@command('git.openFile2')
	async openFile2(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
		this.openFile(arg, ...resourceStates);
	}

J
Joao Moreno 已提交
626 627
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
628 629 630 631 632
		let resource: Resource | undefined = undefined;

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
633
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
634
		} else {
635
			resource = this.getSCMResource();
D
Duroktar 已提交
636 637 638 639 640 641
		}

		if (!resource) {
			return;
		}

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

J
Joao Moreno 已提交
644 645 646
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
647
		}
J
Joao Moreno 已提交
648 649

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

J
Joao Moreno 已提交
652 653
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
654
		const preserveFocus = arg instanceof Resource;
J
Joao 已提交
655
		const preserveSelection = arg instanceof Uri || !arg;
656
		let resources: Resource[] | undefined = undefined;
657

658
		if (arg instanceof Uri) {
659
			const resource = this.getSCMResource(arg);
660 661 662
			if (resource !== undefined) {
				resources = [resource];
			}
663
		} else {
664
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
665

666 667 668
			if (arg instanceof Resource) {
				resource = arg;
			} else {
669
				resource = this.getSCMResource();
670 671 672 673 674
			}

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

677
		if (!resources) {
J
Joao Moreno 已提交
678
			return;
J
Joao Moreno 已提交
679
		}
J
Joao Moreno 已提交
680

681 682
		const preview = resources.length === 1 ? undefined : false;
		for (const resource of resources) {
J
Joao 已提交
683
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
684
		}
J
Joao Moreno 已提交
685 686
	}

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

691 692
		resourceStates = resourceStates.filter(s => !!s);

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

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

698 699 700 701 702 703 704
			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

705
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
706 707 708 709 710 711
		const { resolved, unresolved } = await categorizeResourceByResolution(selection);

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

713 714 715 716 717 718 719 720
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
721
		const workingTree = selection.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
722
		const scmResources = [...workingTree, ...resolved, ...unresolved];
723

J
Joao Moreno 已提交
724
		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
725
		if (!scmResources.length) {
J
Joao Moreno 已提交
726 727
			return;
		}
J
Joao Moreno 已提交
728

729
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
730
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
731 732
	}

J
Joao Moreno 已提交
733 734
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
735
		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
736 737 738 739
		const { merge, unresolved } = await categorizeResourceByResolution(resources);

		if (unresolved.length > 0) {
			const message = unresolved.length > 1
J
Joao Moreno 已提交
740 741
				? 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));
742 743 744 745 746 747 748 749 750

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

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

J
Joao Moreno 已提交
751
		await repository.add([]);
J
Joao Moreno 已提交
752 753
	}

J
Joao Moreno 已提交
754
	@command('git.stageChange')
J
Joao Moreno 已提交
755 756 757 758 759 760 761 762
	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 已提交
763 764
	}

J
Joao Moreno 已提交
765
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
766
	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
767 768 769 770 771 772 773
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
774 775 776 777
		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 已提交
778

J
Joao Moreno 已提交
779
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
780 781 782
			return;
		}

J
Joao Moreno 已提交
783 784
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
785

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

J
Joao Moreno 已提交
790
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
791 792 793
			return;
		}

J
Joao Moreno 已提交
794
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
795
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
796
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
797

J
Joao Moreno 已提交
798
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
799
	}
J
Joao Moreno 已提交
800

J
Joao Moreno 已提交
801
	@command('git.revertChange')
J
Joao Moreno 已提交
802 803 804 805
	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 已提交
806 807 808
			return;
		}

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

J
Joao Moreno 已提交
812
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
813
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
814 815 816 817 818 819 820
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
821 822
		const selections = textEditor.selections;
		const selectedChanges = changes.filter(change => {
J
Joao Moreno 已提交
823
			const modifiedRange = getModifiedRange(modifiedDocument, change);
J
Joao Moreno 已提交
824 825 826 827
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
828 829 830
			return;
		}

J
Joao Moreno 已提交
831 832
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
833

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

J
Joao Moreno 已提交
838
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
839 840 841
			return;
		}

J
Joao Moreno 已提交
842 843
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
844 845
		const selectionsBeforeRevert = textEditor.selections;
		const visibleRangesBeforeRevert = textEditor.visibleRanges;
J
Joao Moreno 已提交
846
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
847

J
Joao Moreno 已提交
848 849 850
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
851

J
Joao Moreno 已提交
852 853
		await modifiedDocument.save();

854 855
		textEditor.selections = selectionsBeforeRevert;
		textEditor.revealRange(visibleRangesBeforeRevert[0]);
J
Joao Moreno 已提交
856 857
	}

J
Joao Moreno 已提交
858 859
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
860 861
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
862
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
863
			const resource = this.getSCMResource();
864 865 866 867 868 869 870 871

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

875
		if (!scmResources.length) {
J
Joao Moreno 已提交
876 877 878
			return;
		}

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

J
Joao Moreno 已提交
883 884
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
885
		await repository.revert([]);
J
Joao Moreno 已提交
886
	}
J
Joao Moreno 已提交
887

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

		if (!textEditor) {
			return;
		}

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

899 900 901 902 903 904 905
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
906 907 908
			return;
		}

J
Joao Moreno 已提交
909
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
910
		const originalDocument = await workspace.openTextDocument(originalUri);
911 912 913 914
		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 已提交
915 916 917 918 919

		if (!selectedDiffs.length) {
			return;
		}

920 921
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
922

J
Joao Moreno 已提交
923
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
924 925
	}

J
Joao Moreno 已提交
926 927
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
928 929
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
930
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
931
			const resource = this.getSCMResource();
932 933 934 935 936 937 938 939

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
943
		if (!scmResources.length) {
J
Joao Moreno 已提交
944 945
			return;
		}
J
Joao Moreno 已提交
946

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

J
Joao Moreno 已提交
951
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
952
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
953
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
954 955
				yes = localize('delete file', "Delete file");
			} else {
956 957 958 959 960 961
				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 已提交
962 963
			}
		} else {
964 965 966 967 968 969
			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 已提交
970 971 972 973 974

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

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

J
Joao Moreno 已提交
978 979 980 981
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
982
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
983
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
984
	}
J
Joao Moreno 已提交
985

J
Joao Moreno 已提交
986 987
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
988
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
989 990 991 992 993

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

J
Joao Moreno 已提交
994 995
		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 已提交
996

J
Joao Moreno 已提交
997 998 999 1000 1001 1002
		if (untrackedResources.length === 0) {
			const message = resources.length === 1
				? localize('confirm discard all single', "Are you sure you want to discard changes in {0}?", path.basename(resources[0].resourceUri.fsPath))
				: localize('confirm discard all', "Are you sure you want to discard ALL changes in {0} files?\nThis is IRREVERSIBLE!\nYour current working set will be FOREVER LOST.", resources.length);
			const yes = resources.length === 1
				? localize('discardAll multiple', "Discard 1 File")
J
Joao Moreno 已提交
1003
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1004
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
1005

J
Joao Moreno 已提交
1006
			if (pick !== yes) {
J
Joao Moreno 已提交
1007 1008 1009
				return;
			}

J
Joao 已提交
1010
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1011 1012 1013 1014 1015 1016 1017 1018
			return;
		} else if (resources.length === 1) {
			const message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(resources[0].resourceUri.fsPath));
			const yes = localize('delete file', "Delete file");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

			if (pick !== yes) {
				return;
J
Joao Moreno 已提交
1019 1020
			}

J
Joao 已提交
1021
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1022 1023 1024 1025
		} else if (trackedResources.length === 0) {
			const message = localize('confirm delete multiple', "Are you sure you want to DELETE {0} files?", resources.length);
			const yes = localize('delete files', "Delete Files");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
1026

J
Joao Moreno 已提交
1027 1028 1029
			if (pick !== yes) {
				return;
			}
J
Joao Moreno 已提交
1030

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

J
Joao Moreno 已提交
1033 1034 1035 1036
		} 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 已提交
1037

J
Joao Moreno 已提交
1038 1039 1040 1041 1042
			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 已提交
1043

J
Joao Moreno 已提交
1044
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1045 1046 1047 1048 1049 1050 1051 1052
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
1053
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1054
		}
J
Joao Moreno 已提交
1055 1056
	}

J
Joao Moreno 已提交
1057
	private async smartCommit(
J
Joao Moreno 已提交
1058
		repository: Repository,
1059
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
1060 1061
		opts?: CommitOptions
	): Promise<boolean> {
1062
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
J
Joao Moreno 已提交
1063 1064 1065 1066 1067 1068 1069 1070
		const promptToSaveFilesBeforeCommit = config.get<boolean>('promptToSaveFilesBeforeCommit') === true;

		if (promptToSaveFilesBeforeCommit) {
			const unsavedTextDocuments = workspace.textDocuments
				.filter(d => !d.isUntitled && d.isDirty && isDescendant(repository.root, d.uri.fsPath));

			if (unsavedTextDocuments.length > 0) {
				const message = unsavedTextDocuments.length === 1
J
Joao Moreno 已提交
1071 1072
					? localize('unsaved files single', "The following file is unsaved: {0}.\n\nWould you like to save it before committing?", path.basename(unsavedTextDocuments[0].uri.fsPath))
					: localize('unsaved files', "There are {0} unsaved files.\n\nWould you like to save them before committing?", unsavedTextDocuments.length);
J
Joao Moreno 已提交
1073 1074 1075 1076 1077 1078 1079 1080 1081 1082
				const saveAndCommit = localize('save and commit', "Save All & Commit");
				const commit = localize('commit', "Commit Anyway");
				const pick = await window.showWarningMessage(message, { modal: true }, saveAndCommit, commit);

				if (pick === saveAndCommit) {
					await Promise.all(unsavedTextDocuments.map(d => d.save()));
					await repository.status();
				} else if (pick !== commit) {
					return false; // do not commit on cancel
				}
1083 1084 1085
			}
		}

1086
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
1087
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
1088 1089
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
1090 1091

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

J
Joao Moreno 已提交
1094 1095
			// 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?");
1096 1097 1098 1099 1100
			const yes = localize('yes', "Yes");
			const always = localize('always', "Always");
			const pick = await window.showWarningMessage(message, { modal: true }, yes, always);

			if (pick === always) {
J
Joao Moreno 已提交
1101 1102 1103
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
1104 1105 1106
			}
		}

J
Joao Moreno 已提交
1107
		if (!opts) {
1108
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
1109 1110
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
1111 1112
		}

1113 1114 1115
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

1116 1117 1118 1119
		if (config.get<boolean>('alwaysSignOff')) {
			opts.signoff = true;
		}

J
Joao Moreno 已提交
1120
		if (
1121
			(
J
Joao Moreno 已提交
1122 1123 1124 1125 1126
				// no changes
				(noStagedChanges && noUnstagedChanges)
				// or no staged changes and not `all`
				|| (!opts.all && noStagedChanges)
			)
1127
			&& !opts.empty
J
Joao Moreno 已提交
1128
		) {
J
Joao Moreno 已提交
1129 1130 1131 1132
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1133
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1134 1135 1136 1137 1138

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
1139
		await repository.commit(message, opts);
J
Joao Moreno 已提交
1140 1141 1142 1143

		return true;
	}

J
Joao Moreno 已提交
1144
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1145
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1146
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
1147 1148 1149 1150
			if (message) {
				return message;
			}

1151 1152 1153 1154 1155 1156
			let value: string | undefined = undefined;

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

J
Joao Moreno 已提交
1157
			return await window.showInputBox({
1158
				value,
J
Joao Moreno 已提交
1159
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
1160 1161
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
1162
			});
J
Joao Moreno 已提交
1163 1164
		};

J
Joao Moreno 已提交
1165
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1166 1167

		if (message && didCommit) {
J
Joao Moreno 已提交
1168
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1169
		}
J
Joao Moreno 已提交
1170 1171
	}

J
Joao Moreno 已提交
1172
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
1173 1174
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
1175 1176
	}

J
Joao Moreno 已提交
1177
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
1178
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1179
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
1180 1181 1182
			return;
		}

J
Joao Moreno 已提交
1183
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1184 1185

		if (didCommit) {
J
Joao Moreno 已提交
1186
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1187
		}
J
Joao Moreno 已提交
1188 1189
	}

J
Joao Moreno 已提交
1190
	@command('git.commitStaged', { repository: true })
J
Joao Moreno 已提交
1191 1192
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
1193 1194
	}

J
Joao Moreno 已提交
1195
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
1196 1197
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
1198 1199
	}

J
Joao Moreno 已提交
1200
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
1201
	async commitStagedAmend(repository: Repository): Promise<void> {
1202
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
1203 1204
	}

J
Joao Moreno 已提交
1205
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
1206 1207
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
1208 1209
	}

J
Joao Moreno 已提交
1210
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1211 1212
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1213 1214
	}

J
Joao Moreno 已提交
1215
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
1216 1217
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
1218 1219
	}

J
Joao Moreno 已提交
1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241
	@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 已提交
1242
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
1243 1244
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1245 1246

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

J
Joao Moreno 已提交
1251
		const commit = await repository.getCommit('HEAD');
J
Joao Moreno 已提交
1252 1253

		if (commit.parents.length > 0) {
1254 1255 1256 1257 1258
			await repository.reset('HEAD~');
		} else {
			await repository.deleteRef('HEAD');
			await this.unstageAll(repository);
		}
J
Joao Moreno 已提交
1259

J
Joao Moreno 已提交
1260
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1261 1262
	}

J
Joao Moreno 已提交
1263
	@command('git.checkout', { repository: true })
J
Joao Moreno 已提交
1264
	async checkout(repository: Repository, treeish: string): Promise<void> {
J
Joao Moreno 已提交
1265
		if (typeof treeish === 'string') {
J
Joao Moreno 已提交
1266
			return await repository.checkout(treeish);
J
Joao Moreno 已提交
1267 1268
		}

J
Joao Moreno 已提交
1269
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1270
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
1271 1272 1273
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1274
		const createBranch = new CreateBranchItem(this);
J
Joao Moreno 已提交
1275

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

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

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

J
Joao Moreno 已提交
1285
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
1286
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
1287
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
1288 1289 1290 1291 1292

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1293
		await choice.run(repository);
J
Joao Moreno 已提交
1294 1295
	}

1296

J
Joao Moreno 已提交
1297
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1298
	async branch(repository: Repository): Promise<void> {
1299
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312
		const branchValidationRegex = config.get<string>('branchValidationRegex')!;
		const branchWhitespaceChar = config.get<string>('branchWhitespaceChar')!;
		const validateName = new RegExp(branchValidationRegex);
		const sanitize = (name: string) => {
			name = name.trim();

			if (!name) {
				return name;
			}

			return name.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.|\[|\]$/g, branchWhitespaceChar);
		};

J
Joao Moreno 已提交
1313
		const result = await window.showInputBox({
J
Joao Moreno 已提交
1314
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
1315
			prompt: localize('provide branch name', "Please provide a branch name"),
1316 1317
			ignoreFocusOut: true,
			validateInput: (name: string) => {
J
Joao Moreno 已提交
1318
				if (validateName.test(sanitize(name))) {
1319 1320
					return null;
				}
J
Joao Moreno 已提交
1321 1322

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

J
Joao Moreno 已提交
1326 1327 1328
		const name = sanitize(result || '');

		if (!name) {
J
Joao Moreno 已提交
1329 1330
			return;
		}
J
Joao Moreno 已提交
1331

J
Joao Moreno 已提交
1332
		await repository.branch(name, true);
J
Joao Moreno 已提交
1333 1334
	}

J
Joao Moreno 已提交
1335
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1336
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1337 1338
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1339
			run = force => repository.deleteBranch(name, force);
1340
		} else {
J
Joao Moreno 已提交
1341 1342
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1343
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1344

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

M
Maik Riechert 已提交
1348
			if (!choice || !choice.branchName) {
1349 1350
				return;
			}
M
Maik Riechert 已提交
1351
			name = choice.branchName;
J
Joao Moreno 已提交
1352
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1353 1354
		}

1355 1356 1357 1358 1359 1360 1361 1362 1363
		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");
1364
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1365 1366 1367 1368 1369

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

1372 1373
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
J
Justin Horner 已提交
1374 1375 1376 1377 1378 1379 1380 1381
		const placeHolder = localize('provide branch name', "Please provide a branch name");
		const name = await window.showInputBox({ placeHolder });

		if (!name || name.trim().length === 0) {
			return;
		}

		try {
1382
			await repository.renameBranch(name);
J
Justin Horner 已提交
1383 1384 1385
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1386 1387
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1388
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1389
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", name));
1390 1391 1392
					return;
				default:
					throw err;
J
Justin Horner 已提交
1393 1394 1395 1396
			}
		}
	}

J
Joao Moreno 已提交
1397
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1398
	async merge(repository: Repository): Promise<void> {
1399 1400 1401 1402
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1403
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1404 1405
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1406

J
Joao Moreno 已提交
1407
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1408 1409
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1410 1411

		const picks = [...heads, ...remoteHeads];
1412 1413
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1414 1415 1416 1417 1418

		if (!choice) {
			return;
		}

1419
		await choice.run(repository);
1420 1421
	}

J
Joao Moreno 已提交
1422
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1423
	async createTag(repository: Repository): Promise<void> {
1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435
		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 已提交
1436
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1437 1438 1439 1440 1441
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
1445 1446 1447 1448 1449 1450 1451
	@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 已提交
1452
		await repository.fetchDefault();
J
Joao Moreno 已提交
1453 1454
	}

J
Joao Moreno 已提交
1455 1456 1457 1458 1459 1460 1461 1462 1463 1464
	@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 已提交
1465
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1466 1467
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1468 1469 1470 1471 1472 1473

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

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

D
Dozed12 已提交
1478
		if (!remotePick) {
1479 1480 1481
			return;
		}

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

D
Dozed12 已提交
1488
		if (!branchPick) {
1489 1490 1491
			return;
		}

F
Francisco Moreira 已提交
1492 1493
		const remoteCharCnt = remotePick.label.length;

1494
		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1495 1496
	}

J
Joao Moreno 已提交
1497
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1498 1499
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1500 1501 1502 1503 1504 1505

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

J
Joao Moreno 已提交
1506
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1507 1508
	}

J
Joao Moreno 已提交
1509
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1510 1511
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1512 1513 1514 1515 1516 1517

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

J
Joao Moreno 已提交
1518
		await repository.pullWithRebase(repository.HEAD);
J
Joao Moreno 已提交
1519 1520
	}

J
Joao Moreno 已提交
1521
	private async _push(repository: Repository, pushOptions: PushOptions) {
J
Joao Moreno 已提交
1522
		const remotes = repository.remotes;
1523

J
Joao Moreno 已提交
1524 1525 1526 1527
		if (remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
			return;
		}
1528

J
Joao Moreno 已提交
1529 1530 1531 1532 1533 1534
		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."));
1535 1536
				return;
			}
J
Joao Moreno 已提交
1537

J
Joao Moreno 已提交
1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551
			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 已提交
1552 1553
		}

1554 1555 1556 1557 1558 1559 1560
		if (pushOptions.pushType === PushType.PushTags) {
			await repository.pushTags(undefined, forcePushMode);

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

1561 1562 1563 1564 1565
		if (!repository.HEAD || !repository.HEAD.name) {
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

1566 1567 1568 1569 1570 1571 1572
		if (pushOptions.pushType === PushType.Push) {
			try {
				await repository.push(repository.HEAD, forcePushMode);
			} catch (err) {
				if (err.gitErrorCode !== GitErrorCodes.NoUpstreamBranch) {
					throw err;
				}
1573

1574 1575 1576 1577 1578 1579 1580 1581 1582 1583
				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 {
1584
			const branchName = repository.HEAD.name;
1585 1586 1587
			const picks = remotes.filter(r => r.pushUrl !== undefined).map(r => ({ label: r.name, description: r.pushUrl! }));
			const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
			const pick = await window.showQuickPick(picks, { placeHolder });
1588

1589 1590
			if (!pick) {
				return;
1591
			}
1592 1593

			await repository.pushTo(pick.label, branchName, undefined, forcePushMode);
1594
		}
J
Joao Moreno 已提交
1595 1596
	}

1597 1598
	@command('git.push', { repository: true })
	async push(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1599
		await this._push(repository, { pushType: PushType.Push });
1600
	}
1601

1602 1603
	@command('git.pushForce', { repository: true })
	async pushForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1604
		await this._push(repository, { pushType: PushType.Push, forcePush: true });
1605
	}
1606

1607 1608
	@command('git.pushWithTags', { repository: true })
	async pushWithTags(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1609
		await this._push(repository, { pushType: PushType.PushTags });
1610
	}
1611

1612 1613
	@command('git.pushWithTagsForce', { repository: true })
	async pushWithTagsForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1614
		await this._push(repository, { pushType: PushType.PushTags, forcePush: true });
1615 1616
	}

J
Joao Moreno 已提交
1617
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1618
	async pushTo(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1619
		await this._push(repository, { pushType: PushType.PushTo });
1620
	}
J
Joao Moreno 已提交
1621

1622 1623
	@command('git.pushToForce', { repository: true })
	async pushToForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1624
		await this._push(repository, { pushType: PushType.PushTo, forcePush: true });
J
Joao Moreno 已提交
1625 1626
	}

J
Joao Moreno 已提交
1627
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1628
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1629 1630 1631 1632 1633

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

J
Joao Moreno 已提交
1634 1635 1636 1637
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
1638
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1639
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
1640 1641

		if (shouldPrompt) {
J
Joao Moreno 已提交
1642
			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 已提交
1643
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
1644
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
1645 1646 1647 1648 1649 1650 1651 1652 1653
			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 已提交
1654
		if (rebase) {
J
Joao Moreno 已提交
1655
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
1656
		} else {
J
Joao Moreno 已提交
1657
			await repository.sync(HEAD);
J
Joao Moreno 已提交
1658 1659 1660 1661 1662 1663
		}
	}

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

J
Joao 已提交
1666 1667 1668 1669 1670 1671 1672 1673 1674
	@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 已提交
1675
			await repository.sync(HEAD);
J
Joao 已提交
1676 1677 1678
		}));
	}

1679
	@command('git.syncRebase', { repository: true })
J
Joao Moreno 已提交
1680 1681
	syncRebase(repository: Repository): Promise<void> {
		return this._sync(repository, true);
J
Joao Moreno 已提交
1682 1683
	}

J
Joao Moreno 已提交
1684
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1685 1686
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1687 1688 1689 1690 1691 1692

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

J
Joao Moreno 已提交
1693
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1694 1695 1696 1697 1698 1699
		const selectRemote = async () => {
			const picks = repository.remotes.map(r => r.name);
			const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
			return await window.showQuickPick(picks, { placeHolder });
		};
		const choice = remotes.length === 1 ? remotes[0].name : await selectRemote();
J
Joao Moreno 已提交
1700 1701 1702 1703 1704

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1705
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1706 1707
	}

1708 1709
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
1710 1711
		resourceStates = resourceStates.filter(s => !!s);

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

1715
			if (!resource) {
J
Joao Moreno 已提交
1716 1717 1718
				return;
			}

1719
			resourceStates = [resource];
J
Joao Moreno 已提交
1720 1721
		}

1722
		const resources = resourceStates
J
Joao Moreno 已提交
1723 1724 1725
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1726
		if (!resources.length) {
N
NKumar2 已提交
1727 1728 1729
			return;
		}

1730
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
1731 1732
	}

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

1737
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
1738 1739 1740
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1741

1742
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
1743 1744 1745 1746 1747

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

J
Joao Moreno 已提交
1748
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
1749 1750
	}

1751 1752 1753 1754 1755 1756 1757
	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 已提交
1758 1759 1760 1761 1762 1763 1764 1765 1766 1767
	@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 已提交
1768
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1769
	async stashPop(repository: Repository): Promise<void> {
1770
		const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
J
Joao Moreno 已提交
1771
		const stash = await this.pickStash(repository, placeHolder);
1772

J
Joao Moreno 已提交
1773
		if (!stash) {
1774 1775 1776
			return;
		}

J
Joao Moreno 已提交
1777
		await repository.popStash(stash.index);
1778 1779 1780 1781
	}

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

J
Joao Moreno 已提交
1784 1785
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
1786 1787 1788
			return;
		}

1789 1790 1791 1792 1793 1794
		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 已提交
1795
		const stash = await this.pickStash(repository, placeHolder);
K
Krzysztof Cieślak 已提交
1796

J
Joao Moreno 已提交
1797
		if (!stash) {
K
Krzysztof Cieślak 已提交
1798 1799
			return;
		}
J
Joao Moreno 已提交
1800

J
Joao Moreno 已提交
1801
		await repository.applyStash(stash.index);
K
Krzysztof Cieślak 已提交
1802 1803
	}

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

J
Joao Moreno 已提交
1808 1809
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
1810 1811 1812 1813 1814 1815
			return;
		}

		await repository.applyStash();
	}

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

J
Joao Moreno 已提交
1819 1820
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
1821 1822 1823
			return;
		}

J
Joao Moreno 已提交
1824 1825 1826
		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 已提交
1827
	}
K
Krzysztof Cieślak 已提交
1828

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

J
Joao Moreno 已提交
1833
			if (!options.repository) {
J
Joao Moreno 已提交
1834 1835
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1836 1837
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1838 1839 1840 1841 1842 1843 1844 1845 1846
				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();
				}
1847

J
Joao Moreno 已提交
1848
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1849
					if (!repository) {
J
Joao 已提交
1850
						return Promise.resolve();
J
Joao Moreno 已提交
1851 1852
					}

J
Joao Moreno 已提交
1853
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1854
				});
J
Joao Moreno 已提交
1855 1856
			}

K
kieferrm 已提交
1857
			/* __GDPR__
K
kieferrm 已提交
1858 1859 1860 1861
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
1862 1863
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1864
			return result.catch(async err => {
J
Joao Moreno 已提交
1865
				const options: MessageOptions = {
1866
					modal: true
J
Joao Moreno 已提交
1867 1868
				};

J
Joao Moreno 已提交
1869
				let message: string;
1870
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
1871

J
Joao Moreno 已提交
1872 1873 1874 1875 1876
				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 已提交
1877
				switch (err.gitErrorCode) {
1878
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1879 1880
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1881
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
1882
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
1883
						break;
1884 1885 1886 1887 1888
					case GitErrorCodes.Conflict:
						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
						type = 'warning';
						options.modal = false;
						break;
1889 1890
					case GitErrorCodes.NoUserNameConfigured:
					case GitErrorCodes.NoUserEmailConfigured:
J
Joao Moreno 已提交
1891 1892
						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')));
1893
						break;
J
Joao Moreno 已提交
1894
					default:
1895 1896 1897
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1898
							.split(/[\r\n]/)
J
João Moreno 已提交
1899
							.filter((line: string) => !!line)
1900 1901 1902 1903 1904
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1905 1906 1907 1908 1909 1910 1911 1912 1913

						break;
				}

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

J
Joao Moreno 已提交
1914 1915 1916 1917 1918 1919 1920
				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 已提交
1921

J
Joao Moreno 已提交
1922 1923 1924
					if (resultFn) {
						resultFn();
					}
J
Joao Moreno 已提交
1925 1926 1927
				}
			});
		};
1928 1929

		// patch this object, so people can call methods directly
1930
		(this as any)[key] = result;
1931 1932

		return result;
J
Joao Moreno 已提交
1933 1934
	}

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

J
Joao Moreno 已提交
1938
		this.outputChannel.appendLine(`git.getSCMResource.uri ${uri && uri.toString()}`);
J
Joao Moreno 已提交
1939 1940 1941
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
1942

J
Joao Moreno 已提交
1943
		if (!uri) {
1944
			return undefined;
J
Joao Moreno 已提交
1945 1946 1947
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1948 1949
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1950 1951 1952 1953
		}

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

J
Joao Moreno 已提交
1956
			if (!repository) {
1957 1958
				return undefined;
			}
J
Joao Moreno 已提交
1959

J
Joao Moreno 已提交
1960 1961
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1962 1963 1964
		}
	}

J
Joao Moreno 已提交
1965
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
1966 1967 1968 1969 1970 1971
	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) => {
1972
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
1973 1974 1975 1976 1977 1978

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

1979
			// Could it be a submodule?
1980
			if (pathEquals(resource.fsPath, repository.root)) {
1981 1982 1983
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
1984
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000

			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 已提交
2001 2002 2003
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
2004
}