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

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

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

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

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

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

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

		if (!ref) {
			return;
		}

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

class CheckoutTagItem extends CheckoutItem {

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

class CheckoutRemoteHeadItem extends CheckoutItem {

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

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

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

M
Maik Riechert 已提交
63 64
class BranchDeleteItem implements QuickPickItem {

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

70
	constructor(private ref: Ref) { }
M
Maik Riechert 已提交
71

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

80 81 82 83 84 85
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 已提交
86

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

J
Joao Moreno 已提交
92 93
class CreateBranchItem implements QuickPickItem {

J
Joao Moreno 已提交
94 95
	constructor(private cc: CommandCenter) { }

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

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

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 107 108 109 110 111 112 113 114
class HEADItem implements QuickPickItem {

	constructor(private repository: Repository) { }

	get label(): string { return 'HEAD'; }
	get description(): string { return (this.repository.HEAD && this.repository.HEAD.commit || '').substr(0, 8); }
	get alwaysShow(): boolean { return true; }
}

J
Joao Moreno 已提交
115
interface CommandOptions {
J
Joao Moreno 已提交
116
	repository?: boolean;
J
Joao Moreno 已提交
117 118 119
	diff?: boolean;
}

120 121 122 123
interface Command {
	commandId: string;
	key: string;
	method: Function;
J
Joao Moreno 已提交
124
	options: CommandOptions;
125 126 127
}

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

J
Joao Moreno 已提交
129
function command(commandId: string, options: CommandOptions = {}): Function {
130
	return (_target: any, key: string, descriptor: any) => {
J
Joao Moreno 已提交
131 132 133 134
		if (!(typeof descriptor.value === 'function')) {
			throw new Error('not supported');
		}

J
Joao Moreno 已提交
135
		Commands.push({ commandId, key, method: descriptor.value, options });
J
Joao Moreno 已提交
136 137
	};
}
J
Joao Moreno 已提交
138

J
Joao Moreno 已提交
139 140 141 142 143 144 145 146 147
const ImageMimetypes = [
	'image/png',
	'image/gif',
	'image/jpeg',
	'image/webp',
	'image/tiff',
	'image/bmp'
];

J
Joao Moreno 已提交
148
async function categorizeResourceByResolution(resources: Resource[]): Promise<{ merge: Resource[], resolved: Resource[], unresolved: Resource[], deletionConflicts: Resource[] }> {
149 150 151
	const selection = resources.filter(s => s instanceof Resource) as Resource[];
	const merge = selection.filter(s => s.resourceGroupType === ResourceGroupType.Merge);
	const isBothAddedOrModified = (s: Resource) => s.type === Status.BOTH_MODIFIED || s.type === Status.BOTH_ADDED;
J
Joao Moreno 已提交
152
	const isAnyDeleted = (s: Resource) => s.type === Status.DELETED_BY_THEM || s.type === Status.DELETED_BY_US;
153 154 155
	const possibleUnresolved = merge.filter(isBothAddedOrModified);
	const promises = possibleUnresolved.map(s => grep(s.resourceUri.fsPath, /^<{7}|^={7}|^>{7}/));
	const unresolvedBothModified = await Promise.all<boolean>(promises);
156
	const resolved = possibleUnresolved.filter((_s, i) => !unresolvedBothModified[i]);
J
Joao Moreno 已提交
157
	const deletionConflicts = merge.filter(s => isAnyDeleted(s));
158
	const unresolved = [
J
Joao Moreno 已提交
159
		...merge.filter(s => !isBothAddedOrModified(s) && !isAnyDeleted(s)),
160
		...possibleUnresolved.filter((_s, i) => unresolvedBothModified[i])
161 162
	];

J
Joao Moreno 已提交
163
	return { merge, resolved, unresolved, deletionConflicts };
164 165
}

J
Joao Moreno 已提交
166
function createCheckoutItems(repository: Repository): CheckoutItem[] {
167 168 169 170 171 172 173 174 175 176 177 178 179 180 181
	const config = workspace.getConfiguration('git');
	const checkoutType = config.get<string>('checkoutType') || 'all';
	const includeTags = checkoutType === 'all' || checkoutType === 'tags';
	const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

	const heads = repository.refs.filter(ref => ref.type === RefType.Head)
		.map(ref => new CheckoutItem(ref));
	const tags = (includeTags ? repository.refs.filter(ref => ref.type === RefType.Tag) : [])
		.map(ref => new CheckoutTagItem(ref));
	const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
		.map(ref => new CheckoutRemoteHeadItem(ref));

	return [...heads, ...tags, ...remoteHeads];
}

182 183 184 185 186 187 188 189 190
enum PushType {
	Push,
	PushTo,
	PushTags,
}

interface PushOptions {
	pushType: PushType;
	forcePush?: boolean;
J
Joao Moreno 已提交
191
	silent?: boolean;
192 193
}

J
Joao Moreno 已提交
194
export class CommandCenter {
J
Joao Moreno 已提交
195 196

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

J
Joao Moreno 已提交
198
	constructor(
J
Joao Moreno 已提交
199
		private git: Git,
J
Joao Moreno 已提交
200
		private model: Model,
J
Joao Moreno 已提交
201 202
		private outputChannel: OutputChannel,
		private telemetryReporter: TelemetryReporter
J
Joao Moreno 已提交
203
	) {
J
Joao Moreno 已提交
204 205
		this.disposables = Commands.map(({ commandId, key, method, options }) => {
			const command = this.createCommand(commandId, key, method, options);
206

J
Joao Moreno 已提交
207
			if (options.diff) {
J
Joao Moreno 已提交
208 209 210 211 212
				return commands.registerDiffInformationCommand(commandId, command);
			} else {
				return commands.registerCommand(commandId, command);
			}
		});
J
Joao Moreno 已提交
213 214
	}

J
Joao Moreno 已提交
215 216
	@command('git.refresh', { repository: true })
	async refresh(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
217
		await repository.status();
J
Joao Moreno 已提交
218
	}
J
Joao Moreno 已提交
219

J
Joao Moreno 已提交
220 221
	@command('git.openResource')
	async openResource(resource: Resource): Promise<void> {
J
Joao Moreno 已提交
222 223 224 225 226 227 228 229 230 231 232 233 234 235
		const repository = this.model.getRepository(resource.resourceUri);

		if (!repository) {
			return;
		}

		const config = workspace.getConfiguration('git', Uri.file(repository.root));
		const openDiffOnClick = config.get<boolean>('openDiffOnClick');

		if (openDiffOnClick) {
			await this._openResource(resource, undefined, true, false);
		} else {
			await this.openFile(resource);
		}
J
Joao Moreno 已提交
236 237
	}

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

241 242 243 244
		try {
			stat = await new Promise<Stats>((c, e) => lstat(resource.resourceUri.fsPath, (err, stat) => err ? e(err) : c(stat)));
		} catch (err) {
			// noop
245
		}
246

247 248 249 250
		let left: Uri | undefined;
		let right: Uri | undefined;

