commands.ts 60.2 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 10
import { Git, CommitOptions } from './git';
import { Repository, Resource, Status, ResourceGroupType } from './repository';
J
Joao Moreno 已提交
11
import { Model } from './model';
J
Joao Moreno 已提交
12
import { toGitUri, fromGitUri } from './uri';
13
import { grep, isDescendant, pathEquals } from './util';
J
Joao Moreno 已提交
14
import { applyLineChanges, intersectDiffWithRange, toLineRanges, invertLineChange, getModifiedRange } from './staging';
J
Joao Moreno 已提交
15
import * as path from 'path';
16
import { lstat, Stats } from 'fs';
J
Joao Moreno 已提交
17
import * as os from 'os';
J
Joao Moreno 已提交
18
import TelemetryReporter from 'vscode-extension-telemetry';
J
Joao Moreno 已提交
19
import * as nls from 'vscode-nls';
J
Joao Moreno 已提交
20
import { Ref, RefType, Branch, GitErrorCodes } from './api/git';
J
Joao Moreno 已提交
21 22

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

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

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

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

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

		if (!ref) {
			return;
		}

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

class CheckoutTagItem extends CheckoutItem {

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

class CheckoutRemoteHeadItem extends CheckoutItem {

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

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

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

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

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

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

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

82 83 84 85 86 87
class MergeItem implements QuickPickItem {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	return { merge, resolved, unresolved };
}

J
Joao Moreno 已提交
155
export class CommandCenter {
J
Joao Moreno 已提交
156 157

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

				if (!repository) {
					return;
				}

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

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

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

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

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

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

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

		return '';
	}

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

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

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

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

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

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

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

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

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

			const uri = Uri.file(repositoryPath);

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

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

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

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

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

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

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

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

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

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

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

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

		await this.model.openRepository(path);
525 526
	}

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

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

536
		let uris: Uri[] | undefined;
537 538 539

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

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

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

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

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

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

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

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) {
E
Eric Gang 已提交
578
				// preserve not only selection but also visible range
B
Benjamin Pasero 已提交
579
				opts.selection = activeTextEditor.selection;
E
Eric Gang 已提交
580 581 582 583 584
				const previousVisibleRanges = activeTextEditor.visibleRanges;
				const editor = await window.showTextDocument(document, opts);
				editor.revealRange(previousVisibleRanges[0]);
			} else {
				await window.showTextDocument(document, opts);
B
Benjamin Pasero 已提交
585
			}
J
Joao Moreno 已提交
586
		}
J
Joao Moreno 已提交
587 588
	}

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

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

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
601
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
602
		} else {
603
			resource = this.getSCMResource();
D
Duroktar 已提交
604 605 606 607 608 609
		}

		if (!resource) {
			return;
		}

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

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

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

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

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

634 635 636
			if (arg instanceof Resource) {
				resource = arg;
			} else {
637
				resource = this.getSCMResource();
638 639 640 641 642
			}

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

645
		if (!resources) {
J
Joao Moreno 已提交
646
			return;
J
Joao Moreno 已提交
647
		}
J
Joao Moreno 已提交
648

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

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

659 660
		resourceStates = resourceStates.filter(s => !!s);

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

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

666 667 668 669 670 671 672
			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

673
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
674 675 676 677 678 679
		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));
680

681 682 683 684 685 686 687 688
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

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

J
Joao Moreno 已提交
692
		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
693
		if (!scmResources.length) {
J
Joao Moreno 已提交
694 695
			return;
		}
J
Joao Moreno 已提交
696

697
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
698
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
699 700
	}

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

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

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

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

J
Joao Moreno 已提交
719
		await repository.add([]);
J
Joao Moreno 已提交
720 721
	}

J
Joao Moreno 已提交
722
	@command('git.stageChange')
J
Joao Moreno 已提交
723 724 725 726 727 728 729 730
	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 已提交
731 732
	}

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

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
742 743 744 745
		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 已提交
746

J
Joao Moreno 已提交
747
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
748 749 750
			return;
		}

J
Joao Moreno 已提交
751 752
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
753

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

J
Joao Moreno 已提交
758
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
759 760 761
			return;
		}

