commands.ts 57.6 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, GitErrorCodes } from './git';
J
Joao Moreno 已提交
10
import { Repository, Resource, Status, CommitOptions, 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 } 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 30
class CheckoutItem implements QuickPickItem {

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

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

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

		if (!ref) {
			return;
		}

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

class CheckoutTagItem extends CheckoutItem {

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

class CheckoutRemoteHeadItem extends CheckoutItem {

J
Joao Moreno 已提交
53 54 55
	get description(): string {
		return localize('remote branch at', "Remote branch at {0}", this.shortCommit);
	}
J
Joao Moreno 已提交
56 57 58 59 60 61 62 63 64 65 66

	protected get treeish(): string | undefined {
		if (!this.ref.name) {
			return;
		}

		const match = /^[^/]+\/(.*)$/.exec(this.ref.name);
		return match ? match[1] : this.ref.name;
	}
}

M
Maik Riechert 已提交
67 68
class BranchDeleteItem implements QuickPickItem {

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

74
	constructor(private ref: Ref) { }
M
Maik Riechert 已提交
75

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

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

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

J
Joao Moreno 已提交
96 97
class CreateBranchItem implements QuickPickItem {

J
Joao Moreno 已提交
98 99
	constructor(private cc: CommandCenter) { }

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

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

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

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

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

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

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

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

141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156
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 };
}

J
Joao Moreno 已提交
157
export class CommandCenter {
J
Joao Moreno 已提交
158 159

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

J
Joao Moreno 已提交
161
	constructor(
J
Joao Moreno 已提交
162
		private git: Git,
J
Joao Moreno 已提交
163
		private model: Model,
J
Joao Moreno 已提交
164 165
		private outputChannel: OutputChannel,
		private telemetryReporter: TelemetryReporter
J
Joao Moreno 已提交
166
	) {
J
Joao Moreno 已提交
167 168
		this.disposables = Commands.map(({ commandId, key, method, options }) => {
			const command = this.createCommand(commandId, key, method, options);
169

J
Joao Moreno 已提交
170
			if (options.diff) {
J
Joao Moreno 已提交
171 172 173 174 175
				return commands.registerDiffInformationCommand(commandId, command);
			} else {
				return commands.registerCommand(commandId, command);
			}
		});
J
Joao Moreno 已提交
176 177
	}

J
Joao Moreno 已提交
178 179
	@command('git.refresh', { repository: true })
	async refresh(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
180
		await repository.status();
J
Joao Moreno 已提交
181
	}
J
Joao Moreno 已提交
182

J
Joao Moreno 已提交
183 184
	@command('git.openResource')
	async openResource(resource: Resource): Promise<void> {
J
Joao 已提交
185
		await this._openResource(resource, undefined, true, false);
J
Joao Moreno 已提交
186 187
	}

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

191 192 193 194
		try {
			stat = await new Promise<Stats>((c, e) => lstat(resource.resourceUri.fsPath, (err, stat) => err ? e(err) : c(stat)));
		} catch (err) {
			// noop
195
		}
196

197 198 199 200
		let left: Uri | undefined;
		let right: Uri | undefined;

		if (stat && stat.isDirectory()) {
201 202 203 204
			const repository = this.model.getRepositoryForSubmodule(resource.resourceUri);

			if (repository) {
				right = toGitUri(resource.resourceUri, resource.resourceGroupType === ResourceGroupType.Index ? 'index' : 'wt', { submoduleOf: repository.root });
205 206 207 208 209
			}
		} else {
			left = await this.getLeftResource(resource);
			right = await this.getRightResource(resource);
		}
210

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

J
Joao Moreno 已提交
213 214 215 216 217
		if (!right) {
			// TODO
			console.error('oh no');
			return;
		}
J
Joao Moreno 已提交
218

J
Joao Moreno 已提交
219
		const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
220 221
			preserveFocus,
			preview,
222
			viewColumn: ViewColumn.Active
J
Joao Moreno 已提交
223 224
		};

J
Joao Moreno 已提交
225 226
		const activeTextEditor = window.activeTextEditor;

227 228 229
		// 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 已提交
230 231 232
			opts.selection = activeTextEditor.selection;
		}

233
		if (!left) {
J
Joao Moreno 已提交
234 235 236 237 238
			await commands.executeCommand<void>('vscode.open', right, opts);
		} else {
			await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
		}
	}
J
Joao Moreno 已提交
239

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

J
Joao Moreno 已提交
243 244 245
		if (!repository) {
			return toGitUri(uri, ref);
		}