		if (stat && stat.isDirectory()) {
251 252 253 254
			const repository = this.model.getRepositoryForSubmodule(resource.resourceUri);

			if (repository) {
				right = toGitUri(resource.resourceUri, resource.resourceGroupType === ResourceGroupType.Index ? 'index' : 'wt', { submoduleOf: repository.root });
255 256
			}
		} else {
J
Joao Moreno 已提交
257 258 259 260
			if (resource.type !== Status.DELETED_BY_THEM) {
				left = await this.getLeftResource(resource);
			}

261 262
			right = await this.getRightResource(resource);
		}
263

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

J
Joao Moreno 已提交
266 267 268 269 270
		if (!right) {
			// TODO
			console.error('oh no');
			return;
		}
J
Joao Moreno 已提交
271

J
Joao Moreno 已提交
272
		const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
273 274
			preserveFocus,
			preview,
275
			viewColumn: ViewColumn.Active
J
Joao Moreno 已提交
276 277
		};

J
Joao Moreno 已提交
278 279
		const activeTextEditor = window.activeTextEditor;

280 281 282
		// 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 已提交
283 284 285
			opts.selection = activeTextEditor.selection;
		}

286
		if (!left) {
J
Joao Moreno 已提交
287
			await commands.executeCommand<void>('vscode.open', right, opts, title);
J
Joao Moreno 已提交
288 289 290 291
		} else {
			await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
		}
	}
J
Joao Moreno 已提交
292

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

J
Joao Moreno 已提交
296 297 298
		if (!repository) {
			return toGitUri(uri, ref);
		}
J
Joao Moreno 已提交
299

J
Joao Moreno 已提交
300
		try {
J
Joao Moreno 已提交
301 302 303
			let gitRef = ref;

			if (gitRef === '~') {
J
Joao Moreno 已提交
304
				const uriString = uri.toString();
J
Joao Moreno 已提交
305
				const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString);
J
Joao Moreno 已提交
306
				gitRef = indexStatus ? '' : 'HEAD';
J
Joao Moreno 已提交
307 308
			}

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

J
Joao Moreno 已提交
312 313 314
			if (mimetype === 'text/plain') {
				return toGitUri(uri, ref);
			}
315

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

J
Joao Moreno 已提交
320
			if (ImageMimetypes.indexOf(mimetype) > -1) {
J
Joao Moreno 已提交
321 322
				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 已提交
323 324
			}

J
Joao Moreno 已提交
325
			return Uri.parse(`data:;label:${path.basename(uri.fsPath)};description:${gitRef},`);
J
Joao Moreno 已提交
326 327 328 329

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

J
Joao Moreno 已提交
332
	private async getLeftResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
333 334 335
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
336
				return this.getURI(resource.original, 'HEAD');
J
Joao Moreno 已提交
337 338

			case Status.MODIFIED:
J
Joao Moreno 已提交
339
				return this.getURI(resource.resourceUri, '~');
340 341

			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
342
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
343
		}
344
		return undefined;
J
Joao Moreno 已提交
345
	}
J
Joao Moreno 已提交
346

J
Joao Moreno 已提交
347
	private async getRightResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
348 349 350 351 352
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_ADDED:
			case Status.INDEX_COPIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
353
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
354 355 356

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

J
Joao Moreno 已提交
359 360 361 362 363 364
			case Status.DELETED_BY_US:
				return this.getURI(resource.resourceUri, '~3');

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

J
Joao Moreno 已提交
365 366 367
			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
368
			case Status.INTENT_TO_ADD:
J
Joao Moreno 已提交
369 370 371 372 373 374
				const repository = this.model.getRepository(resource.resourceUri);

				if (!repository) {
					return;
				}

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

J
Joao Moreno 已提交
378 379
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
380 381
				}

J
Joao Moreno 已提交
382
				return resource.resourceUri;
J
Joao Moreno 已提交
383

384
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
385
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
386
				return resource.resourceUri;
J
Joao Moreno 已提交
387
		}
388
		return undefined;
J
Joao Moreno 已提交
389 390 391
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
392
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
393 394 395 396 397 398 399

		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
				return `${basename} (Index)`;

			case Status.MODIFIED:
M
Marc Kassay 已提交
400 401
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
402
				return `${basename} (Working Tree)`;
J
Joao Moreno 已提交
403 404 405 406 407 408

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

			case Status.DELETED_BY_THEM:
				return `${basename} (Ours)`;
J
Joao Moreno 已提交
409 410 411 412 413
		}

		return '';
	}

J
Joao Moreno 已提交
414
	@command('git.clone')
