commands.ts 56.8 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 { Ref, RefType, Git, GitErrorCodes, Branch } 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 20 21
import * as nls from 'vscode-nls';

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

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

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

		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 57 58 59 60 61 62 63 64 65

	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 已提交
66 67
class BranchDeleteItem implements QuickPickItem {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155
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 已提交
156
export class CommandCenter {
J
Joao Moreno 已提交
157 158

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

				if (!repository) {
					return;
				}

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

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

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

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

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

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

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

		return '';
	}

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

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

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

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

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

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

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

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

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

			const uri = Uri.file(repositoryPath);

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

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

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

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

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

J
Joao Moreno 已提交
471 472 473 474 475 476 477 478 479 480 481 482 483
		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 已提交
484

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

			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 已提交
501 502
		}

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

J
Joao Moreno 已提交
507 508 509 510 511
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

516
		let uris: Uri[] | undefined;
517 518 519

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
520
				uris = [Uri.file(fromGitUri(arg).path)];
521
			} else if (arg.scheme === 'file') {
522
				uris = [arg];
523 524 525 526 527 528
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
529
				resource = this.getSCMResource();
530 531 532
			}

			if (resource) {
J
Joao Moreno 已提交
533 534 535 536
				const resources = ([resource, ...resourceStates] as Resource[])
					.filter(r => r.type !== Status.DELETED && r.type !== Status.INDEX_DELETED);

				uris = resources.map(r => r.resourceUri);
537
			}
J
Joao Moreno 已提交
538 539
		}

540
		if (!uris) {
J
Joao Moreno 已提交
541
			return;
J
Joao Moreno 已提交
542 543
		}

544 545 546 547
		const preview = uris.length === 1 ? true : false;
		const activeTextEditor = window.activeTextEditor;
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
548
				preserveFocus,
549
				preview,
550
				viewColumn: ViewColumn.Active
551 552
			};

553 554 555
			// 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 已提交
556 557 558
				opts.selection = activeTextEditor.selection;
			}

559
			await commands.executeCommand<void>('vscode.open', uri, opts);
J
Joao Moreno 已提交
560
		}
J
Joao Moreno 已提交
561 562
	}

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

J
Joao Moreno 已提交
568 569
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
570 571 572 573 574
		let resource: Resource | undefined = undefined;

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
575
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
576
		} else {
577
			resource = this.getSCMResource();
D
Duroktar 已提交
578 579 580 581 582 583
		}

		if (!resource) {
			return;
		}

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

J
Joao Moreno 已提交
586 587 588
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
589
		}
J
Joao Moreno 已提交
590 591

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

J
Joao Moreno 已提交
594 595
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
596
		const preserveFocus = arg instanceof Resource;
J
Joao 已提交
597
		const preserveSelection = arg instanceof Uri || !arg;
598
		let resources: Resource[] | undefined = undefined;
599

600
		if (arg instanceof Uri) {
601
			const resource = this.getSCMResource(arg);
602 603 604
			if (resource !== undefined) {
				resources = [resource];
			}
605
		} else {
606
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
607

608 609 610
			if (arg instanceof Resource) {
				resource = arg;
			} else {
611
				resource = this.getSCMResource();
612 613 614 615 616
			}

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

619
		if (!resources) {
J
Joao Moreno 已提交
620
			return;
J
Joao Moreno 已提交
621
		}
J
Joao Moreno 已提交
622

623 624
		const preview = resources.length === 1 ? undefined : false;
		for (const resource of resources) {
J
Joao 已提交
625
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
626
		}
J
Joao Moreno 已提交
627 628
	}

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

633 634
		resourceStates = resourceStates.filter(s => !!s);

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

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

640 641 642 643 644 645 646
			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

647
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
648 649 650 651 652 653
		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));
654

655 656 657 658 659 660 661 662
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

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

J
Joao Moreno 已提交
666
		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