J
Joao Moreno 已提交
246

J
Joao Moreno 已提交
247
		try {
J
Joao Moreno 已提交
248 249 250
			let gitRef = ref;

			if (gitRef === '~') {
J
Joao Moreno 已提交
251
				const uriString = uri.toString();
J
Joao Moreno 已提交
252
				const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString);
J
Joao Moreno 已提交
253
				gitRef = indexStatus ? '' : 'HEAD';
J
Joao Moreno 已提交
254 255
			}

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

J
Joao Moreno 已提交
259 260 261
			if (mimetype === 'text/plain') {
				return toGitUri(uri, ref);
			}
262

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

J
Joao Moreno 已提交
267
			if (ImageMimetypes.indexOf(mimetype) > -1) {
J
Joao Moreno 已提交
268 269
				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 已提交
270 271
			}

J
Joao Moreno 已提交
272
			return Uri.parse(`data:;label:${path.basename(uri.fsPath)};description:${gitRef},`);
J
Joao Moreno 已提交
273 274 275 276

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

J
Joao Moreno 已提交
279
	private async getLeftResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
280 281 282
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
283
				return this.getURI(resource.original, 'HEAD');
J
Joao Moreno 已提交
284 285

			case Status.MODIFIED:
J
Joao Moreno 已提交
286
				return this.getURI(resource.resourceUri, '~');
287 288

			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
289
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
290
		}
J
Joao Moreno 已提交
291
	}
J
Joao Moreno 已提交
292

J
Joao Moreno 已提交
293
	private async getRightResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
294 295 296 297 298
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_ADDED:
			case Status.INDEX_COPIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
299
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
300 301

			case Status.INDEX_DELETED:
302
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
303
			case Status.DELETED:
J
Joao Moreno 已提交
304
				return this.getURI(resource.resourceUri, 'HEAD');
J
Joao Moreno 已提交
305 306 307 308

			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
J
Joao Moreno 已提交
309 310 311 312 313 314
				const repository = this.model.getRepository(resource.resourceUri);

				if (!repository) {
					return;
				}

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

J
Joao Moreno 已提交
318 319
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
320 321
				}

J
Joao Moreno 已提交
322
				return resource.resourceUri;
J
Joao Moreno 已提交
323

324
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
325
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
326
				return resource.resourceUri;
J
Joao Moreno 已提交
327 328 329 330
		}
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
331
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
332 333 334 335

		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
M
Marc Kassay 已提交
336
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
337 338 339
				return `${basename} (Index)`;

			case Status.MODIFIED:
M
Marc Kassay 已提交
340 341
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
342 343 344 345 346 347
				return `${basename} (Working Tree)`;
		}

		return '';
	}

J
Joao Moreno 已提交
348
	@command('git.clone')
349 350 351 352 353 354 355
	async clone(url?: string): Promise<void> {
		if (!url) {
			url = await window.showInputBox({
				prompt: localize('repourl', "Repository URL"),
				ignoreFocusOut: true
			});
		}
J
Joao Moreno 已提交
356 357

		if (!url) {
K
kieferrm 已提交
358
			/* __GDPR__
K
kieferrm 已提交
359 360 361 362
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
363 364
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
365 366
		}

367
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
368 369 370 371 372 373 374 375 376
		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 已提交
377 378
		});

J
Joao Moreno 已提交
379
		if (!uris || uris.length === 0) {
K
kieferrm 已提交
380
			/* __GDPR__
K
kieferrm 已提交
381 382 383 384
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
385 386
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
			return;
J
Joao Moreno 已提交
387 388
		}

J
Joao Moreno 已提交
389 390 391
		const uri = uris[0];
		const parentPath = uri.fsPath;

392
		try {
393 394 395 396 397
			const opts = {
				location: ProgressLocation.Notification,
				title: localize('cloning', "Cloning git repository '{0}'...", url),
				cancellable: true
			};
M
Maryam Archie 已提交
398

399 400
			const repositoryPath = await window.withProgress(
				opts,
J
Joao Moreno 已提交
401
				(_, token) => this.git.clone(url!, parentPath, token)
402
			);
403

404 405
			const choices = [];
			let message = localize('proposeopen', "Would you like to open the cloned repository?");
406
			const open = localize('openrepo', "Open Repository");
407 408 409 410 411 412 413 414 415
			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);
416 417

			const openFolder = result === open;
K
kieferrm 已提交
418
			/* __GDPR__
K
kieferrm 已提交
419 420 421 422 423
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
					"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
				}
			*/
424
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
425 426 427

			const uri = Uri.file(repositoryPath);

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

452
			throw err;
J
Joao Moreno 已提交
453 454 455
		}
	}