J
Joao Moreno 已提交
762
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
763
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
764
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
765

J
Joao Moreno 已提交
766
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
767
	}
J
Joao Moreno 已提交
768

J
Joao Moreno 已提交
769
	@command('git.revertChange')
J
Joao Moreno 已提交
770 771 772 773
	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 已提交
774 775 776
			return;
		}

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

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

		if (!textEditor) {
			return;
		}

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

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
796 797 798
			return;
		}

J
Joao Moreno 已提交
799 800
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
801

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

J
Joao Moreno 已提交
806
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
807 808 809
			return;
		}

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

J
Joao Moreno 已提交
816 817 818
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
819

J
Joao Moreno 已提交
820 821
		await modifiedDocument.save();

822 823
		textEditor.selections = selectionsBeforeRevert;
		textEditor.revealRange(visibleRangesBeforeRevert[0]);
J
Joao Moreno 已提交
824 825
	}

J
Joao Moreno 已提交
826 827
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
828 829
		resourceStates = resourceStates.filter(s => !!s);

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

843
		if (!scmResources.length) {
J
Joao Moreno 已提交
844 845 846
			return;
		}

847
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
848
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
849 850
	}

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

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

		if (!textEditor) {
			return;
		}

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

867 868 869 870 871 872 873
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
874 875 876
			return;
		}

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

		if (!selectedDiffs.length) {
			return;
		}

888 889
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
890

J
Joao Moreno 已提交
891
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
892 893
	}

J
Joao Moreno 已提交
894 895
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
896 897
		resourceStates = resourceStates.filter(s => !!s);

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
911
		if (!scmResources.length) {
J
Joao Moreno 已提交
912 913
			return;
		}
J
Joao Moreno 已提交
914

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

J
Joao Moreno 已提交
919
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
920
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
921
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
922 923
				yes = localize('delete file', "Delete file");
			} else {
924 925 926 927 928 929
				if (scmResources[0].type === Status.DELETED) {
					yes = localize('restore file', "Restore file");
					message = localize('confirm restore', "Are you sure you want to restore {0}?", path.basename(scmResources[0].resourceUri.fsPath));
				} else {
					message = localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(scmResources[0].resourceUri.fsPath));
				}
J
Joao Moreno 已提交
930 931
			}
		} else {
932 933 934 935 936 937
			if (scmResources.every(resource => resource.type === Status.DELETED)) {
				yes = localize('restore files', "Restore files");
				message = localize('confirm restore multiple', "Are you sure you want to restore {0} files?", scmResources.length);
			} else {
				message = localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", scmResources.length);
			}
J
Joao Moreno 已提交
938 939 940 941 942

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

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

J
Joao Moreno 已提交
946 947 948 949
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
950
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
951
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
952
	}
J
Joao Moreno 已提交
953

J
Joao Moreno 已提交
954 955
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
956
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
957 958 959 960 961

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

J
Joao Moreno 已提交
962 963
		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 已提交
964

J
Joao Moreno 已提交
965 966 967 968 969 970
		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 已提交
971
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
972
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
973

J
Joao Moreno 已提交
974
			if (pick !== yes) {
J
Joao Moreno 已提交
975 976 977
				return;
			}

J
Joao 已提交
978
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
979 980 981 982 983 984 985 986
			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 已提交
987 988
			}

J
Joao 已提交
989
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
990 991 992 993
		} 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 已提交
994

J
Joao Moreno 已提交
995 996 997
			if (pick !== yes) {
				return;
			}
J
Joao Moreno 已提交
998

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

J
Joao Moreno 已提交
1001 1002 1003 1004
		} 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 已提交
1005

J
Joao Moreno 已提交
1006 1007 1008 1009 1010
			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 已提交
1011

J
Joao Moreno 已提交
1012
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1013 1014 1015 1016 1017 1018 1019 1020
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
1021
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1022
		}
J
Joao Moreno 已提交
1023 1024
	}