667
		if (!scmResources.length) {
J
Joao Moreno 已提交
668 669
			return;
		}
J
Joao Moreno 已提交
670

671
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
672
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
673 674
	}

J
Joao Moreno 已提交
675 676
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
677
		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
678 679 680 681
		const { merge, unresolved } = await categorizeResourceByResolution(resources);

		if (unresolved.length > 0) {
			const message = unresolved.length > 1
J
Joao Moreno 已提交
682 683
				? 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));
684 685 686 687 688 689 690 691 692

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

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

J
Joao Moreno 已提交
693
		await repository.add([]);
J
Joao Moreno 已提交
694 695
	}

J
Joao Moreno 已提交
696
	@command('git.stageChange')
J
Joao Moreno 已提交
697 698 699 700 701 702 703 704
	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 已提交
705 706
	}

J
Joao Moreno 已提交
707
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
708
	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
709 710 711 712 713 714 715
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
716 717 718 719
		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 已提交
720

J
Joao Moreno 已提交
721
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
722 723 724
			return;
		}

J
Joao Moreno 已提交
725 726
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
727

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

J
Joao Moreno 已提交
732
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
733 734 735
			return;
		}

J
Joao Moreno 已提交
736
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
737
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
738
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
739

J
Joao Moreno 已提交
740
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
741
	}
J
Joao Moreno 已提交
742

J
Joao Moreno 已提交
743
	@command('git.revertChange')
J
Joao Moreno 已提交
744 745 746 747
	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 已提交
748 749 750
			return;
		}

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

J
Joao Moreno 已提交
754
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
755
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
756 757 758 759 760 761 762
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
763 764
		const selections = textEditor.selections;
		const selectedChanges = changes.filter(change => {
J
Joao Moreno 已提交
765
			const modifiedRange = getModifiedRange(modifiedDocument, change);
J
Joao Moreno 已提交
766 767 768 769
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
770 771 772
			return;
		}

J
Joao Moreno 已提交
773 774
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
775

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

J
Joao Moreno 已提交
780
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
781 782 783
			return;
		}

J
Joao Moreno 已提交
784 785
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
786 787
		const selectionsBeforeRevert = textEditor.selections;
		const visibleRangesBeforeRevert = textEditor.visibleRanges;
J
Joao Moreno 已提交
788
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
789

J
Joao Moreno 已提交
790 791 792
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
793

794 795
		textEditor.selections = selectionsBeforeRevert;
		textEditor.revealRange(visibleRangesBeforeRevert[0]);
796

J
Joao Moreno 已提交
797
		await modifiedDocument.save();
J
Joao Moreno 已提交
798 799
	}

J
Joao Moreno 已提交
800 801
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
802 803
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
804
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
805
			const resource = this.getSCMResource();
806 807 808 809 810 811 812 813

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

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

821
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
822
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
823 824
	}

J
Joao Moreno 已提交
825 826
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
827
		await repository.revert([]);
J
Joao Moreno 已提交
828
	}
J
Joao Moreno 已提交
829

J
Joao Moreno 已提交
830 831
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
832 833 834 835 836 837 838 839 840
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

841 842 843 844 845 846 847
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
848 849 850
			return;
		}

J
Joao Moreno 已提交
851
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
852
		const originalDocument = await workspace.openTextDocument(originalUri);
853 854 855 856
		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 已提交
857 858 859 860 861

		if (!selectedDiffs.length) {
			return;
		}

862 863
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
864

J
Joao Moreno 已提交
865
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
866 867
	}

J
Joao Moreno 已提交
868 869
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
870 871
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
872
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
873
			const resource = this.getSCMResource();
874 875 876 877 878 879 880 881

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
885
		if (!scmResources.length) {
J
Joao Moreno 已提交
886 887
			return;
		}
J
Joao Moreno 已提交
888

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