J
Joao Moreno 已提交
456
	@command('git.init')
J
Joao Moreno 已提交
457
	async init(): Promise<void> {
J
Joao Moreno 已提交
458
		let path: string | undefined;
J
Joao Moreno 已提交
459

J
Joao Moreno 已提交
460 461 462 463 464 465 466 467
		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 已提交
468

J
Joao Moreno 已提交
469 470
			path = item.folder.uri.fsPath;
		}
J
Joao Moreno 已提交
471

J
Joao Moreno 已提交
472 473 474 475 476 477 478 479 480 481 482 483 484
		if (!path) {
			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 已提交
485

J
Joao Moreno 已提交
486
			if (!result || result.length === 0) {
J
Joao Moreno 已提交
487 488
				return;
			}
J
Joao Moreno 已提交
489 490 491 492 493 494 495 496 497 498 499 500 501

			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;
				}
			}

			path = uri.fsPath;
J
Joao Moreno 已提交
502 503
		}

J
Joao Moreno 已提交
504
		await this.git.init(path);
J
Joao Moreno 已提交
505
		await this.model.openRepository(path);
J
Joao Moreno 已提交
506 507
	}

J
Joao Moreno 已提交
508 509
	@command('git.openRepository', { repository: false })
	async openRepository(path?: string): Promise<void> {
510
		if (!path) {
J
Joao Moreno 已提交
511 512 513 514 515 516
			const result = await window.showOpenDialog({
				canSelectFiles: false,
				canSelectFolders: true,
				canSelectMany: false,
				defaultUri: Uri.file(os.homedir()),
				openLabel: localize('open repo', "Open Repository")
517 518
			});

J
Joao Moreno 已提交
519
			if (!result || result.length === 0) {
520 521 522
				return;
			}

J
Joao Moreno 已提交
523
			path = result[0].fsPath;
524
		}
J
Joao Moreno 已提交
525 526

		await this.model.openRepository(path);
527 528
	}

J
Joao Moreno 已提交
529 530 531 532 533
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

538
		let uris: Uri[] | undefined;
539 540 541

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
542
				uris = [Uri.file(fromGitUri(arg).path)];
543
			} else if (arg.scheme === 'file') {
544
				uris = [arg];
545 546 547 548 549 550
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
551
				resource = this.getSCMResource();
552 553 554
			}

			if (resource) {
J
Joao Moreno 已提交
555 556 557 558
				const resources = ([resource, ...resourceStates] as Resource[])
					.filter(r => r.type !== Status.DELETED && r.type !== Status.INDEX_DELETED);

				uris = resources.map(r => r.resourceUri);
559
			}
J
Joao Moreno 已提交
560 561
		}

562
		if (!uris) {
J
Joao Moreno 已提交
563
			return;
J
Joao Moreno 已提交
564 565
		}

566 567 568 569
		const preview = uris.length === 1 ? true : false;
		const activeTextEditor = window.activeTextEditor;
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
570
				preserveFocus,
571
				preview,
572
				viewColumn: ViewColumn.Active
573 574
			};

575 576 577
			// 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) {
B
Benjamin Pasero 已提交
578 579 580
				opts.selection = activeTextEditor.selection;
			}

581
			await commands.executeCommand<void>('vscode.open', uri, opts);
J
Joao Moreno 已提交
582
		}
J
Joao Moreno 已提交
583 584
	}

J
Joao Moreno 已提交
585 586 587 588 589
	@command('git.openFile2')
	async openFile2(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
		this.openFile(arg, ...resourceStates);
	}

J
Joao Moreno 已提交
590 591
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
592 593 594 595 596
		let resource: Resource | undefined = undefined;

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
597
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
598
		} else {
599
			resource = this.getSCMResource();
D
Duroktar 已提交
600 601 602 603 604 605
		}

		if (!resource) {
			return;
		}

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

J
Joao Moreno 已提交
608 609 610
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
611
		}
J
Joao Moreno 已提交
612 613

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

J
Joao Moreno 已提交
616 617
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
618
		const preserveFocus = arg instanceof Resource;
J
Joao 已提交
619
		const preserveSelection = arg instanceof Uri || !arg;
620
		let resources: Resource[] | undefined = undefined;
621