J
Joao Moreno 已提交
1025
	private async smartCommit(
J
Joao Moreno 已提交
1026
		repository: Repository,
1027
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
1028 1029
		opts?: CommitOptions
	): Promise<boolean> {
1030
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
J
Joao Moreno 已提交
1031 1032 1033 1034 1035 1036 1037 1038
		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 已提交
1039 1040
					? 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 已提交
1041 1042 1043 1044 1045 1046 1047 1048 1049 1050
				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
				}
1051 1052 1053
			}
		}

1054
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
1055
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
1056 1057
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
1058 1059

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

J
Joao Moreno 已提交
1062 1063
			// 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?");
1064 1065 1066 1067 1068
			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 已提交
1069 1070 1071
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
1072 1073 1074
			}
		}

J
Joao Moreno 已提交
1075
		if (!opts) {
1076
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
1077 1078
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
1079 1080
		}

1081 1082 1083
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

1084 1085 1086 1087
		if (config.get<boolean>('alwaysSignOff')) {
			opts.signoff = true;
		}

J
Joao Moreno 已提交
1088
		if (
1089
			(
J
Joao Moreno 已提交
1090 1091 1092 1093 1094
				// no changes
				(noStagedChanges && noUnstagedChanges)
				// or no staged changes and not `all`
				|| (!opts.all && noStagedChanges)
			)
1095
			&& !opts.empty
J
Joao Moreno 已提交
1096
		) {
J
Joao Moreno 已提交
1097 1098 1099 1100
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1101
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1102 1103 1104 1105 1106

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
1107
		await repository.commit(message, opts);
J
Joao Moreno 已提交
1108 1109 1110 1111

		return true;
	}

J
Joao Moreno 已提交
1112
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1113
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1114
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
1115 1116 1117 1118
			if (message) {
				return message;
			}

1119 1120 1121 1122 1123 1124
			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 已提交
1125
			return await window.showInputBox({
1126
				value,
J
Joao Moreno 已提交
1127
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
1128 1129
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
1130
			});
J
Joao Moreno 已提交
1131 1132
		};

J
Joao Moreno 已提交
1133
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1134 1135

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

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

J
Joao Moreno 已提交
1145
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
1146
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1147
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
1148 1149 1150
			return;
		}

J
Joao Moreno 已提交
1151
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1152 1153

		if (didCommit) {
J
Joao Moreno 已提交
1154
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1155
		}
J
Joao Moreno 已提交
1156 1157
	}

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

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

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

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

J
Joao Moreno 已提交
1178
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1179 1180
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1181 1182
	}

J
Joao Moreno 已提交
1183
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
1184 1185
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
1186 1187
	}

J
Joao Moreno 已提交
1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209
	@command('git.commitEmpty', { repository: true })
	async commitEmpty(repository: Repository): Promise<void> {
		const root = Uri.file(repository.root);
		const config = workspace.getConfiguration('git', root);
		const shouldPrompt = config.get<boolean>('confirmEmptyCommits') === true;

		if (shouldPrompt) {
			const message = localize('confirm emtpy commit', "Are you sure you want to create an empty commit?");
			const yes = localize('yes', "Yes");
			const neverAgain = localize('yes never again', "Yes, Don't Show Again");
			const pick = await window.showWarningMessage(message, { modal: true }, yes, neverAgain);

			if (pick === neverAgain) {
				await config.update('confirmEmptyCommits', false, true);
			} else if (pick !== yes) {
				return;
			}
		}

		await this.commitWithAnyInput(repository, { empty: true });
	}

J
Joao Moreno 已提交
1210
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
1211 1212
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1213 1214

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

J
Joao Moreno 已提交
1219
		const commit = await repository.getCommit('HEAD');
J
Joao Moreno 已提交
1220 1221

		if (commit.parents.length > 0) {
1222 1223 1224 1225 1226
			await repository.reset('HEAD~');
		} else {
			await repository.deleteRef('HEAD');
			await this.unstageAll(repository);
		}
J
Joao Moreno 已提交
1227

J
Joao Moreno 已提交
1228
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1229 1230
	}

J
Joao Moreno 已提交
1231
	@command('git.checkout', { repository: true })