J
Joao Moreno 已提交
893
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
894
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
895
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
896 897
				yes = localize('delete file', "Delete file");
			} else {
J
Joao Moreno 已提交
898
				message = localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
899 900
			}
		} else {
J
Joao Moreno 已提交
901
			message = localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", scmResources.length);
J
Joao Moreno 已提交
902 903 904 905 906

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

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

J
Joao Moreno 已提交
910 911 912 913
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
914
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
915
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
916
	}
J
Joao Moreno 已提交
917

J
Joao Moreno 已提交
918 919
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
920
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
921 922 923 924 925

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

J
Joao Moreno 已提交
926 927
		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 已提交
928

J
Joao Moreno 已提交
929 930 931 932 933 934
		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 已提交
935
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
936
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
937

J
Joao Moreno 已提交
938
			if (pick !== yes) {
J
Joao Moreno 已提交
939 940 941
				return;
			}

J
Joao 已提交
942
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
943 944 945 946 947 948 949 950
			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 已提交
951 952
			}

J
Joao 已提交
953
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
954 955 956 957
		} 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 已提交
958

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

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

J
Joao Moreno 已提交
965 966 967 968
		} 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 已提交
969

J
Joao Moreno 已提交
970 971 972 973 974
			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 已提交
975

J
Joao Moreno 已提交
976
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
977 978 979 980 981 982 983 984
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

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

J
Joao Moreno 已提交
989
	private async smartCommit(
J
Joao Moreno 已提交
990
		repository: Repository,
991
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
992 993
		opts?: CommitOptions
	): Promise<boolean> {
J
Joao Moreno 已提交
994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014
		const config = workspace.getConfiguration('git');
		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
					? localize('unsaved files single', "The following file is unsaved: {0}.\n\nWould you like to save it before comitting?", path.basename(unsavedTextDocuments[0].uri.fsPath))
					: localize('unsaved files', "There are {0} unsaved files.\n\nWould you like to save them before comitting?", unsavedTextDocuments.length);
				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
				}
1015 1016 1017
			}
		}

1018
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
1019
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
1020 1021
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
1022 1023

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

J
Joao Moreno 已提交
1026 1027
			// 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?");
1028 1029 1030 1031 1032
			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 已提交
1033 1034 1035
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
1036 1037 1038
			}
		}

J
Joao Moreno 已提交
1039
		if (!opts) {
1040
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
1041 1042
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
1043 1044
		}

1045 1046 1047
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

J
Joao Moreno 已提交
1048 1049
		if (
			// no changes
1050
			(noStagedChanges && noUnstagedChanges)
J
Joao Moreno 已提交
1051
			// or no staged changes and not `all`
1052
			|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
1053
		) {
J
Joao Moreno 已提交
1054 1055 1056 1057
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1058
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1059 1060 1061 1062 1063

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
1064
		await repository.commit(message, opts);
J
Joao Moreno 已提交
1065 1066 1067 1068

		return true;
	}

J
Joao Moreno 已提交
1069
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1070
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1071
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
1072 1073 1074 1075
			if (message) {
				return message;
			}

1076 1077 1078 1079 1080 1081
			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 已提交
1082
			return await window.showInputBox({
1083
				value,
J
Joao Moreno 已提交
1084
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
1085 1086
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
1087
			});
J
Joao Moreno 已提交
1088 1089
		};

J
Joao Moreno 已提交
1090
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1091 1092

		if (message && didCommit) {
J
Joao Moreno 已提交
1093
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1094
		}
J
Joao Moreno 已提交
1095 1096
	}

J
Joao Moreno 已提交
1097
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
1098 1099
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
1100 1101
	}

J
Joao Moreno 已提交
1102
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
1103
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1104
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
1105 1106 1107
			return;
		}

J
Joao Moreno 已提交
1108
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1109 1110

		if (didCommit) {
J
Joao Moreno 已提交
1111
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1112
		}
J
Joao Moreno 已提交
1113 1114
	}

J
Joao Moreno 已提交
1115
	@command('git.commitStaged', { repository: true })