622
		if (arg instanceof Uri) {
623
			const resource = this.getSCMResource(arg);
624 625 626
			if (resource !== undefined) {
				resources = [resource];
			}
627
		} else {
628
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
629

630 631 632
			if (arg instanceof Resource) {
				resource = arg;
			} else {
633
				resource = this.getSCMResource();
634 635 636 637 638
			}

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

641
		if (!resources) {
J
Joao Moreno 已提交
642
			return;
J
Joao Moreno 已提交
643
		}
J
Joao Moreno 已提交
644

645 646
		const preview = resources.length === 1 ? undefined : false;
		for (const resource of resources) {
J
Joao 已提交
647
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
648
		}
J
Joao Moreno 已提交
649 650
	}

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

655 656
		resourceStates = resourceStates.filter(s => !!s);

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

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

662 663 664 665 666 667 668
			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

669
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
670 671 672 673 674 675
		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));
676

677 678 679 680 681 682 683 684
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

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

J
Joao Moreno 已提交
688
		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
689
		if (!scmResources.length) {
J
Joao Moreno 已提交
690 691
			return;
		}
J
Joao Moreno 已提交
692

693
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
694
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
695 696
	}

J
Joao Moreno 已提交
697 698
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
699
		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
700 701 702 703
		const { merge, unresolved } = await categorizeResourceByResolution(resources);

		if (unresolved.length > 0) {
			const message = unresolved.length > 1
J
Joao Moreno 已提交
704 705
				? 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));
706 707 708 709 710 711 712 713 714

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

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

J
Joao Moreno 已提交
715
		await repository.add([]);
J
Joao Moreno 已提交
716 717
	}

J
Joao Moreno 已提交
718
	@command('git.stageChange')
J
Joao Moreno 已提交
719 720 721 722 723 724 725 726
	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 已提交
727 728
	}

J
Joao Moreno 已提交
729
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
730
	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
731 732 733 734 735 736 737
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
738 739 740 741
		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 已提交
742

J
Joao Moreno 已提交
743
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
744 745 746
			return;
		}

J
Joao Moreno 已提交
747 748
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
749

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

J
Joao Moreno 已提交
754
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
755 756 757
			return;
		}

J
Joao Moreno 已提交
758
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
759
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
760
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
761

J
Joao Moreno 已提交
762
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
763
	}
J
Joao Moreno 已提交
764

J
Joao Moreno 已提交
765
	@command('git.revertChange')
J
Joao Moreno 已提交
766 767 768 769
	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 已提交
770 771 772
			return;
		}

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

J
Joao Moreno 已提交
776
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
777
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
778 779 780 781 782 783 784
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
785 786
		const selections = textEditor.selections;
		const selectedChanges = changes.filter(change => {
J
Joao Moreno 已提交
787
			const modifiedRange = getModifiedRange(modifiedDocument, change);
J
Joao Moreno 已提交
788 789 790 791
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
792 793 794
			return;
		}

J
Joao Moreno 已提交
795 796
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
797

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

J
Joao Moreno 已提交
802
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
803 804 805
			return;
		}

J
Joao Moreno 已提交
806 807
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
808 809
		const selectionsBeforeRevert = textEditor.selections;
		const visibleRangesBeforeRevert = textEditor.visibleRanges;
J
Joao Moreno 已提交
810
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
811

J
Joao Moreno 已提交
812 813 814
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
815

J
Joao Moreno 已提交
816 817
		await modifiedDocument.save();

818 819
		textEditor.selections = selectionsBeforeRevert;
		textEditor.revealRange(visibleRangesBeforeRevert[0]);
J
Joao Moreno 已提交
820 821
	}

J
Joao Moreno 已提交
822 823
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
824 825
		resourceStates = resourceStates.filter(s => !!s);

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

839
		if (!scmResources.length) {
J
Joao Moreno 已提交
840 841 842
			return;
		}

843
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
844
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
845 846
	}

J
Joao Moreno 已提交
847 848
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
849
		await repository.revert([]);
J
Joao Moreno 已提交
850
	}
J
Joao Moreno 已提交
851

J
Joao Moreno 已提交
852 853
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
854 855 856 857 858 859 860 861 862
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

863 864 865 866 867 868 869
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
870 871 872
			return;
		}

J
Joao Moreno 已提交
873
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
874
		const originalDocument = await workspace.openTextDocument(originalUri);
875 876 877 878
		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 已提交
879 880 881 882 883

		if (!selectedDiffs.length) {
			return;
		}

884 885
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
886

J
Joao Moreno 已提交
887
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
888 889
	}

J
Joao Moreno 已提交
890 891
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
892 893
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
894
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
895
			const resource = this.getSCMResource();