415 416 417 418 419 420 421
	async clone(url?: string): Promise<void> {
		if (!url) {
			url = await window.showInputBox({
				prompt: localize('repourl', "Repository URL"),
				ignoreFocusOut: true
			});
		}
J
Joao Moreno 已提交
422 423

		if (!url) {
K
kieferrm 已提交
424
			/* __GDPR__
K
kieferrm 已提交
425 426 427 428
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
429 430
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
431 432
		}

433
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
434 435 436 437 438 439 440 441 442
		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 已提交
443 444
		});

J
Joao Moreno 已提交
445
		if (!uris || uris.length === 0) {
K
kieferrm 已提交
446
			/* __GDPR__
K
kieferrm 已提交
447 448 449 450
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
451 452
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
			return;
J
Joao Moreno 已提交
453 454
		}

J
Joao Moreno 已提交
455 456 457
		const uri = uris[0];
		const parentPath = uri.fsPath;

458
		try {
459 460 461 462 463
			const opts = {
				location: ProgressLocation.Notification,
				title: localize('cloning', "Cloning git repository '{0}'...", url),
				cancellable: true
			};
M
Maryam Archie 已提交
464

465 466
			const repositoryPath = await window.withProgress(
				opts,
J
Joao Moreno 已提交
467
				(_, token) => this.git.clone(url!, parentPath, token)
468
			);
469

470 471
			const choices = [];
			let message = localize('proposeopen', "Would you like to open the cloned repository?");
472
			const open = localize('openrepo', "Open Repository");
473 474 475 476 477 478 479 480 481
			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);
482 483

			const openFolder = result === open;
K
kieferrm 已提交
484
			/* __GDPR__
K
kieferrm 已提交
485 486 487 488 489
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
					"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
				}
			*/
490
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
491 492 493

			const uri = Uri.file(repositoryPath);

494
			if (openFolder) {
495 496 497
				commands.executeCommand('vscode.openFolder', uri);
			} else if (result === addToWorkspace) {
				workspace.updateWorkspaceFolders(workspace.workspaceFolders!.length, 0, { uri });
498
			}
499 500
		} catch (err) {
			if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
K
kieferrm 已提交
501
				/* __GDPR__
K
kieferrm 已提交
502 503 504 505
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
506
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'directory_not_empty' });
J
Joao Moreno 已提交
507 508
			} else if (/Cancelled/i.test(err && (err.message || err.stderr || ''))) {
				return;
509
			} else {
K
kieferrm 已提交
510
				/* __GDPR__
K
kieferrm 已提交
511 512 513 514
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
515
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'error' });
516
			}
J
Joao Moreno 已提交
517

518
			throw err;
J
Joao Moreno 已提交
519 520 521
		}
	}

J
Joao Moreno 已提交
522
	@command('git.init')
J
Joao Moreno 已提交
523
	async init(): Promise<void> {
J
Joao Moreno 已提交
524
		let repositoryPath: string | undefined = undefined;
J
Joao Moreno 已提交
525
		let askToOpen = true;
J
Joao Moreno 已提交
526

J
Joao Moreno 已提交
527
		if (workspace.workspaceFolders) {
J
Joao Moreno 已提交
528
			const placeHolder = localize('init', "Pick workspace folder to initialize git repo in");
J
Joao Moreno 已提交
529 530 531 532 533
			const pick = { label: localize('choose', "Choose Folder...") };
			const items: { label: string, folder?: WorkspaceFolder }[] = [
				...workspace.workspaceFolders.map(folder => ({ label: folder.name, description: folder.uri.fsPath, folder })),
				pick
			];
J
Joao Moreno 已提交
534 535 536 537
			const item = await window.showQuickPick(items, { placeHolder, ignoreFocusOut: true });

			if (!item) {
				return;
J
Joao Moreno 已提交
538 539
			} else if (item.folder) {
				repositoryPath = item.folder.uri.fsPath;
J
Joao Moreno 已提交
540
				askToOpen = false;
J
Joao Moreno 已提交
541 542
			}
		}
J
Joao Moreno 已提交
543

J
Joao Moreno 已提交
544
		if (!repositoryPath) {
J
Joao Moreno 已提交
545 546 547 548 549 550 551 552 553 554 555 556
			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 已提交
557

J
Joao Moreno 已提交
558
			if (!result || result.length === 0) {
J
Joao Moreno 已提交
559 560
				return;
			}
J
Joao Moreno 已提交
561 562 563 564 565 566 567 568 569 570 571 572

			const uri = result[0];

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

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

J
Joao Moreno 已提交
573
			repositoryPath = uri.fsPath;
J
Joao Moreno 已提交
574 575 576 577

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

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

		const choices = [];
J
Joao Moreno 已提交
583 584
		let message = localize('proposeopen init', "Would you like to open the initialized repository?");
		const open = localize('openrepo', "Open Repository");
I
Ivan Sučić 已提交
585
		choices.push(open);
J
Joao Moreno 已提交
586

J
Joao Moreno 已提交
587 588 589 590
		if (!askToOpen) {
			return;
		}

J
Joao Moreno 已提交
591 592 593 594 595
		const addToWorkspace = localize('add', "Add to Workspace");
		if (workspace.workspaceFolders) {
			message = localize('proposeopen2 init', "Would you like to open the initialized repository, or add it to the current workspace?");
			choices.push(addToWorkspace);
		}
I
Ivan Sučić 已提交
596 597

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

J
Joao Moreno 已提交
600 601 602 603 604 605
		if (result === open) {
			commands.executeCommand('vscode.openFolder', uri);
		} else if (result === addToWorkspace) {
			workspace.updateWorkspaceFolders(workspace.workspaceFolders!.length, 0, { uri });
		} else {
			await this.model.openRepository(repositoryPath);
I
Ivan Sučić 已提交
606
		}
J
Joao Moreno 已提交
607 608
	}

J
Joao Moreno 已提交
609 610
	@command('git.openRepository', { repository: false })
	async openRepository(path?: string): Promise<void> {
611
		if (!path) {
J
Joao Moreno 已提交
612 613 614 615 616 617
			const result = await window.showOpenDialog({
				canSelectFiles: false,
				canSelectFolders: true,
				canSelectMany: false,
				defaultUri: Uri.file(os.homedir()),
				openLabel: localize('open repo', "Open Repository")
618 619
			});

J
Joao Moreno 已提交
620
			if (!result || result.length === 0) {
621 622 623
				return;
			}

J
Joao Moreno 已提交
624
			path = result[0].fsPath;
625
		}
J
Joao Moreno 已提交
626 627

		await this.model.openRepository(path);
628 629
	}

J
Joao Moreno 已提交
630 631 632 633 634
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

639
		let uris: Uri[] | undefined;
640 641 642

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
643
				uris = [Uri.file(fromGitUri(arg).path)];
644
			} else if (arg.scheme === 'file') {
645
				uris = [arg];
646 647 648 649 650 651
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
J
Joao Moreno 已提交
652
				console.log('WHAT');
653
				resource = this.getSCMResource();
654 655 656
			}

			if (resource) {
J
Joao Moreno 已提交
657 658 659 660 661
				uris = ([resource, ...resourceStates] as Resource[])
					.filter(r => r.type !== Status.DELETED && r.type !== Status.INDEX_DELETED)
					.map(r => r.resourceUri);
			} else if (window.activeTextEditor) {
				uris = [window.activeTextEditor.document.uri];
662
			}
J
Joao Moreno 已提交
663 664
		}

665
		if (!uris) {
J
Joao Moreno 已提交
666
			return;
J
Joao Moreno 已提交
667 668
		}

669
		const activeTextEditor = window.activeTextEditor;
J
Joao Moreno 已提交
670

671 672
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
673
				preserveFocus,
J
Joao Moreno 已提交
674
				preview: false,
675
				viewColumn: ViewColumn.Active
676 677
			};

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

680 681 682
			// 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 已提交
683
				// preserve not only selection but also visible range
B
Benjamin Pasero 已提交
684
				opts.selection = activeTextEditor.selection;
E
Eric Gang 已提交
685 686 687 688 689
				const previousVisibleRanges = activeTextEditor.visibleRanges;
				const editor = await window.showTextDocument(document, opts);
				editor.revealRange(previousVisibleRanges[0]);
			} else {
				await window.showTextDocument(document, opts);
B
Benjamin Pasero 已提交
690
			}
J
Joao Moreno 已提交
691
		}
J
Joao Moreno 已提交
692 693
	}

J
Joao Moreno 已提交
694 695 696 697 698
	@command('git.openFile2')
	async openFile2(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
		this.openFile(arg, ...resourceStates);
	}

J
Joao Moreno 已提交
699 700
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
701
		let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
702
		const preview = !(arg instanceof Resource);
D
Duroktar 已提交
703 704 705 706

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
707
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
708
		} else {
709
			resource = this.getSCMResource();
D
Duroktar 已提交
710 711 712 713 714 715
		}

		if (!resource) {
			return;
		}

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

J
Joao Moreno 已提交
718 719 720
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
721
		}
J
Joao Moreno 已提交
722

J
Joao Moreno 已提交
723 724 725 726 727
		const opts: TextDocumentShowOptions = {
			preview
		};

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

J
Joao Moreno 已提交
730 731
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
732
		const preserveFocus = arg instanceof Resource;
J
Joao Moreno 已提交
733 734
		const preview = !(arg instanceof Resource);

J
Joao 已提交
735
		const preserveSelection = arg instanceof Uri || !arg;
736
		let resources: Resource[] | undefined = undefined;
737

738
		if (arg instanceof Uri) {
739
			const resource = this.getSCMResource(arg);
740 741 742
			if (resource !== undefined) {
				resources = [resource];
			}
743
		} else {
744
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
745

746 747 748
			if (arg instanceof Resource) {
				resource = arg;
			} else {
749
				resource = this.getSCMResource();
750 751 752 753 754
			}

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

757
		if (!resources) {
J
Joao Moreno 已提交
758
			return;
J
Joao Moreno 已提交
759
		}
J
Joao Moreno 已提交
760

761
		for (const resource of resources) {
J
Joao 已提交
762
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
763
		}
J
Joao Moreno 已提交
764 765
	}

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

770 771
		resourceStates = resourceStates.filter(s => !!s);

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

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

777 778 779 780 781 782 783
			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

784
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
785
		const { resolved, unresolved, deletionConflicts } = await categorizeResourceByResolution(selection);
786 787 788 789 790

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

792 793 794 795 796 797 798 799
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
800 801 802 803 804 805 806 807 808 809 810 811 812 813
		try {
			await this.runByRepository(deletionConflicts.map(r => r.resourceUri), async (repository, resources) => {
				for (const resource of resources) {
					await this._stageDeletionConflict(repository, resource);
				}
			});
		} catch (err) {
			if (/Cancelled/.test(err.message)) {
				return;
			}

			throw err;
		}

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

J
Joao Moreno 已提交
817
		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
818
		if (!scmResources.length) {
J
Joao Moreno 已提交
819 820
			return;
		}
J
Joao Moreno 已提交
821

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

J
Joao Moreno 已提交
826 827
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
828
		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
829 830 831 832 833 834 835 836 837 838 839 840 841
		const { merge, unresolved, deletionConflicts } = await categorizeResourceByResolution(resources);

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

			throw err;
		}
842 843 844

		if (unresolved.length > 0) {
			const message = unresolved.length > 1
J
Joao Moreno 已提交
845 846
				? 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));
847 848 849 850 851 852 853 854 855

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

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

J
Joao Moreno 已提交
856
		await repository.add([]);
J
Joao Moreno 已提交
857 858
	}

J
Joao Moreno 已提交
859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893
	private async _stageDeletionConflict(repository: Repository, uri: Uri): Promise<void> {
		const uriString = uri.toString();
		const resource = repository.mergeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];

		if (!resource) {
			return;
		}

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

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

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

J
Joao Moreno 已提交
894
	@command('git.stageChange')
J
Joao Moreno 已提交
895 896 897 898 899 900 901 902
	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 已提交
903 904
	}

J
Joao Moreno 已提交
905
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
906
	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
907 908 909 910 911 912 913
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
914 915 916 917
		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 已提交
918

J
Joao Moreno 已提交
919
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
920 921 922
			return;
		}

J
Joao Moreno 已提交
923 924
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
925

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

J
Joao Moreno 已提交
930
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
931 932 933
			return;
		}

J
Joao Moreno 已提交
934
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
935
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
936
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
937

J
Joao Moreno 已提交
938
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
939
	}
J
Joao Moreno 已提交
940

J
Joao Moreno 已提交
941
	@command('git.revertChange')
J
Joao Moreno 已提交
942 943 944 945
	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 已提交
946 947 948
			return;
		}

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

J
Joao Moreno 已提交
952
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
953
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
954 955 956 957 958 959 960
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
961 962
		const selections = textEditor.selections;
		const selectedChanges = changes.filter(change => {
J
Joao Moreno 已提交
963
			const modifiedRange = getModifiedRange(modifiedDocument, change);
J
Joao Moreno 已提交
964 965 966 967
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
968 969 970
			return;
		}

J
Joao Moreno 已提交
971 972
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
973

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

J
Joao Moreno 已提交
978
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
979 980 981
			return;
		}

J
Joao Moreno 已提交
982 983
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
984 985
		const selectionsBeforeRevert = textEditor.selections;
		const visibleRangesBeforeRevert = textEditor.visibleRanges;
J
Joao Moreno 已提交
986
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
987

J
Joao Moreno 已提交
988 989 990
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
991

J
Joao Moreno 已提交
992 993
		await modifiedDocument.save();

994 995
		textEditor.selections = selectionsBeforeRevert;
		textEditor.revealRange(visibleRangesBeforeRevert[0]);
J
Joao Moreno 已提交
996 997
	}

J
Joao Moreno 已提交
998 999
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
1000 1001
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1002
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1003
			const resource = this.getSCMResource();
1004 1005 1006 1007 1008 1009 1010 1011

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

1015
		if (!scmResources.length) {
J
Joao Moreno 已提交
1016 1017 1018
			return;
		}

1019
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1020
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
1021 1022
	}

J
Joao Moreno 已提交
1023 1024
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
1025
		await repository.revert([]);
J
Joao Moreno 已提交
1026
	}
J
Joao Moreno 已提交
1027

J
Joao Moreno 已提交
1028 1029
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
1030 1031 1032 1033 1034 1035 1036 1037 1038
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

1039 1040 1041 1042 1043 1044 1045
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
1046 1047 1048
			return;
		}

J
Joao Moreno 已提交
1049
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
1050
		const originalDocument = await workspace.openTextDocument(originalUri);
1051 1052 1053 1054
		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 已提交
1055 1056 1057 1058 1059

		if (!selectedDiffs.length) {
			return;
		}

1060 1061
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
1062

J
Joao Moreno 已提交
1063
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
1064 1065
	}

J
Joao Moreno 已提交
1066 1067
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
1068 1069
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1070
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1071
			const resource = this.getSCMResource();
1072 1073 1074 1075 1076 1077 1078 1079

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
1083
		if (!scmResources.length) {
J
Joao Moreno 已提交
1084 1085
			return;
		}
J
Joao Moreno 已提交
1086

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

J
Joao Moreno 已提交
1091
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
1092
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
1093
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
1094 1095
				yes = localize('delete file', "Delete file");
			} else {
1096 1097 1098 1099 1100 1101
				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 已提交
1102 1103
			}
		} else {
1104 1105 1106 1107 1108 1109
			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 已提交
1110 1111 1112 1113 1114

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

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

J
Joao Moreno 已提交
1118 1119 1120 1121
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
1122
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1123
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
1124
	}
J
Joao Moreno 已提交
1125

J
Joao Moreno 已提交
1126 1127
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1128
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
1129 1130 1131 1132 1133

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

J
Joao Moreno 已提交
1134 1135
		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 已提交
1136

J
Joao Moreno 已提交
1137 1138 1139 1140 1141 1142
		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 已提交
1143
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1144
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
1145

J
Joao Moreno 已提交
1146
			if (pick !== yes) {
J
Joao Moreno 已提交
1147 1148 1149
				return;
			}

J
Joao 已提交
1150
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1151 1152 1153 1154 1155 1156 1157 1158
			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 已提交
1159 1160
			}

J
Joao 已提交
1161
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1162 1163 1164 1165
		} 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 已提交
1166

J
Joao Moreno 已提交
1167 1168 1169
			if (pick !== yes) {
				return;
			}
J
Joao Moreno 已提交
1170

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

J
Joao Moreno 已提交
1173 1174 1175 1176
		} 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 已提交
1177

J
Joao Moreno 已提交
1178 1179 1180 1181 1182
			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 已提交
1183

J
Joao Moreno 已提交
1184
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1185 1186 1187 1188 1189 1190 1191 1192
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
1193
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1194
		}
J
Joao Moreno 已提交
1195 1196
	}

J
Joao Moreno 已提交
1197
	private async smartCommit(
J
Joao Moreno 已提交
1198
		repository: Repository,
1199
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
1200 1201
		opts?: CommitOptions
	): Promise<boolean> {
1202
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
J
Joao Moreno 已提交
1203 1204 1205 1206 1207 1208 1209 1210
		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 已提交
1211 1212
					? 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 已提交
1213 1214 1215 1216 1217 1218 1219 1220 1221 1222
				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
				}
1223 1224 1225
			}
		}

1226
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
1227
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
1228 1229
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
1230 1231

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

J
Joao Moreno 已提交
1234 1235
			// 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?");
1236 1237 1238 1239 1240
			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 已提交
1241 1242 1243
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
1244 1245 1246
			}
		}

J
Joao Moreno 已提交
1247
		if (!opts) {
1248
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
1249 1250
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
1251 1252
		}

1253 1254 1255
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

1256 1257 1258 1259
		if (config.get<boolean>('alwaysSignOff')) {
			opts.signoff = true;
		}

J
Joao Moreno 已提交
1260
		if (
1261
			(
J
Joao Moreno 已提交
1262 1263 1264 1265 1266
				// no changes
				(noStagedChanges && noUnstagedChanges)
				// or no staged changes and not `all`
				|| (!opts.all && noStagedChanges)
			)
1267
			&& !opts.empty
J
Joao Moreno 已提交
1268
		) {
J
Joao Moreno 已提交
1269 1270 1271 1272
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1273
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1274 1275 1276 1277 1278

		if (!message) {
			return false;
		}

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

J
Joao Moreno 已提交
1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291
		const postCommitCommand = config.get<'none' | 'push' | 'sync'>('postCommitCommand');

		switch (postCommitCommand) {
			case 'push':
				await this._push(repository, { pushType: PushType.Push, silent: true });
				break;
			case 'sync':
				await this.sync(repository);
				break;
		}

J
Joao Moreno 已提交
1292 1293 1294
		return true;
	}

J
Joao Moreno 已提交
1295
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1296
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1297
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
1298 1299 1300 1301
			if (message) {
				return message;
			}

1302 1303 1304 1305 1306 1307
			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 已提交
1308
			return await window.showInputBox({
1309
				value,
J
Joao Moreno 已提交
1310
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
1311 1312
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
1313
			});
J
Joao Moreno 已提交
1314 1315
		};

J
Joao Moreno 已提交
1316
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1317 1318

		if (message && didCommit) {
J
Joao Moreno 已提交
1319
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1320
		}
J
Joao Moreno 已提交
1321 1322
	}

J
Joao Moreno 已提交
1323
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
1324 1325
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
1326 1327
	}

J
Joao Moreno 已提交
1328
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
1329
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1330
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
1331 1332 1333
			return;
		}

J
Joao Moreno 已提交
1334
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1335 1336

		if (didCommit) {
J
Joao Moreno 已提交
1337
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1338
		}
J
Joao Moreno 已提交
1339 1340
	}

J
Joao Moreno 已提交
1341
	@command('git.commitStaged', { repository: true })
J
Joao Moreno 已提交
1342 1343
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
1344 1345
	}

J
Joao Moreno 已提交
1346
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
1347 1348
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
1349 1350
	}

J
Joao Moreno 已提交
1351
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
1352
	async commitStagedAmend(repository: Repository): Promise<void> {
1353
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
1354 1355
	}

J
Joao Moreno 已提交
1356
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
1357 1358
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
1359 1360
	}

J
Joao Moreno 已提交
1361
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1362 1363
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1364 1365
	}

J
Joao Moreno 已提交
1366
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
1367 1368
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
1369 1370
	}

J
Joao Moreno 已提交
1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392
	@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 已提交
1393 1394 1395 1396 1397
	@command('git.restoreCommitTemplate', { repository: true })
	async restoreCommitTemplate(repository: Repository): Promise<void> {
		repository.inputBox.value = await repository.getCommitTemplate();
	}

J
Joao Moreno 已提交
1398
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
1399 1400
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1401 1402

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

J
Joao Moreno 已提交
1407
		const commit = await repository.getCommit('HEAD');
J
Joao Moreno 已提交
1408 1409

		if (commit.parents.length > 0) {
1410 1411 1412 1413 1414
			await repository.reset('HEAD~');
		} else {
			await repository.deleteRef('HEAD');
			await this.unstageAll(repository);
		}
J
Joao Moreno 已提交
1415

J
Joao Moreno 已提交
1416
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1417 1418
	}

J
Joao Moreno 已提交
1419
	@command('git.checkout', { repository: true })
1420
	async checkout(repository: Repository, treeish: string): Promise<boolean> {
J
Joao Moreno 已提交
1421
		if (typeof treeish === 'string') {
1422 1423
			await repository.checkout(treeish);
			return true;
J
Joao Moreno 已提交
1424
		}
J
Joao Moreno 已提交
1425
		const createBranch = new CreateBranchItem(this);
J
Joao Moreno 已提交
1426

J
Joao Moreno 已提交
1427
		const picks = [createBranch, ...createCheckoutItems(repository)];
1428
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
1429 1430 1431 1432 1433 1434 1435 1436

		const quickpick = window.createQuickPick();
		quickpick.items = picks;
		quickpick.placeholder = placeHolder;
		quickpick.show();

		const choice = await new Promise<QuickPickItem | undefined>(c => quickpick.onDidAccept(() => c(quickpick.activeItems[0])));
		quickpick.hide();
J
Joao Moreno 已提交
1437 1438

		if (!choice) {
1439
			return false;
J
Joao Moreno 已提交
1440 1441
		}

1442 1443 1444 1445 1446 1447
		if (choice === createBranch) {
			await this._branch(repository, quickpick.value);
		} else {
			await (choice as CheckoutItem).run(repository);
		}

1448
		return true;
J
Joao Moreno 已提交
1449 1450
	}

J
Joao Moreno 已提交
1451
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1452
	async branch(repository: Repository): Promise<void> {
1453 1454
		await this._branch(repository);
	}
J
Joao Moreno 已提交
1455

1456 1457 1458 1459 1460 1461 1462 1463
	private async _branch(repository: Repository, defaultName?: string): Promise<void> {
		const config = workspace.getConfiguration('git');
		const branchWhitespaceChar = config.get<string>('branchWhitespaceChar')!;
		const branchValidationRegex = config.get<string>('branchValidationRegex')!;
		const sanitize = (name: string) => name ?
			name.trim().replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, branchWhitespaceChar)
			: name;

J
Joao Moreno 已提交
1464
		const rawBranchName = defaultName || await window.showInputBox({
1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480
			placeHolder: localize('branch name', "Branch name"),
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true,
			validateInput: (name: string) => {
				const validateName = new RegExp(branchValidationRegex);
				if (validateName.test(sanitize(name))) {
					return null;
				}

				return localize('branch name format invalid', "Branch name needs to match regex: {0}", branchValidationRegex);
			}
		});

		const branchName = sanitize(rawBranchName || '');

		if (!branchName) {
1481 1482
			return;
		}
J
Joao Moreno 已提交
1483

1484
		const picks = [new HEADItem(repository), ...createCheckoutItems(repository)];
J
Joao Moreno 已提交
1485
		const placeHolder = localize('select a ref to create a new branch from', 'Select a ref to create the \'{0}\' branch from', branchName);
1486
		const target = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
1487

1488
		if (!target) {
J
Joao Moreno 已提交
1489 1490
			return;
		}
J
Joao Moreno 已提交
1491

1492
		await repository.branch(branchName, true, target.label);
J
Joao Moreno 已提交
1493 1494
	}

J
Joao Moreno 已提交
1495
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1496
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1497 1498
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1499
			run = force => repository.deleteBranch(name, force);
1500
		} else {
J
Joao Moreno 已提交
1501 1502
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1503
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1504

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

M
Maik Riechert 已提交
1508
			if (!choice || !choice.branchName) {
1509 1510
				return;
			}
M
Maik Riechert 已提交
1511
			name = choice.branchName;
J
Joao Moreno 已提交
1512
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1513 1514
		}

1515 1516 1517 1518 1519 1520 1521 1522 1523
		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");
1524
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1525 1526 1527 1528 1529

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

1532 1533
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
J
Justin Horner 已提交
1534 1535 1536 1537 1538 1539 1540 1541
		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 {
1542
			await repository.renameBranch(name);
J
Justin Horner 已提交
1543 1544 1545
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1546 1547
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1548
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1549
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", name));
1550 1551 1552
					return;
				default:
					throw err;
J
Justin Horner 已提交
1553 1554 1555 1556
			}
		}
	}

J
Joao Moreno 已提交
1557
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1558
	async merge(repository: Repository): Promise<void> {
1559 1560 1561 1562
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1563
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1564 1565
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1566

J
Joao Moreno 已提交
1567
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1568 1569
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1570 1571

		const picks = [...heads, ...remoteHeads];
1572 1573
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1574 1575 1576 1577 1578

		if (!choice) {
			return;
		}

1579
		await choice.run(repository);
1580 1581
	}

J
Joao Moreno 已提交
1582
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1583
	async createTag(repository: Repository): Promise<void> {
1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595
		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 已提交
1596
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1597 1598 1599 1600 1601
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
1605 1606 1607 1608 1609 1610 1611
	@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 已提交
1612
		await repository.fetchDefault();
J
Joao Moreno 已提交
1613 1614
	}

R
Ryan Scott 已提交
1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625
	@command('git.fetchPrune', { repository: true })
	async fetchPrune(repository: Repository): Promise<void> {
		if (repository.remotes.length === 0) {
			window.showWarningMessage(localize('no remotes to fetch', "This repository has no remotes configured to fetch from."));
			return;
		}

		await repository.fetchPrune();
	}


J
Joao Moreno 已提交
1626 1627 1628 1629 1630 1631 1632 1633 1634 1635
	@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 已提交
1636
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1637 1638
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1639 1640 1641 1642 1643 1644

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

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

D
Dozed12 已提交
1649
		if (!remotePick) {
1650 1651 1652
			return;
		}

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

D
Dozed12 已提交
1659
		if (!branchPick) {
1660 1661 1662
			return;
		}

F
Francisco Moreira 已提交
1663 1664
		const remoteCharCnt = remotePick.label.length;

1665
		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1666 1667
	}

J
Joao Moreno 已提交
1668
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1669 1670
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1671 1672 1673 1674 1675 1676

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

J
Joao Moreno 已提交
1677
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1678 1679
	}

J
Joao Moreno 已提交
1680
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1681 1682
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1683 1684 1685 1686 1687 1688

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

J
Joao Moreno 已提交
1689
		await repository.pullWithRebase(repository.HEAD);
J
Joao Moreno 已提交
1690 1691
	}

J
Joao Moreno 已提交
1692
	private async _push(repository: Repository, pushOptions: PushOptions) {
J
Joao Moreno 已提交
1693
		const remotes = repository.remotes;
1694

J
Joao Moreno 已提交
1695
		if (remotes.length === 0) {
J
Joao Moreno 已提交
1696 1697 1698
			if (!pushOptions.silent) {
				window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
			}
J
Joao Moreno 已提交
1699 1700
			return;
		}
1701

J
Joao Moreno 已提交
1702 1703 1704 1705 1706 1707
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
		let forcePushMode: ForcePushMode | undefined = undefined;

		if (pushOptions.forcePush) {
			if (!config.get<boolean>('allowForcePush')) {
				await window.showErrorMessage(localize('force push not allowed', "Force push is not allowed, please enable it with the 'git.allowForcePush' setting."));
1708 1709
				return;
			}
J
Joao Moreno 已提交
1710

J
Joao Moreno 已提交
1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724
			forcePushMode = config.get<boolean>('useForcePushWithLease') === true ? ForcePushMode.ForceWithLease : ForcePushMode.Force;

			if (config.get<boolean>('confirmForcePush')) {
				const message = localize('confirm force push', "You are about to force push your changes, this can be destructive and could inadvertedly overwrite changes made by others.\n\nAre you sure to continue?");
				const yes = localize('ok', "OK");
				const neverAgain = localize('never ask again', "OK, Don't Ask Again");
				const pick = await window.showWarningMessage(message, { modal: true }, yes, neverAgain);

				if (pick === neverAgain) {
					config.update('confirmForcePush', false, true);
				} else if (pick !== yes) {
					return;
				}
			}
J
Joao Moreno 已提交
1725 1726
		}

1727 1728 1729 1730 1731 1732 1733
		if (pushOptions.pushType === PushType.PushTags) {
			await repository.pushTags(undefined, forcePushMode);

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

1734
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1735 1736 1737
			if (!pushOptions.silent) {
				window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			}
1738 1739 1740
			return;
		}

1741 1742 1743 1744 1745 1746 1747
		if (pushOptions.pushType === PushType.Push) {
			try {
				await repository.push(repository.HEAD, forcePushMode);
			} catch (err) {
				if (err.gitErrorCode !== GitErrorCodes.NoUpstreamBranch) {
					throw err;
				}
1748

J
Joao Moreno 已提交
1749 1750 1751 1752
				if (pushOptions.silent) {
					return;
				}

1753 1754 1755 1756 1757 1758 1759 1760 1761 1762
				const branchName = repository.HEAD.name;
				const message = localize('confirm publish branch', "The branch '{0}' has no upstream branch. Would you like to publish this branch?", branchName);
				const yes = localize('ok', "OK");
				const pick = await window.showWarningMessage(message, { modal: true }, yes);

				if (pick === yes) {
					await this.publish(repository);
				}
			}
		} else {
1763
			const branchName = repository.HEAD.name;
1764 1765 1766
			const picks = remotes.filter(r => r.pushUrl !== undefined).map(r => ({ label: r.name, description: r.pushUrl! }));
			const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
			const pick = await window.showQuickPick(picks, { placeHolder });
1767

1768 1769
			if (!pick) {
				return;
1770
			}
1771 1772

			await repository.pushTo(pick.label, branchName, undefined, forcePushMode);
1773
		}
J
Joao Moreno 已提交
1774 1775
	}

1776 1777
	@command('git.push', { repository: true })
	async push(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1778
		await this._push(repository, { pushType: PushType.Push });
1779
	}
1780

1781 1782
	@command('git.pushForce', { repository: true })
	async pushForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1783
		await this._push(repository, { pushType: PushType.Push, forcePush: true });
1784
	}
1785

1786 1787
	@command('git.pushWithTags', { repository: true })
	async pushWithTags(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1788
		await this._push(repository, { pushType: PushType.PushTags });
1789
	}
1790

1791 1792
	@command('git.pushWithTagsForce', { repository: true })
	async pushWithTagsForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1793
		await this._push(repository, { pushType: PushType.PushTags, forcePush: true });
1794 1795
	}

J
Joao Moreno 已提交
1796
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1797
	async pushTo(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1798
		await this._push(repository, { pushType: PushType.PushTo });
1799
	}
J
Joao Moreno 已提交
1800

1801 1802
	@command('git.pushToForce', { repository: true })
	async pushToForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1803
		await this._push(repository, { pushType: PushType.PushTo, forcePush: true });
J
Joao Moreno 已提交
1804 1805
	}

O
Omkar Manjrekar 已提交
1806 1807
	@command('git.addRemote', { repository: true })
	async addRemote(repository: Repository): Promise<void> {
1808 1809
		const remotes = repository.remotes;

O
Omkar Manjrekar 已提交
1810 1811
		const sanitize = (name: string) => {
			name = name.trim();
J
Joao Moreno 已提交
1812
			return name && name.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, '-');
O
Omkar Manjrekar 已提交
1813
		};
O
Omkar Manjrekar 已提交
1814

O
Omkar Manjrekar 已提交
1815
		const resultName = await window.showInputBox({
O
Omkar Manjrekar 已提交
1816 1817 1818 1819
			placeHolder: localize('remote name', "Remote name"),
			prompt: localize('provide remote name', "Please provide a remote name"),
			ignoreFocusOut: true,
			validateInput: (name: string) => {
O
Omkar Manjrekar 已提交
1820
				if (sanitize(name)) {
O
Omkar Manjrekar 已提交
1821 1822
					return null;
				}
O
Omkar Manjrekar 已提交
1823
				return localize('remote name format invalid', "Remote name format invalid");
O
Omkar Manjrekar 已提交
1824
			}
O
Omkar Manjrekar 已提交
1825
		});
O
Omkar Manjrekar 已提交
1826

O
Omkar Manjrekar 已提交
1827
		const name = sanitize(resultName || '');
O
Omkar Manjrekar 已提交
1828

O
Omkar Manjrekar 已提交
1829 1830 1831 1832 1833
		if (!name) {
			return;
		}

		if (remotes.find(r => r.name === name)) {
J
Joao Moreno 已提交
1834
			window.showErrorMessage(localize('remote already exists', "Remote '{0}' already exists.", name));
O
Omkar Manjrekar 已提交
1835
			return;
O
Omkar Manjrekar 已提交
1836
		}
O
Omkar Manjrekar 已提交
1837

J
Joao Moreno 已提交
1838
		const url = await window.showInputBox({
O
Omkar Manjrekar 已提交
1839
			placeHolder: localize('remote url', "Remote URL"),
O
Omkar Manjrekar 已提交
1840
			prompt: localize('provide remote URL', "Enter URL for remote \"{0}\"", name),
1841
			ignoreFocusOut: true
O
Omkar Manjrekar 已提交
1842 1843 1844 1845 1846 1847 1848
		});

		if (!url) {
			return;
		}

		await repository.addRemote(name, url);
O
Omkar Manjrekar 已提交
1849 1850
	}

O
Omkar Manjrekar 已提交
1851 1852
	@command('git.removeRemote', { repository: true })
	async removeRemote(repository: Repository): Promise<void> {
O
Omkar Manjrekar 已提交
1853 1854 1855
		const remotes = repository.remotes;

		if (remotes.length === 0) {
1856
			window.showErrorMessage(localize('no remotes added', "Your repository has no remotes."));
O
Omkar Manjrekar 已提交
1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867
			return;
		}

		const picks = remotes.map(r => r.name);
		const placeHolder = localize('remove remote', "Pick a remote to remove");

		const remoteName = await window.showQuickPick(picks, { placeHolder });

		if (!remoteName) {
			return;
		}
O
Omkar Manjrekar 已提交
1868

O
Omkar Manjrekar 已提交
1869
		await repository.removeRemote(remoteName);
O
Omkar Manjrekar 已提交
1870
	}
O
Omkar Manjrekar 已提交
1871

J
Joao Moreno 已提交
1872
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1873
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1874 1875 1876 1877 1878

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

J
Joao Moreno 已提交
1879 1880 1881 1882
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
1883
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1884
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
1885 1886

		if (shouldPrompt) {
J
Joao Moreno 已提交
1887
			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 已提交
1888
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
1889
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
1890 1891 1892 1893 1894 1895 1896 1897 1898
			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 已提交
1899
		if (rebase) {
J
Joao Moreno 已提交
1900
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
1901
		} else {
J
Joao Moreno 已提交
1902
			await repository.sync(HEAD);
J
Joao Moreno 已提交
1903 1904 1905 1906 1907 1908
		}
	}

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

J
Joao 已提交
1911 1912 1913 1914 1915 1916 1917 1918 1919
	@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 已提交
1920
			await repository.sync(HEAD);
J
Joao 已提交
1921 1922 1923
		}));
	}

1924
	@command('git.syncRebase', { repository: true })
J
Joao Moreno 已提交
1925 1926
	syncRebase(repository: Repository): Promise<void> {
		return this._sync(repository, true);
J
Joao Moreno 已提交
1927 1928
	}

J
Joao Moreno 已提交
1929
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1930 1931
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1932 1933 1934 1935 1936 1937

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

J
Joao Moreno 已提交
1938
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1939 1940 1941 1942 1943 1944
		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 已提交
1945 1946 1947 1948 1949

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1950
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1951 1952
	}

1953 1954
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
1955 1956
		resourceStates = resourceStates.filter(s => !!s);

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

1960
			if (!resource) {
J
Joao Moreno 已提交
1961 1962 1963
				return;
			}

1964
			resourceStates = [resource];
J
Joao Moreno 已提交
1965 1966
		}

1967
		const resources = resourceStates
J
Joao Moreno 已提交
1968 1969 1970
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1971
		if (!resources.length) {
N
NKumar2 已提交
1972 1973 1974
			return;
		}

1975
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
1976 1977
	}

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

1982
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
1983 1984 1985
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1986

1987
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
1988 1989 1990 1991 1992

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

J
Joao Moreno 已提交
1993
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
1994 1995
	}

1996 1997 1998 1999 2000 2001 2002
	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 已提交
2003 2004 2005 2006 2007 2008 2009 2010 2011 2012
	@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 已提交
2013
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
2014
	async stashPop(repository: Repository): Promise<void> {
2015
		const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
J
Joao Moreno 已提交
2016
		const stash = await this.pickStash(repository, placeHolder);
2017

J
Joao Moreno 已提交
2018
		if (!stash) {
2019 2020 2021
			return;
		}

J
Joao Moreno 已提交
2022
		await repository.popStash(stash.index);
2023 2024 2025 2026
	}

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

J
Joao Moreno 已提交
2029 2030
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
2031 2032 2033
			return;
		}

2034 2035 2036 2037 2038 2039
		await repository.popStash();
	}

	@command('git.stashApply', { repository: true })
	async stashApply(repository: Repository): Promise<void> {
		const placeHolder = localize('pick stash to apply', "Pick a stash to apply");
J
Joao Moreno 已提交
2040
		const stash = await this.pickStash(repository, placeHolder);
K
Krzysztof Cieślak 已提交
2041

J
Joao Moreno 已提交
2042
		if (!stash) {
K
Krzysztof Cieślak 已提交
2043 2044
			return;
		}
J
Joao Moreno 已提交
2045

J
Joao Moreno 已提交
2046
		await repository.applyStash(stash.index);
K
Krzysztof Cieślak 已提交
2047 2048
	}

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

J
Joao Moreno 已提交
2053 2054
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
2055 2056 2057 2058 2059 2060
			return;
		}

		await repository.applyStash();
	}

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

J
Joao Moreno 已提交
2064 2065
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
2066 2067 2068
			return;
		}

J
Joao Moreno 已提交
2069 2070 2071
		const picks = stashes.map(stash => ({ label: `#${stash.index}:  ${stash.description}`, description: '', details: '', stash }));
		const result = await window.showQuickPick(picks, { placeHolder });
		return result && result.stash;
J
Joao Moreno 已提交
2072
	}
K
Krzysztof Cieślak 已提交
2073

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

J
Joao Moreno 已提交
2078
			if (!options.repository) {
J
Joao Moreno 已提交
2079 2080
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
2081 2082
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
2083 2084 2085 2086 2087 2088 2089 2090 2091
				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();
				}
2092

J
Joao Moreno 已提交
2093
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
2094
					if (!repository) {
J
Joao 已提交
2095
						return Promise.resolve();
J
Joao Moreno 已提交
2096 2097
					}

J
Joao Moreno 已提交
2098
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
2099
				});
J
Joao Moreno 已提交
2100 2101
			}

K
kieferrm 已提交
2102
			/* __GDPR__
K
kieferrm 已提交
2103 2104 2105 2106
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
2107 2108
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
2109
			return result.catch(async err => {
J
Joao Moreno 已提交
2110
				const options: MessageOptions = {
2111
					modal: true
J
Joao Moreno 已提交
2112 2113
				};

J
Joao Moreno 已提交
2114
				let message: string;
2115
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
2116

J
Joao Moreno 已提交
2117 2118 2119 2120 2121
				const choices = new Map<string, () => void>();
				const openOutputChannelChoice = localize('open git log', "Open Git Log");
				const outputChannel = this.outputChannel as OutputChannel;
				choices.set(openOutputChannelChoice, () => outputChannel.show());

J
Joao Moreno 已提交
2122
				switch (err.gitErrorCode) {
2123
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
2124 2125
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
2126
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
2127
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
2128
						break;
2129 2130 2131 2132 2133
					case GitErrorCodes.Conflict:
						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
						type = 'warning';
						options.modal = false;
						break;
J
Joao Moreno 已提交
2134 2135 2136 2137 2138
					case GitErrorCodes.StashConflict:
						message = localize('stash merge conflicts', "There were merge conflicts while applying the stash.");
						type = 'warning';
						options.modal = false;
						break;
2139 2140
					case GitErrorCodes.NoUserNameConfigured:
					case GitErrorCodes.NoUserEmailConfigured:
J
Joao Moreno 已提交
2141 2142
						message = localize('missing user info', "Make sure you configure your 'user.name' and 'user.email' in git.");
						choices.set(localize('learn more', "Learn More"), () => commands.executeCommand('vscode.open', Uri.parse('https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup')));
2143
						break;
J
Joao Moreno 已提交
2144
					default:
2145 2146 2147
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
2148
							.split(/[\r\n]/)
J
João Moreno 已提交
2149
							.filter((line: string) => !!line)
2150 2151 2152 2153 2154
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
2155 2156 2157 2158 2159 2160 2161 2162 2163

						break;
				}

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

J
Joao Moreno 已提交
2164 2165 2166 2167 2168 2169 2170
				const allChoices = Array.from(choices.keys());
				const result = type === 'error'
					? await window.showErrorMessage(message, options, ...allChoices)
					: await window.showWarningMessage(message, options, ...allChoices);

				if (result) {
					const resultFn = choices.get(result);
J
Joao Moreno 已提交
2171

J
Joao Moreno 已提交
2172 2173 2174
					if (resultFn) {
						resultFn();
					}
J
Joao Moreno 已提交
2175 2176 2177
				}
			});
		};
2178 2179

		// patch this object, so people can call methods directly
2180
		(this as any)[key] = result;
2181 2182

		return result;
J
Joao Moreno 已提交
2183 2184
	}

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

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

J
Joao Moreno 已提交
2190 2191 2192
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
2193

J
Joao Moreno 已提交
2194
		if (!uri) {
2195
			return undefined;
J
Joao Moreno 已提交
2196 2197 2198
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
2199 2200
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
2201 2202 2203 2204
		}

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

J
Joao Moreno 已提交
2207
			if (!repository) {
2208 2209
				return undefined;
			}
J
Joao Moreno 已提交
2210

J
Joao Moreno 已提交
2211 2212
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
2213
		}
2214
		return undefined;
J
Joao Moreno 已提交
2215 2216
	}

J
Joao Moreno 已提交
2217
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
2218 2219 2220 2221 2222 2223
	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) => {
2224
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
2225 2226 2227 2228 2229 2230

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

2231
			// Could it be a submodule?
2232
			if (pathEquals(resource.fsPath, repository.root)) {
2233 2234 2235
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
2236
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252

			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 已提交
2253 2254 2255
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
2256
}