J
Joao Moreno 已提交
1116 1117
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
1118 1119
	}

J
Joao Moreno 已提交
1120
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
1121 1122
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
1123 1124
	}

J
Joao Moreno 已提交
1125
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
1126
	async commitStagedAmend(repository: Repository): Promise<void> {
1127
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
1128 1129
	}

J
Joao Moreno 已提交
1130
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
1131 1132
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
1133 1134
	}

J
Joao Moreno 已提交
1135
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1136 1137
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1138 1139
	}

J
Joao Moreno 已提交
1140
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
1141 1142
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
1143 1144
	}

J
Joao Moreno 已提交
1145
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
1146 1147
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1148 1149 1150 1151 1152

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

J
Joao Moreno 已提交
1153 1154
		const commit = await repository.getCommit('HEAD');
		await repository.reset('HEAD~');
J
Joao Moreno 已提交
1155
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1156 1157
	}

J
Joao Moreno 已提交
1158
	@command('git.checkout', { repository: true })
J
Joao Moreno 已提交
1159
	async checkout(repository: Repository, treeish: string): Promise<void> {
J
Joao Moreno 已提交
1160
		if (typeof treeish === 'string') {
J
Joao Moreno 已提交
1161
			return await repository.checkout(treeish);
J
Joao Moreno 已提交
1162 1163
		}

J
Joao Moreno 已提交
1164
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1165
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
1166 1167 1168
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1169
		const createBranch = new CreateBranchItem(this);
J
Joao Moreno 已提交
1170

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

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

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

J
Joao Moreno 已提交
1180
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
1181
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
1182
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
1183 1184 1185 1186 1187

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1188
		await choice.run(repository);
J
Joao Moreno 已提交
1189 1190
	}

J
Joao Moreno 已提交
1191
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1192
	async branch(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1193
		const result = await window.showInputBox({
J
Joao Moreno 已提交
1194
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
1195 1196
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
1197
		});
J
Joao Moreno 已提交
1198

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

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

J
Joao Moreno 已提交
1207
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1208
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1209 1210
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1211
			run = force => repository.deleteBranch(name, force);
1212
		} else {
J
Joao Moreno 已提交
1213 1214
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1215
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1216

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

M
Maik Riechert 已提交
1220
			if (!choice || !choice.branchName) {
1221 1222
				return;
			}
M
Maik Riechert 已提交
1223
			name = choice.branchName;
J
Joao Moreno 已提交
1224
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1225 1226
		}

1227 1228 1229 1230 1231 1232 1233 1234 1235
		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");
1236
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1237 1238 1239 1240 1241

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

1244 1245
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
J
Justin Horner 已提交
1246 1247 1248 1249 1250 1251 1252 1253
		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 {
1254
			await repository.renameBranch(name);
J
Justin Horner 已提交
1255 1256 1257
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1258 1259
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1260
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1261
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", name));
1262 1263 1264
					return;
				default:
					throw err;
J
Justin Horner 已提交
1265 1266 1267 1268
			}
		}
	}

J
Joao Moreno 已提交
1269
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1270
	async merge(repository: Repository): Promise<void> {
1271 1272 1273 1274
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1275
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1276 1277
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1278

J
Joao Moreno 已提交
1279
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1280 1281
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1282 1283

		const picks = [...heads, ...remoteHeads];
1284 1285
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1286 1287 1288 1289 1290

		if (!choice) {
			return;
		}

1291
		await choice.run(repository);
1292 1293
	}

J
Joao Moreno 已提交
1294
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1295
	async createTag(repository: Repository): Promise<void> {
1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307
		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 已提交
1308
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1309 1310 1311 1312 1313
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
1317 1318 1319 1320 1321 1322 1323 1324 1325 1326
	@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 已提交
1327
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1328 1329
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1330 1331 1332 1333 1334 1335

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

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

D
Dozed12 已提交
1340
		if (!remotePick) {
1341 1342 1343
			return;
		}

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

D
Dozed12 已提交
1349
		if (!branchPick) {
1350 1351 1352
			return;
		}

F
Francisco Moreira 已提交
1353 1354
		const remoteCharCnt = remotePick.label.length;

1355
		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1356 1357
	}

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

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