896 897 898 899 900 901 902 903

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
907
		if (!scmResources.length) {
J
Joao Moreno 已提交
908 909
			return;
		}
J
Joao Moreno 已提交
910

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

J
Joao Moreno 已提交
915
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
916
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
917
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
918 919
				yes = localize('delete file', "Delete file");
			} else {
J
Joao Moreno 已提交
920
				message = localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
921 922
			}
		} else {
J
Joao Moreno 已提交
923
			message = localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", scmResources.length);
J
Joao Moreno 已提交
924 925 926 927 928

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

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

J
Joao Moreno 已提交
932 933 934 935
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
936
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
937
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
938
	}
J
Joao Moreno 已提交
939

J
Joao Moreno 已提交
940 941
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
942
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
943 944 945 946 947

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

J
Joao Moreno 已提交
948 949
		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 已提交
950

J
Joao Moreno 已提交
951 952 953 954 955 956
		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 已提交
957
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
958
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
959

J
Joao Moreno 已提交
960
			if (pick !== yes) {
J
Joao Moreno 已提交
961 962 963
				return;
			}

J
Joao 已提交
964
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
965 966 967 968 969 970 971 972
			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 已提交
973 974
			}

J
Joao 已提交
975
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
976 977 978 979
		} 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 已提交
980

J
Joao Moreno 已提交
981 982 983
			if (pick !== yes) {
				return;
			}
J
Joao Moreno 已提交
984

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

J
Joao Moreno 已提交
987 988 989 990
		} 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 已提交
991

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

J
Joao Moreno 已提交
998
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
999 1000 1001 1002 1003 1004 1005 1006
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
1007
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1008
		}
J
Joao Moreno 已提交
1009 1010
	}

J
Joao Moreno 已提交
1011
	private async smartCommit(
J
Joao Moreno 已提交
1012
		repository: Repository,
1013
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
1014 1015
		opts?: CommitOptions
	): Promise<boolean> {
1016
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
J
Joao Moreno 已提交
1017 1018 1019 1020 1021 1022 1023 1024
		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 已提交
1025 1026
					? 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 已提交
1027 1028 1029 1030 1031 1032 1033 1034 1035 1036
				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
				}
1037 1038 1039
			}
		}

1040
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
1041
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
1042 1043
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
1044 1045

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

J
Joao Moreno 已提交
1048 1049
			// 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?");
1050 1051 1052 1053 1054
			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 已提交
1055 1056 1057
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
1058 1059 1060
			}
		}

J
Joao Moreno 已提交
1061
		if (!opts) {
1062
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
1063 1064
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
1065 1066
		}

1067 1068 1069
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

1070 1071 1072 1073
		if (config.get<boolean>('alwaysSignOff')) {
			opts.signoff = true;
		}

J
Joao Moreno 已提交
1074 1075
		if (
			// no changes
1076
			(noStagedChanges && noUnstagedChanges)
J
Joao Moreno 已提交
1077
			// or no staged changes and not `all`
1078
			|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
1079
		) {
J
Joao Moreno 已提交
1080 1081 1082 1083
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1084
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1085 1086 1087 1088 1089

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
1090
		await repository.commit(message, opts);
J
Joao Moreno 已提交
1091 1092 1093 1094

		return true;
	}

J
Joao Moreno 已提交
1095
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1096
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1097
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
1098 1099 1100 1101
			if (message) {
				return message;
			}

1102 1103 1104 1105 1106 1107
			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 已提交
1108
			return await window.showInputBox({
1109
				value,
J
Joao Moreno 已提交
1110
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
1111 1112
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
1113
			});
J
Joao Moreno 已提交
1114 1115
		};

J
Joao Moreno 已提交
1116
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1117 1118

		if (message && didCommit) {
J
Joao Moreno 已提交
1119
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1120
		}
J
Joao Moreno 已提交
1121 1122
	}

J
Joao Moreno 已提交
1123
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
1124 1125
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
1126 1127
	}

J
Joao Moreno 已提交
1128
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
1129
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1130
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
1131 1132 1133
			return;
		}

J
Joao Moreno 已提交
1134
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1135 1136

		if (didCommit) {
J
Joao Moreno 已提交
1137
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1138
		}
J
Joao Moreno 已提交
1139 1140
	}

J
Joao Moreno 已提交
1141
	@command('git.commitStaged', { repository: true })
J
Joao Moreno 已提交
1142 1143
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
1144 1145
	}

J
Joao Moreno 已提交
1146
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
1147 1148
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
1149 1150
	}