J
Joao Moreno 已提交
1232
	async checkout(repository: Repository, treeish: string): Promise<void> {
J
Joao Moreno 已提交
1233
		if (typeof treeish === 'string') {
J
Joao Moreno 已提交
1234
			return await repository.checkout(treeish);
J
Joao Moreno 已提交
1235 1236
		}

J
Joao Moreno 已提交
1237
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1238
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
1239 1240 1241
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1242
		const createBranch = new CreateBranchItem(this);
J
Joao Moreno 已提交
1243

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

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

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

J
Joao Moreno 已提交
1253
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
1254
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
1255
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
1256 1257 1258 1259 1260

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1261
		await choice.run(repository);
J
Joao Moreno 已提交
1262 1263
	}

1264 1265
	private removeBranchNameWhitespace(name: string) {
		const config = workspace.getConfiguration('git');
1266
		return name.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.|\[|\]|$/g, config.createBranchWhitespaceChar);
1267 1268
	}

J
Joao Moreno 已提交
1269
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1270
	async branch(repository: Repository): Promise<void> {
1271 1272
		const config = workspace.getConfiguration('git');
		const validateName = new RegExp(config.createBranchNameConvention.regexp);
J
Joao Moreno 已提交
1273
		const result = await window.showInputBox({
J
Joao Moreno 已提交
1274
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
1275
			prompt: localize('provide branch name', "Please provide a branch name"),
1276 1277 1278 1279 1280 1281 1282
			ignoreFocusOut: true,
			validateInput: (name: string) => {
				if (validateName.test(this.removeBranchNameWhitespace(name))) {
					return null;
				}
				return `${localize('branch name format invalid', "Have to be in the format")} : ${config.createBranchNameConvention.regexp}`;
			}
J
Joao Moreno 已提交
1283
		});
J
Joao Moreno 已提交
1284

J
Joao Moreno 已提交
1285 1286 1287
		if (!result) {
			return;
		}
J
Joao Moreno 已提交
1288

1289
		const name = this.removeBranchNameWhitespace(result);
J
Joao Moreno 已提交
1290
		await repository.branch(name, true);
J
Joao Moreno 已提交
1291 1292
	}

J
Joao Moreno 已提交
1293
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1294
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1295 1296
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1297
			run = force => repository.deleteBranch(name, force);
1298
		} else {
J
Joao Moreno 已提交
1299 1300
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1301
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1302

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

M
Maik Riechert 已提交
1306
			if (!choice || !choice.branchName) {
1307 1308
				return;
			}
M
Maik Riechert 已提交
1309
			name = choice.branchName;
J
Joao Moreno 已提交
1310
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1311 1312
		}

1313 1314 1315 1316 1317 1318 1319 1320 1321
		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");
1322
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1323 1324 1325 1326 1327

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

1330 1331
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
J
Justin Horner 已提交
1332 1333 1334 1335 1336 1337 1338 1339
		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 {
1340
			await repository.renameBranch(name);
J
Justin Horner 已提交
1341 1342 1343
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1344 1345
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1346
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1347
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", name));
1348 1349 1350
					return;
				default:
					throw err;
J
Justin Horner 已提交
1351 1352 1353 1354
			}
		}
	}

J
Joao Moreno 已提交
1355
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1356
	async merge(repository: Repository): Promise<void> {
1357 1358 1359 1360
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1361
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1362 1363
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1364

J
Joao Moreno 已提交
1365
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1366 1367
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1368 1369

		const picks = [...heads, ...remoteHeads];
1370 1371
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1372 1373 1374 1375 1376

		if (!choice) {
			return;
		}

1377
		await choice.run(repository);
1378 1379
	}