J
Joao Moreno 已提交
1367
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1368 1369
	}

J
Joao Moreno 已提交
1370
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1371 1372
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1373 1374 1375 1376 1377 1378

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

J
Joao Moreno 已提交
1379
		await repository.pullWithRebase(repository.HEAD);
J
Joao Moreno 已提交
1380 1381
	}

J
Joao Moreno 已提交
1382
	@command('git.push', { repository: true })
J
Joao Moreno 已提交
1383 1384
	async push(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1385 1386 1387 1388 1389 1390

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

1391 1392 1393 1394 1395 1396
		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 已提交
1397
			await repository.push(repository.HEAD);
1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411
		} 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 已提交
1412 1413
	}

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

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

J
Joao Moreno 已提交
1423
		await repository.pushTags();
1424 1425 1426 1427

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

J
Joao Moreno 已提交
1428
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1429 1430
	async pushTo(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1431 1432 1433 1434 1435 1436

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

J
Joao Moreno 已提交
1437
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1438 1439 1440 1441
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

J
Joao Moreno 已提交
1442
		const branchName = repository.HEAD.name;
1443
		const picks = remotes.filter(r => r.pushUrl !== undefined).map(r => ({ label: r.name, description: r.pushUrl! }));
J
Joao Moreno 已提交
1444 1445 1446 1447 1448 1449 1450
		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;
		}

1451
		await repository.pushTo(pick.label, branchName);
J
Joao Moreno 已提交
1452 1453
	}

J
Joao Moreno 已提交
1454
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1455
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1456 1457 1458 1459 1460

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

J
Joao Moreno 已提交
1461 1462 1463 1464
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
1465
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1466
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
1467 1468

		if (shouldPrompt) {
J
Joao Moreno 已提交
1469
			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 已提交
1470
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
1471
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
1472 1473 1474 1475 1476 1477 1478 1479 1480
			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 已提交
1481
		if (rebase) {
J
Joao Moreno 已提交
1482
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
1483
		} else {
J
Joao Moreno 已提交
1484
			await repository.sync(HEAD);
J
Joao Moreno 已提交
1485 1486 1487 1488 1489 1490
		}
	}

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

J
Joao 已提交
1493 1494 1495 1496 1497 1498 1499 1500 1501
	@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 已提交
1502
			await repository.sync(HEAD);
J
Joao 已提交
1503 1504 1505
		}));
	}

1506
	@command('git.syncRebase', { repository: true })
J
Joao Moreno 已提交
1507 1508
	syncRebase(repository: Repository): Promise<void> {
		return this._sync(repository, true);
J
Joao Moreno 已提交
1509 1510
	}

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

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

J
Joao Moreno 已提交
1520
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1521 1522 1523 1524 1525 1526
		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 已提交
1527 1528 1529 1530 1531

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1532
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1533 1534
	}

1535 1536
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
1537 1538
		resourceStates = resourceStates.filter(s => !!s);

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

1542
			if (!resource) {
J
Joao Moreno 已提交
1543 1544 1545
				return;
			}

1546
			resourceStates = [resource];
J
Joao Moreno 已提交
1547 1548
		}

1549
		const resources = resourceStates
J
Joao Moreno 已提交
1550 1551 1552
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1553
		if (!resources.length) {
N
NKumar2 已提交
1554 1555 1556
			return;
		}

1557
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
1558 1559
	}

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

1564
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
1565 1566 1567
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1568

1569
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
1570 1571 1572 1573 1574

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

J
Joao Moreno 已提交
1575
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
1576 1577
	}

1578 1579 1580 1581 1582 1583 1584
	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 已提交