J
Joao Moreno 已提交
1151
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
1152
	async commitStagedAmend(repository: Repository): Promise<void> {
1153
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
1154 1155
	}

J
Joao Moreno 已提交
1156
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
1157 1158
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
1159 1160
	}

J
Joao Moreno 已提交
1161
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1162 1163
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1164 1165
	}

J
Joao Moreno 已提交
1166
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
1167 1168
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
1169 1170
	}

J
Joao Moreno 已提交
1171
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
1172 1173
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1174 1175

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

J
Joao Moreno 已提交
1180
		const commit = await repository.getCommit('HEAD');
J
Joao Moreno 已提交
1181 1182

		if (commit.parents.length > 0) {
1183 1184 1185 1186 1187
			await repository.reset('HEAD~');
		} else {
			await repository.deleteRef('HEAD');
			await this.unstageAll(repository);
		}
J
Joao Moreno 已提交
1188

J
Joao Moreno 已提交
1189
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1190 1191
	}

J
Joao Moreno 已提交
1192
	@command('git.checkout', { repository: true })
J
Joao Moreno 已提交
1193
	async checkout(repository: Repository, treeish: string): Promise<void> {
J
Joao Moreno 已提交
1194
		if (typeof treeish === 'string') {
J
Joao Moreno 已提交
1195
			return await repository.checkout(treeish);
J
Joao Moreno 已提交
1196 1197
		}

J
Joao Moreno 已提交
1198
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1199
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
1200 1201 1202
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1203
		const createBranch = new CreateBranchItem(this);
J
Joao Moreno 已提交
1204

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

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

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

J
Joao Moreno 已提交
1214
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
1215
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
1216
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
1217 1218 1219 1220 1221

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1222
		await choice.run(repository);
J
Joao Moreno 已提交
1223 1224
	}

J
Joao Moreno 已提交
1225
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1226
	async branch(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1227
		const result = await window.showInputBox({
J
Joao Moreno 已提交
1228
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
1229 1230
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
1231
		});
J
Joao Moreno 已提交
1232

J
Joao Moreno 已提交
1233 1234 1235
		if (!result) {
			return;
		}
J
Joao Moreno 已提交
1236

J
Joao Moreno 已提交
1237
		const name = result.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
J
Joao Moreno 已提交
1238
		await repository.branch(name);
J
Joao Moreno 已提交
1239 1240
	}

J
Joao Moreno 已提交
1241
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1242
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1243 1244
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1245
			run = force => repository.deleteBranch(name, force);
1246
		} else {
J
Joao Moreno 已提交
1247 1248
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1249
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1250

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

M
Maik Riechert 已提交
1254
			if (!choice || !choice.branchName) {
1255 1256
				return;
			}
M
Maik Riechert 已提交
1257
			name = choice.branchName;
J
Joao Moreno 已提交
1258
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1259 1260
		}

1261 1262 1263 1264 1265 1266 1267 1268 1269
		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");
1270
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1271 1272 1273 1274 1275

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

1278 1279
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
J
Justin Horner 已提交
1280 1281 1282 1283 1284 1285 1286 1287
		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 {
1288
			await repository.renameBranch(name);
J
Justin Horner 已提交
1289 1290 1291
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1292 1293
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1294
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1295
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", name));
1296 1297 1298
					return;
				default:
					throw err;
J
Justin Horner 已提交
1299 1300 1301 1302
			}
		}
	}

J
Joao Moreno 已提交
1303
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1304
	async merge(repository: Repository): Promise<void> {
1305 1306 1307 1308
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1309
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1310 1311
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1312

J
Joao Moreno 已提交
1313
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1314 1315
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1316 1317

		const picks = [...heads, ...remoteHeads];
1318 1319
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1320 1321 1322 1323 1324

		if (!choice) {
			return;
		}

1325
		await choice.run(repository);
1326 1327
	}

J
Joao Moreno 已提交
1328
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1329
	async createTag(repository: Repository): Promise<void> {
1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341
		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 已提交
1342
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1343 1344 1345 1346 1347
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
1351 1352 1353 1354 1355 1356 1357 1358 1359 1360
	@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;
		}

		await repository.fetch();
	}

J
Joao Moreno 已提交
1361
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1362 1363
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1364 1365 1366 1367 1368 1369

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

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

D
Dozed12 已提交
1374
		if (!remotePick) {
1375 1376 1377
			return;
		}

D
Dozed12 已提交
1378 1379
		const remoteRefs = repository.refs;
		const remoteRefsFiltered = remoteRefs.filter(r => (r.remote === remotePick.label));