J
Joao Moreno 已提交
1380
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1381
	async createTag(repository: Repository): Promise<void> {
1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393
		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 已提交
1394
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1395 1396 1397 1398 1399
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
1403 1404 1405 1406 1407 1408 1409
	@command('git.fetch', { repository: true })
	async fetch(repository: Repository): Promise<void> {
		if (repository.remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to fetch', "This repository has no remotes configured to fetch from."));
			return;
		}

J
Joao Moreno 已提交
1410
		await repository.fetchDefault();
J
Joao Moreno 已提交
1411 1412
	}

J
Joao Moreno 已提交
1413 1414 1415 1416 1417 1418 1419 1420 1421 1422
	@command('git.fetchAll', { repository: true })
	async fetchAll(repository: Repository): Promise<void> {
		if (repository.remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to fetch', "This repository has no remotes configured to fetch from."));
			return;
		}

		await repository.fetchAll();
	}

J
Joao Moreno 已提交
1423
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1424 1425
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1426 1427 1428 1429 1430 1431

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

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

D
Dozed12 已提交
1436
		if (!remotePick) {
1437 1438 1439
			return;
		}

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

D
Dozed12 已提交
1446
		if (!branchPick) {
1447 1448 1449
			return;
		}

F
Francisco Moreira 已提交
1450 1451
		const remoteCharCnt = remotePick.label.length;

1452
		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1453 1454
	}

J
Joao Moreno 已提交
1455
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1456 1457
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1458 1459 1460 1461 1462 1463

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

J
Joao Moreno 已提交
1464
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1465 1466
	}

J
Joao Moreno 已提交
1467
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1468 1469
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1470 1471 1472 1473 1474 1475

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

J
Joao Moreno 已提交
1476
		await repository.pullWithRebase(repository.HEAD);
J
Joao Moreno 已提交
1477 1478
	}

J
Joao Moreno 已提交
1479
	@command('git.push', { repository: true })
J
Joao Moreno 已提交
1480 1481
	async push(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1482 1483 1484 1485 1486 1487

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

1488 1489 1490 1491 1492 1493
		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 已提交
1494
			await repository.push(repository.HEAD);
1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508
		} 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 已提交
1509 1510
	}

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

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

J
Joao Moreno 已提交
1520
		await repository.pushTags();
1521 1522 1523 1524

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

J
Joao Moreno 已提交
1525
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1526 1527
	async pushTo(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1528 1529 1530 1531 1532 1533

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

J
Joao Moreno 已提交
1534
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1535 1536 1537 1538
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

J
Joao Moreno 已提交
1539
		const branchName = repository.HEAD.name;
1540
		const picks = remotes.filter(r => r.pushUrl !== undefined).map(r => ({ label: r.name, description: r.pushUrl! }));
J
Joao Moreno 已提交
1541 1542 1543 1544 1545 1546 1547
		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;
		}

1548
		await repository.pushTo(pick.label, branchName);
J
Joao Moreno 已提交
1549 1550
	}

J
Joao Moreno 已提交
1551
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1552
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1553 1554 1555 1556 1557

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

J
Joao Moreno 已提交
1558 1559 1560 1561
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
1562
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1563
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
1564 1565

		if (shouldPrompt) {
J
Joao Moreno 已提交
1566
			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 已提交
1567
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
1568
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
1569 1570 1571 1572 1573 1574 1575 1576 1577
			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 已提交
1578
		if (rebase) {
J
Joao Moreno 已提交
1579
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
1580
		} else {
J
Joao Moreno 已提交
1581
			await repository.sync(HEAD);
J
Joao Moreno 已提交
1582 1583 1584 1585 1586 1587
		}
	}

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

J
Joao 已提交
1590 1591 1592 1593 1594 1595 1596 1597 1598
	@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 已提交
1599
			await repository.sync(HEAD);
J
Joao 已提交
1600 1601 1602
		}));
	}

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

J
Joao Moreno 已提交
1608
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1609 1610
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1611 1612 1613 1614 1615 1616

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

J
Joao Moreno 已提交
1617
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1618 1619 1620 1621 1622 1623
		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 已提交
1624 1625 1626 1627 1628

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1629
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1630 1631
	}

1632 1633
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
1634 1635
		resourceStates = resourceStates.filter(s => !!s);

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

1639
			if (!resource) {
J
Joao Moreno 已提交
1640 1641 1642
				return;
			}

1643
			resourceStates = [resource];
J
Joao Moreno 已提交
1644 1645
		}

1646
		const resources = resourceStates
J
Joao Moreno 已提交
1647 1648 1649
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1650
		if (!resources.length) {
N
NKumar2 已提交
1651 1652 1653
			return;
		}

1654
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
1655 1656
	}

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