1585 1586 1587 1588 1589 1590 1591 1592 1593 1594
	@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 已提交
1595
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1596 1597
	async stashPop(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1598 1599

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1600 1601 1602 1603
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1604 1605
		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 已提交
1606 1607 1608 1609 1610
		const choice = await window.showQuickPick(picks, { placeHolder });

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

J
Joao Moreno 已提交
1612
		await repository.popStash(choice.id);
K
Krzysztof Cieślak 已提交
1613 1614
	}

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

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1620 1621 1622 1623
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1624
		await repository.popStash();
J
Joao Moreno 已提交
1625
	}
K
Krzysztof Cieślak 已提交
1626

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

J
Joao Moreno 已提交
1631
			if (!options.repository) {
J
Joao Moreno 已提交
1632 1633
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1634 1635
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1636 1637 1638 1639 1640 1641 1642 1643 1644
				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();
				}
1645

J
Joao Moreno 已提交
1646
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1647
					if (!repository) {
J
Joao 已提交
1648
						return Promise.resolve();
J
Joao Moreno 已提交
1649 1650
					}

J
Joao Moreno 已提交
1651
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1652
				});
J
Joao Moreno 已提交
1653 1654
			}

K
kieferrm 已提交
1655
			/* __GDPR__
K
kieferrm 已提交
1656 1657 1658 1659
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
1660 1661
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1662
			return result.catch(async err => {
J
Joao Moreno 已提交
1663
				const options: MessageOptions = {
1664
					modal: true
J
Joao Moreno 已提交
1665 1666
				};

J
Joao Moreno 已提交
1667
				let message: string;
1668
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
1669 1670

				switch (err.gitErrorCode) {
1671
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1672 1673
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1674
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
1675
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
1676
						break;
1677 1678 1679 1680 1681
					case GitErrorCodes.Conflict:
						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
						type = 'warning';
						options.modal = false;
						break;
J
Joao Moreno 已提交
1682
					default:
1683 1684 1685
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1686
							.split(/[\r\n]/)
J
João Moreno 已提交
1687
							.filter((line: string) => !!line)
1688 1689 1690 1691 1692
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703

						break;
				}

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

				const outputChannel = this.outputChannel as OutputChannel;
				const openOutputChannelChoice = localize('open git log', "Open Git Log");
1704 1705 1706
				const choice = type === 'error'
					? await window.showErrorMessage(message, options, openOutputChannelChoice)
					: await window.showWarningMessage(message, options, openOutputChannelChoice);
J
Joao Moreno 已提交
1707 1708 1709 1710 1711 1712

				if (choice === openOutputChannelChoice) {
					outputChannel.show();
				}
			});
		};
1713 1714

		// patch this object, so people can call methods directly
1715
		(this as any)[key] = result;
1716 1717

		return result;
J
Joao Moreno 已提交
1718 1719
	}

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

J
Joao Moreno 已提交
1723
		this.outputChannel.appendLine(`git.getSCMResource.uri ${uri && uri.toString()}`);
J
Joao Moreno 已提交
1724 1725 1726
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
1727

J
Joao Moreno 已提交
1728
		if (!uri) {
1729
			return undefined;
J
Joao Moreno 已提交
1730 1731 1732
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1733 1734
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1735 1736 1737 1738
		}

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

J
Joao Moreno 已提交
1741
			if (!repository) {
1742 1743
				return undefined;
			}
J
Joao Moreno 已提交
1744

J
Joao Moreno 已提交
1745 1746
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1747 1748 1749
		}
	}

J
Joao Moreno 已提交
1750
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
1751 1752 1753 1754 1755 1756
	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) => {
1757
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
1758 1759 1760 1761 1762 1763

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

1764
			// Could it be a submodule?
1765
			if (pathEquals(resource.fsPath, repository.root)) {
1766 1767 1768
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
1769
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785

			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 已提交
1786 1787 1788
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
1789
}