J
Joao Moreno 已提交
1380
		const branchPicks = remoteRefsFiltered.map(r => ({ label: r.name })) as { label: string; description: string }[];
D
Dozed12 已提交
1381
		const branchPick = await window.showQuickPick(branchPicks, { placeHolder });
1382

D
Dozed12 已提交
1383
		if (!branchPick) {
1384 1385 1386
			return;
		}

F
Francisco Moreira 已提交
1387 1388
		const remoteCharCnt = remotePick.label.length;

1389
		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1390 1391
	}

J
Joao Moreno 已提交
1392
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1393 1394
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1395 1396 1397 1398 1399 1400

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

J
Joao Moreno 已提交
1401
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1402 1403
	}

J
Joao Moreno 已提交
1404
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1405 1406
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1407 1408 1409 1410 1411 1412

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

J
Joao Moreno 已提交
1413
		await repository.pullWithRebase(repository.HEAD);
J
Joao Moreno 已提交
1414 1415
	}

J
Joao Moreno 已提交
1416
	@command('git.push', { repository: true })
J
Joao Moreno 已提交
1417 1418
	async push(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1419 1420 1421 1422 1423 1424

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

1425 1426 1427 1428 1429 1430
		if (!repository.HEAD || !repository.HEAD.name) {
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

		try {
J
Joao Moreno 已提交
1431
			await repository.push(repository.HEAD);
1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445
		} catch (err) {
			if (err.gitErrorCode !== GitErrorCodes.NoUpstreamBranch) {
				throw err;
			}

			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);
			}
		}
J
Joao Moreno 已提交
1446 1447
	}

J
Joao Moreno 已提交
1448
	@command('git.pushWithTags', { repository: true })
J
Joao Moreno 已提交
1449 1450
	async pushWithTags(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1451 1452 1453 1454 1455 1456

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

J
Joao Moreno 已提交
1457
		await repository.pushTags();
1458 1459 1460 1461

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

J
Joao Moreno 已提交
1462
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1463 1464
	async pushTo(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1465 1466 1467 1468 1469 1470

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

J
Joao Moreno 已提交
1471
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1472 1473 1474 1475
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

J
Joao Moreno 已提交
1476
		const branchName = repository.HEAD.name;
1477
		const picks = remotes.filter(r => r.pushUrl !== undefined).map(r => ({ label: r.name, description: r.pushUrl! }));
J
Joao Moreno 已提交
1478 1479 1480 1481 1482 1483 1484
		const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
		const pick = await window.showQuickPick(picks, { placeHolder });

		if (!pick) {
			return;
		}

1485
		await repository.pushTo(pick.label, branchName);
J
Joao Moreno 已提交
1486 1487
	}

J
Joao Moreno 已提交
1488
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1489
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1490 1491 1492 1493 1494

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

J
Joao Moreno 已提交
1495 1496 1497 1498
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
1499
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1500
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
1501 1502

		if (shouldPrompt) {
J
Joao Moreno 已提交
1503
			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 已提交
1504
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
1505
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
1506 1507 1508 1509 1510 1511 1512 1513 1514
			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 已提交
1515
		if (rebase) {
J
Joao Moreno 已提交
1516
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
1517
		} else {
J
Joao Moreno 已提交
1518
			await repository.sync(HEAD);
J
Joao Moreno 已提交
1519 1520 1521 1522 1523 1524
		}
	}

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

J
Joao 已提交
1527 1528 1529 1530 1531 1532 1533 1534 1535
	@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 已提交
1536
			await repository.sync(HEAD);
J
Joao 已提交
1537 1538 1539
		}));
	}

1540
	@command('git.syncRebase', { repository: true })
J
Joao Moreno 已提交
1541 1542
	syncRebase(repository: Repository): Promise<void> {
		return this._sync(repository, true);
J
Joao Moreno 已提交
1543 1544
	}

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

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

J
Joao Moreno 已提交
1554
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1555 1556 1557 1558 1559 1560
		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 已提交
1561 1562 1563 1564 1565

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1566
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1567 1568
	}

1569 1570
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
1571 1572
		resourceStates = resourceStates.filter(s => !!s);

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

1576
			if (!resource) {
J
Joao Moreno 已提交
1577 1578 1579
				return;
			}

1580
			resourceStates = [resource];
J
Joao Moreno 已提交
1581 1582
		}

1583
		const resources = resourceStates