1661
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
1662 1663 1664
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1665

1666
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
1667 1668 1669 1670 1671

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

J
Joao Moreno 已提交
1672
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
1673 1674
	}

1675 1676 1677 1678 1679 1680 1681
	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 已提交
1682 1683 1684 1685 1686 1687 1688 1689 1690 1691
	@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 已提交
1692
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1693 1694
	async stashPop(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1695 1696

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1697 1698 1699 1700
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1701 1702
		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 已提交
1703 1704 1705 1706 1707
		const choice = await window.showQuickPick(picks, { placeHolder });

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

J
Joao Moreno 已提交
1709
		await repository.popStash(choice.id);
K
Krzysztof Cieślak 已提交
1710 1711
	}

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

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1717 1718 1719 1720
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1721
		await repository.popStash();
J
Joao Moreno 已提交
1722
	}
K
Krzysztof Cieślak 已提交
1723

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

J
Joao Moreno 已提交
1728
			if (!options.repository) {
J
Joao Moreno 已提交
1729 1730
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1731 1732
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1733 1734 1735 1736 1737 1738 1739 1740 1741
				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();
				}
1742

J
Joao Moreno 已提交
1743
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1744
					if (!repository) {
J
Joao 已提交
1745
						return Promise.resolve();
J
Joao Moreno 已提交
1746 1747
					}

J
Joao Moreno 已提交
1748
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1749
				});
J
Joao Moreno 已提交
1750 1751
			}

K
kieferrm 已提交
1752
			/* __GDPR__
K
kieferrm 已提交
1753 1754 1755 1756
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
1757 1758
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1759
			return result.catch(async err => {
J
Joao Moreno 已提交
1760
				const options: MessageOptions = {
1761
					modal: true
J
Joao Moreno 已提交
1762 1763
				};

J
Joao Moreno 已提交
1764
				let message: string;
1765
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
1766 1767

				switch (err.gitErrorCode) {
1768
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1769 1770
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1771
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
1772
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
1773
						break;
1774 1775 1776 1777 1778
					case GitErrorCodes.Conflict:
						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
						type = 'warning';
						options.modal = false;
						break;
J
Joao Moreno 已提交
1779
					default:
1780 1781 1782
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1783
							.split(/[\r\n]/)
J
João Moreno 已提交
1784
							.filter((line: string) => !!line)
1785 1786 1787 1788 1789
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800

						break;
				}

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

				const outputChannel = this.outputChannel as OutputChannel;
				const openOutputChannelChoice = localize('open git log', "Open Git Log");
1801 1802 1803
				const choice = type === 'error'
					? await window.showErrorMessage(message, options, openOutputChannelChoice)
					: await window.showWarningMessage(message, options, openOutputChannelChoice);
J
Joao Moreno 已提交
1804 1805 1806 1807 1808 1809

				if (choice === openOutputChannelChoice) {
					outputChannel.show();
				}
			});
		};
1810 1811

		// patch this object, so people can call methods directly
1812
		(this as any)[key] = result;
1813 1814

		return result;
J
Joao Moreno 已提交
1815 1816
	}

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

J
Joao Moreno 已提交
1820
		this.outputChannel.appendLine(`git.getSCMResource.uri ${uri && uri.toString()}`);
J
Joao Moreno 已提交
1821 1822 1823
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
1824

J
Joao Moreno 已提交
1825
		if (!uri) {
1826
			return undefined;
J
Joao Moreno 已提交
1827 1828 1829
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1830 1831
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1832 1833 1834 1835
		}

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

J
Joao Moreno 已提交
1838
			if (!repository) {
1839 1840
				return undefined;
			}
J
Joao Moreno 已提交
1841

J
Joao Moreno 已提交
1842 1843
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1844 1845 1846
		}
	}

J
Joao Moreno 已提交
1847
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
1848 1849 1850 1851 1852 1853
	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) => {
1854
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
1855 1856 1857 1858 1859 1860

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

1861
			// Could it be a submodule?
1862
			if (pathEquals(resource.fsPath, repository.root)) {
1863 1864 1865
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
1866
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882

			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 已提交
1883 1884 1885
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
1886
}