J
Joao Moreno 已提交
1584 1585 1586
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1587
		if (!resources.length) {
N
NKumar2 已提交
1588 1589 1590
			return;
		}

1591
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
1592 1593
	}

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

1598
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
1599 1600 1601
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1602

1603
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
1604 1605 1606 1607 1608

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

J
Joao Moreno 已提交
1609
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
1610 1611
	}

1612 1613 1614 1615 1616 1617 1618
	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 已提交
1619 1620 1621 1622 1623 1624 1625 1626 1627 1628
	@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 已提交
1629
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1630 1631
	async stashPop(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1632 1633

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1634 1635 1636 1637
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1638 1639
		const picks = stashes.map(r => ({ label: `#${r.index}:  ${r.description}`, description: '', details: '', id: r.index }));
		const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
K
Krzysztof Cieślak 已提交
1640 1641 1642 1643 1644
		const choice = await window.showQuickPick(picks, { placeHolder });

		if (!choice) {
			return;
		}
J
Joao Moreno 已提交
1645

J
Joao Moreno 已提交
1646
		await repository.popStash(choice.id);
K
Krzysztof Cieślak 已提交
1647 1648
	}

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

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1654 1655 1656 1657
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1658
		await repository.popStash();
J
Joao Moreno 已提交
1659
	}
K
Krzysztof Cieślak 已提交
1660

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

J
Joao Moreno 已提交
1665
			if (!options.repository) {
J
Joao Moreno 已提交
1666 1667
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1668 1669
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1670 1671 1672 1673 1674 1675 1676 1677 1678
				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();
				}
1679

J
Joao Moreno 已提交
1680
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1681
					if (!repository) {
J
Joao 已提交
1682
						return Promise.resolve();
J
Joao Moreno 已提交
1683 1684
					}

J
Joao Moreno 已提交
1685
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1686
				});
J
Joao Moreno 已提交
1687 1688
			}

K
kieferrm 已提交
1689
			/* __GDPR__
K
kieferrm 已提交
1690 1691 1692 1693
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
1694 1695
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1696
			return result.catch(async err => {
J
Joao Moreno 已提交
1697
				const options: MessageOptions = {
1698
					modal: true
J
Joao Moreno 已提交
1699 1700
				};

J
Joao Moreno 已提交
1701
				let message: string;
1702
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
1703 1704

				switch (err.gitErrorCode) {
1705
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1706 1707
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1708
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
1709
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
1710
						break;
1711 1712 1713 1714 1715
					case GitErrorCodes.Conflict:
						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
						type = 'warning';
						options.modal = false;
						break;
J
Joao Moreno 已提交
1716
					default:
1717 1718 1719
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1720
							.split(/[\r\n]/)
J
João Moreno 已提交
1721
							.filter((line: string) => !!line)
1722 1723 1724 1725 1726
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737

						break;
				}

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

				const outputChannel = this.outputChannel as OutputChannel;
				const openOutputChannelChoice = localize('open git log', "Open Git Log");
1738 1739 1740
				const choice = type === 'error'
					? await window.showErrorMessage(message, options, openOutputChannelChoice)
					: await window.showWarningMessage(message, options, openOutputChannelChoice);
J
Joao Moreno 已提交
1741 1742 1743 1744 1745 1746

				if (choice === openOutputChannelChoice) {
					outputChannel.show();
				}
			});
		};
1747 1748

		// patch this object, so people can call methods directly
1749
		(this as any)[key] = result;
1750 1751

		return result;
J
Joao Moreno 已提交
1752 1753
	}

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

J
Joao Moreno 已提交
1757
		this.outputChannel.appendLine(`git.getSCMResource.uri ${uri && uri.toString()}`);
J
Joao Moreno 已提交
1758 1759 1760
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
1761

J
Joao Moreno 已提交
1762
		if (!uri) {
1763
			return undefined;
J
Joao Moreno 已提交
1764 1765 1766
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1767 1768
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1769 1770 1771 1772
		}

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

J
Joao Moreno 已提交
1775
			if (!repository) {
1776 1777
				return undefined;
			}
J
Joao Moreno 已提交
1778

J
Joao Moreno 已提交
1779 1780
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1781 1782 1783
		}
	}

J
Joao Moreno 已提交
1784
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
1785 1786 1787 1788 1789 1790
	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) => {
1791
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
1792 1793 1794 1795 1796 1797

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

1798
			// Could it be a submodule?
1799
			if (pathEquals(resource.fsPath, repository.root)) {
1800 1801 1802
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
1803
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819

			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 已提交
1820 1821 1822
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
1823
}