commands.ts 72.7 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
	get label(): string { return localize('create branch', '$(plus) Create new branch...'); }
J
Joao Moreno 已提交
97 98
	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 115 116 117 118 119
class CreateBranchFromItem implements QuickPickItem {

	constructor(private cc: CommandCenter) { }

	get label(): string { return localize('create branch from', '$(plus) Create new branch from...'); }
	get description(): string { return ''; }

	get alwaysShow(): boolean { return true; }

	async run(repository: Repository): Promise<void> {
		await this.cc.branch(repository);
	}
}

J
Joao Moreno 已提交
120 121 122 123 124 125 126 127 128
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 已提交
129
interface CommandOptions {
J
Joao Moreno 已提交
130
	repository?: boolean;
J
Joao Moreno 已提交
131 132 133
	diff?: boolean;
}

134 135 136 137
interface Command {
	commandId: string;
	key: string;
	method: Function;
J
Joao Moreno 已提交
138
	options: CommandOptions;
139 140 141
}

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

J
Joao Moreno 已提交
143
function command(commandId: string, options: CommandOptions = {}): Function {
144
	return (_target: any, key: string, descriptor: any) => {
J
Joao Moreno 已提交
145 146 147 148
		if (!(typeof descriptor.value === 'function')) {
			throw new Error('not supported');
		}

J
Joao Moreno 已提交
149
		Commands.push({ commandId, key, method: descriptor.value, options });
J
Joao Moreno 已提交
150 151
	};
}
J
Joao Moreno 已提交
152

J
Joao Moreno 已提交
153 154 155 156 157 158 159 160 161
const ImageMimetypes = [
	'image/png',
	'image/gif',
	'image/jpeg',
	'image/webp',
	'image/tiff',
	'image/bmp'
];

J
Joao Moreno 已提交
162
async function categorizeResourceByResolution(resources: Resource[]): Promise<{ merge: Resource[], resolved: Resource[], unresolved: Resource[], deletionConflicts: Resource[] }> {
163 164 165
	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 已提交
166
	const isAnyDeleted = (s: Resource) => s.type === Status.DELETED_BY_THEM || s.type === Status.DELETED_BY_US;
167 168 169
	const possibleUnresolved = merge.filter(isBothAddedOrModified);
	const promises = possibleUnresolved.map(s => grep(s.resourceUri.fsPath, /^<{7}|^={7}|^>{7}/));
	const unresolvedBothModified = await Promise.all<boolean>(promises);
170
	const resolved = possibleUnresolved.filter((_s, i) => !unresolvedBothModified[i]);
J
Joao Moreno 已提交
171
	const deletionConflicts = merge.filter(s => isAnyDeleted(s));
172
	const unresolved = [
J
Joao Moreno 已提交
173
		...merge.filter(s => !isBothAddedOrModified(s) && !isAnyDeleted(s)),
174
		...possibleUnresolved.filter((_s, i) => unresolvedBothModified[i])
175 176
	];

J
Joao Moreno 已提交
177
	return { merge, resolved, unresolved, deletionConflicts };
178 179
}

J
Joao Moreno 已提交
180
function createCheckoutItems(repository: Repository): CheckoutItem[] {
181 182 183 184 185 186 187 188 189 190 191 192 193 194 195
	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];
}

196 197 198 199 200 201 202 203 204
enum PushType {
	Push,
	PushTo,
	PushTags,
}

interface PushOptions {
	pushType: PushType;
	forcePush?: boolean;
J
Joao Moreno 已提交
205
	silent?: boolean;
206 207
}

J
Joao Moreno 已提交
208
export class CommandCenter {
J
Joao Moreno 已提交
209 210

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

J
Joao Moreno 已提交
212
	constructor(
J
Joao Moreno 已提交
213
		private git: Git,
J
Joao Moreno 已提交
214
		private model: Model,
J
Joao Moreno 已提交
215 216
		private outputChannel: OutputChannel,
		private telemetryReporter: TelemetryReporter
J
Joao Moreno 已提交
217
	) {
J
Joao Moreno 已提交
218 219
		this.disposables = Commands.map(({ commandId, key, method, options }) => {
			const command = this.createCommand(commandId, key, method, options);
220

J
Joao Moreno 已提交
221
			if (options.diff) {
J
Joao Moreno 已提交
222 223 224 225 226
				return commands.registerDiffInformationCommand(commandId, command);
			} else {
				return commands.registerCommand(commandId, command);
			}
		});
J
Joao Moreno 已提交
227 228
	}

J
Joao Moreno 已提交
229 230
	@command('git.refresh', { repository: true })
	async refresh(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
231
		await repository.status();
J
Joao Moreno 已提交
232
	}
J
Joao Moreno 已提交
233

J
Joao Moreno 已提交
234 235
	@command('git.openResource')
	async openResource(resource: Resource): Promise<void> {
J
Joao Moreno 已提交
236 237 238 239 240 241 242 243 244 245 246 247 248 249
		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 已提交
250 251
	}

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

255 256 257 258
		try {
			stat = await new Promise<Stats>((c, e) => lstat(resource.resourceUri.fsPath, (err, stat) => err ? e(err) : c(stat)));
		} catch (err) {
			// noop
259
		}
260

261 262 263 264
		let left: Uri | undefined;
		let right: Uri | undefined;

		if (stat && stat.isDirectory()) {
265 266 267 268
			const repository = this.model.getRepositoryForSubmodule(resource.resourceUri);

			if (repository) {
				right = toGitUri(resource.resourceUri, resource.resourceGroupType === ResourceGroupType.Index ? 'index' : 'wt', { submoduleOf: repository.root });
269 270
			}
		} else {
J
Joao Moreno 已提交
271 272 273 274
			if (resource.type !== Status.DELETED_BY_THEM) {
				left = await this.getLeftResource(resource);
			}

275 276
			right = await this.getRightResource(resource);
		}
277

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

J
Joao Moreno 已提交
280 281 282 283 284
		if (!right) {
			// TODO
			console.error('oh no');
			return;
		}
J
Joao Moreno 已提交
285

J
Joao Moreno 已提交
286
		const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
287 288
			preserveFocus,
			preview,
289
			viewColumn: ViewColumn.Active
J
Joao Moreno 已提交
290 291
		};

J
Joao Moreno 已提交
292 293
		const activeTextEditor = window.activeTextEditor;

294 295 296
		// 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 已提交
297 298 299
			opts.selection = activeTextEditor.selection;
		}

300
		if (!left) {
J
Joao Moreno 已提交
301
			await commands.executeCommand<void>('vscode.open', right, opts, title);
J
Joao Moreno 已提交
302 303 304 305
		} else {
			await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
		}
	}
J
Joao Moreno 已提交
306

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

J
Joao Moreno 已提交
310 311 312
		if (!repository) {
			return toGitUri(uri, ref);
		}
J
Joao Moreno 已提交
313

J
Joao Moreno 已提交
314
		try {
J
Joao Moreno 已提交
315 316 317
			let gitRef = ref;

			if (gitRef === '~') {
J
Joao Moreno 已提交
318
				const uriString = uri.toString();
J
Joao Moreno 已提交
319
				const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString);
J
Joao Moreno 已提交
320
				gitRef = indexStatus ? '' : 'HEAD';
J
Joao Moreno 已提交
321 322
			}

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

J
Joao Moreno 已提交
326 327 328
			if (mimetype === 'text/plain') {
				return toGitUri(uri, ref);
			}
329

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

J
Joao Moreno 已提交
334
			if (ImageMimetypes.indexOf(mimetype) > -1) {
J
Joao Moreno 已提交
335 336
				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 已提交
337 338
			}

J
Joao Moreno 已提交
339
			return Uri.parse(`data:;label:${path.basename(uri.fsPath)};description:${gitRef},`);
J
Joao Moreno 已提交
340 341 342 343

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

J
Joao Moreno 已提交
346
	private async getLeftResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
347 348 349
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
350
				return this.getURI(resource.original, 'HEAD');
J
Joao Moreno 已提交
351 352

			case Status.MODIFIED:
J
Joao Moreno 已提交
353
				return this.getURI(resource.resourceUri, '~');
354 355

			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
356
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
357
		}
358
		return undefined;
J
Joao Moreno 已提交
359
	}
J
Joao Moreno 已提交
360

J
Joao Moreno 已提交
361
	private async getRightResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
362 363 364 365 366
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_ADDED:
			case Status.INDEX_COPIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
367
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
368 369 370

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

J
Joao Moreno 已提交
373 374 375 376 377 378
			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 已提交
379 380 381
			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
382
			case Status.INTENT_TO_ADD:
J
Joao Moreno 已提交
383 384 385 386 387 388
				const repository = this.model.getRepository(resource.resourceUri);

				if (!repository) {
					return;
				}

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

J
Joao Moreno 已提交
392 393
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
394 395
				}

J
Joao Moreno 已提交
396
				return resource.resourceUri;
J
Joao Moreno 已提交
397

398
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
399
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
400
				return resource.resourceUri;
J
Joao Moreno 已提交
401
		}
402
		return undefined;
J
Joao Moreno 已提交
403 404 405
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
406
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
407 408 409 410 411 412 413

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

			case Status.MODIFIED:
M
Marc Kassay 已提交
414 415
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
416
				return `${basename} (Working Tree)`;
J
Joao Moreno 已提交
417 418 419 420 421 422

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

			case Status.DELETED_BY_THEM:
				return `${basename} (Ours)`;
J
Joao Moreno 已提交
423 424 425 426 427
		}

		return '';
	}

J
Joao Moreno 已提交
428
	@command('git.clone')
429 430 431 432 433 434 435
	async clone(url?: string): Promise<void> {
		if (!url) {
			url = await window.showInputBox({
				prompt: localize('repourl', "Repository URL"),
				ignoreFocusOut: true
			});
		}
J
Joao Moreno 已提交
436 437

		if (!url) {
K
kieferrm 已提交
438
			/* __GDPR__
K
kieferrm 已提交
439 440 441 442
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
443 444
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
445 446
		}

447
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
448 449 450 451 452 453 454 455 456
		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 已提交
457 458
		});

J
Joao Moreno 已提交
459
		if (!uris || uris.length === 0) {
K
kieferrm 已提交
460
			/* __GDPR__
K
kieferrm 已提交
461 462 463 464
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
465 466
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
			return;
J
Joao Moreno 已提交
467 468
		}

J
Joao Moreno 已提交
469 470 471
		const uri = uris[0];
		const parentPath = uri.fsPath;

472
		try {
473 474 475 476 477
			const opts = {
				location: ProgressLocation.Notification,
				title: localize('cloning', "Cloning git repository '{0}'...", url),
				cancellable: true
			};
M
Maryam Archie 已提交
478

479 480
			const repositoryPath = await window.withProgress(
				opts,
J
Joao Moreno 已提交
481
				(_, token) => this.git.clone(url!, parentPath, token)
482
			);
483

484 485
			const choices = [];
			let message = localize('proposeopen', "Would you like to open the cloned repository?");
486
			const open = localize('openrepo', "Open Repository");
487 488 489 490 491 492 493 494 495
			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);
496 497

			const openFolder = result === open;
K
kieferrm 已提交
498
			/* __GDPR__
K
kieferrm 已提交
499 500 501 502 503
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
					"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
				}
			*/
504
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
505 506 507

			const uri = Uri.file(repositoryPath);

508
			if (openFolder) {
509 510 511
				commands.executeCommand('vscode.openFolder', uri);
			} else if (result === addToWorkspace) {
				workspace.updateWorkspaceFolders(workspace.workspaceFolders!.length, 0, { uri });
512
			}
513 514
		} catch (err) {
			if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
K
kieferrm 已提交
515
				/* __GDPR__
K
kieferrm 已提交
516 517 518 519
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
520
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'directory_not_empty' });
J
Joao Moreno 已提交
521 522
			} else if (/Cancelled/i.test(err && (err.message || err.stderr || ''))) {
				return;
523
			} else {
K
kieferrm 已提交
524
				/* __GDPR__
K
kieferrm 已提交
525 526 527 528
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
529
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'error' });
530
			}
J
Joao Moreno 已提交
531

532
			throw err;
J
Joao Moreno 已提交
533 534 535
		}
	}

J
Joao Moreno 已提交
536
	@command('git.init')
J
Joao Moreno 已提交
537
	async init(): Promise<void> {
J
Joao Moreno 已提交
538
		let repositoryPath: string | undefined = undefined;
J
Joao Moreno 已提交
539
		let askToOpen = true;
J
Joao Moreno 已提交
540

J
Joao Moreno 已提交
541
		if (workspace.workspaceFolders) {
J
Joao Moreno 已提交
542
			const placeHolder = localize('init', "Pick workspace folder to initialize git repo in");
J
Joao Moreno 已提交
543 544 545 546 547
			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 已提交
548 549 550 551
			const item = await window.showQuickPick(items, { placeHolder, ignoreFocusOut: true });

			if (!item) {
				return;
J
Joao Moreno 已提交
552 553
			} else if (item.folder) {
				repositoryPath = item.folder.uri.fsPath;
J
Joao Moreno 已提交
554
				askToOpen = false;
J
Joao Moreno 已提交
555 556
			}
		}
J
Joao Moreno 已提交
557

J
Joao Moreno 已提交
558
		if (!repositoryPath) {
J
Joao Moreno 已提交
559 560 561 562 563 564 565 566 567 568 569 570
			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 已提交
571

J
Joao Moreno 已提交
572
			if (!result || result.length === 0) {
J
Joao Moreno 已提交
573 574
				return;
			}
J
Joao Moreno 已提交
575 576 577 578 579 580 581 582 583 584 585 586

			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 已提交
587
			repositoryPath = uri.fsPath;
J
Joao Moreno 已提交
588 589 590 591

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

J
Joao Moreno 已提交
594
		await this.git.init(repositoryPath);
I
Ivan Sučić 已提交
595 596

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

J
Joao Moreno 已提交
601 602 603 604
		if (!askToOpen) {
			return;
		}

J
Joao Moreno 已提交
605 606 607 608 609
		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ć 已提交
610 611

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

J
Joao Moreno 已提交
614 615 616 617 618 619
		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ć 已提交
620
		}
J
Joao Moreno 已提交
621 622
	}

J
Joao Moreno 已提交
623 624
	@command('git.openRepository', { repository: false })
	async openRepository(path?: string): Promise<void> {
625
		if (!path) {
J
Joao Moreno 已提交
626 627 628 629 630 631
			const result = await window.showOpenDialog({
				canSelectFiles: false,
				canSelectFolders: true,
				canSelectMany: false,
				defaultUri: Uri.file(os.homedir()),
				openLabel: localize('open repo', "Open Repository")
632 633
			});

J
Joao Moreno 已提交
634
			if (!result || result.length === 0) {
635 636 637
				return;
			}

J
Joao Moreno 已提交
638
			path = result[0].fsPath;
639
		}
J
Joao Moreno 已提交
640 641

		await this.model.openRepository(path);
642 643
	}

J
Joao Moreno 已提交
644 645 646 647 648
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

653
		let uris: Uri[] | undefined;
654 655 656

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
657
				uris = [Uri.file(fromGitUri(arg).path)];
658
			} else if (arg.scheme === 'file') {
659
				uris = [arg];
660 661 662 663 664 665
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
J
Joao Moreno 已提交
666
				console.log('WHAT');
667
				resource = this.getSCMResource();
668 669 670
			}

			if (resource) {
J
Joao Moreno 已提交
671 672 673 674 675
				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];
676
			}
J
Joao Moreno 已提交
677 678
		}

679
		if (!uris) {
J
Joao Moreno 已提交
680
			return;
J
Joao Moreno 已提交
681 682
		}

683
		const activeTextEditor = window.activeTextEditor;
J
Joao Moreno 已提交
684

685 686
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
687
				preserveFocus,
J
Joao Moreno 已提交
688
				preview: false,
689
				viewColumn: ViewColumn.Active
690 691
			};

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

694 695 696
			// 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 已提交
697
				// preserve not only selection but also visible range
B
Benjamin Pasero 已提交
698
				opts.selection = activeTextEditor.selection;
E
Eric Gang 已提交
699 700 701 702 703
				const previousVisibleRanges = activeTextEditor.visibleRanges;
				const editor = await window.showTextDocument(document, opts);
				editor.revealRange(previousVisibleRanges[0]);
			} else {
				await window.showTextDocument(document, opts);
B
Benjamin Pasero 已提交
704
			}
J
Joao Moreno 已提交
705
		}
J
Joao Moreno 已提交
706 707
	}

J
Joao Moreno 已提交
708 709 710 711 712
	@command('git.openFile2')
	async openFile2(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
		this.openFile(arg, ...resourceStates);
	}

J
Joao Moreno 已提交
713 714
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
715
		let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
716
		const preview = !(arg instanceof Resource);
D
Duroktar 已提交
717 718 719 720

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
721
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
722
		} else {
723
			resource = this.getSCMResource();
D
Duroktar 已提交
724 725 726 727 728 729
		}

		if (!resource) {
			return;
		}

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

J
Joao Moreno 已提交
732 733 734
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
735
		}
J
Joao Moreno 已提交
736

J
Joao Moreno 已提交
737 738 739 740 741
		const opts: TextDocumentShowOptions = {
			preview
		};

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

J
Joao Moreno 已提交
744 745
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
746
		const preserveFocus = arg instanceof Resource;
J
Joao Moreno 已提交
747 748
		const preview = !(arg instanceof Resource);

J
Joao 已提交
749
		const preserveSelection = arg instanceof Uri || !arg;
750
		let resources: Resource[] | undefined = undefined;
751

752
		if (arg instanceof Uri) {
753
			const resource = this.getSCMResource(arg);
754 755 756
			if (resource !== undefined) {
				resources = [resource];
			}
757
		} else {
758
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
759

760 761 762
			if (arg instanceof Resource) {
				resource = arg;
			} else {
763
				resource = this.getSCMResource();
764 765 766 767 768
			}

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

771
		if (!resources) {
J
Joao Moreno 已提交
772
			return;
J
Joao Moreno 已提交
773
		}
J
Joao Moreno 已提交
774

775
		for (const resource of resources) {
J
Joao 已提交
776
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
777
		}
J
Joao Moreno 已提交
778 779
	}

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

784 785
		resourceStates = resourceStates.filter(s => !!s);

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

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

791 792 793 794 795 796 797
			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

798
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
799
		const { resolved, unresolved, deletionConflicts } = await categorizeResourceByResolution(selection);
800 801 802 803 804

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

806 807 808 809 810 811 812 813
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
814 815 816 817 818 819 820 821 822 823 824 825 826 827
		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 已提交
828
		const workingTree = selection.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
829
		const scmResources = [...workingTree, ...resolved, ...unresolved];
830

J
Joao Moreno 已提交
831
		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
832
		if (!scmResources.length) {
J
Joao Moreno 已提交
833 834
			return;
		}
J
Joao Moreno 已提交
835

836
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
837
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
838 839
	}

J
Joao Moreno 已提交
840 841
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
842
		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
843 844 845 846 847 848 849 850 851 852 853 854 855
		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;
		}
856 857 858

		if (unresolved.length > 0) {
			const message = unresolved.length > 1
J
Joao Moreno 已提交
859 860
				? 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));
861 862 863 864 865 866 867 868 869

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

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

J
Joao Moreno 已提交
870
		await repository.add([]);
J
Joao Moreno 已提交
871 872
	}

J
Joao Moreno 已提交
873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907
	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 已提交
908
	@command('git.stageChange')
J
Joao Moreno 已提交
909 910 911 912 913 914 915 916
	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 已提交
917 918
	}

J
Joao Moreno 已提交
919
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
920
	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
921 922 923 924 925 926 927
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
928 929 930 931
		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 已提交
932

J
Joao Moreno 已提交
933
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
934 935 936
			return;
		}

J
Joao Moreno 已提交
937 938
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
939

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

J
Joao Moreno 已提交
944
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
945 946 947
			return;
		}

J
Joao Moreno 已提交
948
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
949
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
950
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
951

J
Joao Moreno 已提交
952
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
953
	}
J
Joao Moreno 已提交
954

J
Joao Moreno 已提交
955
	@command('git.revertChange')
J
Joao Moreno 已提交
956 957 958 959
	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 已提交
960 961 962
			return;
		}

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

J
Joao Moreno 已提交
966
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
967
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
968 969 970 971 972 973 974
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
975 976
		const selections = textEditor.selections;
		const selectedChanges = changes.filter(change => {
J
Joao Moreno 已提交
977
			const modifiedRange = getModifiedRange(modifiedDocument, change);
J
Joao Moreno 已提交
978 979 980 981
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
982 983 984
			return;
		}

J
Joao Moreno 已提交
985 986
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
987

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

J
Joao Moreno 已提交
992
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
993 994 995
			return;
		}

J
Joao Moreno 已提交
996 997
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
998 999
		const selectionsBeforeRevert = textEditor.selections;
		const visibleRangesBeforeRevert = textEditor.visibleRanges;
J
Joao Moreno 已提交
1000
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
1001

J
Joao Moreno 已提交
1002 1003 1004
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
1005

J
Joao Moreno 已提交
1006 1007
		await modifiedDocument.save();

1008 1009
		textEditor.selections = selectionsBeforeRevert;
		textEditor.revealRange(visibleRangesBeforeRevert[0]);
J
Joao Moreno 已提交
1010 1011
	}

J
Joao Moreno 已提交
1012 1013
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
1014 1015
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1016
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1017
			const resource = this.getSCMResource();
1018 1019 1020 1021 1022 1023 1024 1025

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

1029
		if (!scmResources.length) {
J
Joao Moreno 已提交
1030 1031 1032
			return;
		}

1033
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1034
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
1035 1036
	}

J
Joao Moreno 已提交
1037 1038
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
1039
		await repository.revert([]);
J
Joao Moreno 已提交
1040
	}
J
Joao Moreno 已提交
1041

J
Joao Moreno 已提交
1042 1043
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
1044 1045 1046 1047 1048 1049 1050 1051 1052
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

1053 1054 1055 1056 1057 1058 1059
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
1060 1061 1062
			return;
		}

J
Joao Moreno 已提交
1063
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
1064
		const originalDocument = await workspace.openTextDocument(originalUri);
1065 1066 1067 1068
		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 已提交
1069 1070 1071 1072 1073

		if (!selectedDiffs.length) {
			return;
		}

1074 1075
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
1076

J
Joao Moreno 已提交
1077
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
1078 1079
	}

J
Joao Moreno 已提交
1080 1081
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
1082 1083
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1084
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1085
			const resource = this.getSCMResource();
1086 1087 1088 1089 1090 1091 1092 1093

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
1097
		if (!scmResources.length) {
J
Joao Moreno 已提交
1098 1099
			return;
		}
J
Joao Moreno 已提交
1100

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

J
Joao Moreno 已提交
1105
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
1106
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
1107
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
1108 1109
				yes = localize('delete file', "Delete file");
			} else {
1110 1111 1112 1113 1114 1115
				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 已提交
1116 1117
			}
		} else {
1118 1119 1120 1121 1122 1123
			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 已提交
1124 1125 1126 1127 1128

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

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

J
Joao Moreno 已提交
1132 1133 1134 1135
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
1136
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1137
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
1138
	}
J
Joao Moreno 已提交
1139

J
Joao Moreno 已提交
1140 1141
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1142
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
1143 1144 1145 1146 1147

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

J
Joao Moreno 已提交
1148 1149
		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 已提交
1150

J
Joao Moreno 已提交
1151 1152 1153 1154 1155 1156
		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 已提交
1157
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1158
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
1159

J
Joao Moreno 已提交
1160
			if (pick !== yes) {
J
Joao Moreno 已提交
1161 1162 1163
				return;
			}

J
Joao 已提交
1164
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1165 1166 1167 1168 1169 1170 1171 1172
			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 已提交
1173 1174
			}

J
Joao 已提交
1175
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1176 1177 1178 1179
		} 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 已提交
1180

J
Joao Moreno 已提交
1181 1182 1183
			if (pick !== yes) {
				return;
			}
J
Joao Moreno 已提交
1184

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

J
Joao Moreno 已提交
1187 1188 1189 1190
		} 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 已提交
1191

J
Joao Moreno 已提交
1192 1193 1194 1195 1196
			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 已提交
1197

J
Joao Moreno 已提交
1198
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1199 1200 1201 1202 1203 1204 1205 1206
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
1207
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1208
		}
J
Joao Moreno 已提交
1209 1210
	}

J
Joao Moreno 已提交
1211
	private async smartCommit(
J
Joao Moreno 已提交
1212
		repository: Repository,
1213
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
1214 1215
		opts?: CommitOptions
	): Promise<boolean> {
1216
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
J
Joao Moreno 已提交
1217 1218 1219 1220 1221 1222 1223 1224
		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 已提交
1225 1226
					? 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 已提交
1227 1228 1229 1230 1231 1232 1233 1234 1235 1236
				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
				}
1237 1238 1239
			}
		}

1240
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
1241
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
1242 1243
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
1244 1245

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

J
Joao Moreno 已提交
1248 1249
			// 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?");
1250 1251 1252 1253 1254
			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 已提交
1255 1256 1257
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
1258 1259 1260
			}
		}

J
Joao Moreno 已提交
1261
		if (!opts) {
1262
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
1263 1264
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
1265 1266
		}

1267 1268 1269
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

1270 1271 1272 1273
		if (config.get<boolean>('alwaysSignOff')) {
			opts.signoff = true;
		}

J
Joao Moreno 已提交
1274
		if (
1275
			(
J
Joao Moreno 已提交
1276 1277 1278 1279 1280
				// no changes
				(noStagedChanges && noUnstagedChanges)
				// or no staged changes and not `all`
				|| (!opts.all && noStagedChanges)
			)
1281
			&& !opts.empty
J
Joao Moreno 已提交
1282
		) {
J
Joao Moreno 已提交
1283 1284 1285 1286
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1287
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1288 1289 1290 1291 1292

		if (!message) {
			return false;
		}

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

J
Joao Moreno 已提交
1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305
		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 已提交
1306 1307 1308
		return true;
	}

J
Joao Moreno 已提交
1309
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1310
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1311
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
1312 1313 1314 1315
			if (message) {
				return message;
			}

1316 1317 1318 1319 1320 1321
			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 已提交
1322
			return await window.showInputBox({
1323
				value,
J
Joao Moreno 已提交
1324
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
1325 1326
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
1327
			});
J
Joao Moreno 已提交
1328 1329
		};

J
Joao Moreno 已提交
1330
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1331 1332

		if (message && didCommit) {
J
Joao Moreno 已提交
1333
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1334
		}
J
Joao Moreno 已提交
1335 1336
	}

J
Joao Moreno 已提交
1337
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
1338 1339
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
1340 1341
	}

J
Joao Moreno 已提交
1342
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
1343
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1344
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
1345 1346 1347
			return;
		}

J
Joao Moreno 已提交
1348
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1349 1350

		if (didCommit) {
J
Joao Moreno 已提交
1351
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1352
		}
J
Joao Moreno 已提交
1353 1354
	}

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

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

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

J
Joao Moreno 已提交
1370
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
1371 1372
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
1373 1374
	}

J
Joao Moreno 已提交
1375
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1376 1377
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1378 1379
	}

J
Joao Moreno 已提交
1380
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
1381 1382
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
1383 1384
	}

J
Joao Moreno 已提交
1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406
	@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 已提交
1407 1408 1409 1410 1411
	@command('git.restoreCommitTemplate', { repository: true })
	async restoreCommitTemplate(repository: Repository): Promise<void> {
		repository.inputBox.value = await repository.getCommitTemplate();
	}

J
Joao Moreno 已提交
1412
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
1413 1414
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1415 1416

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

J
Joao Moreno 已提交
1421
		const commit = await repository.getCommit('HEAD');
J
Joao Moreno 已提交
1422 1423

		if (commit.parents.length > 0) {
1424 1425 1426 1427 1428
			await repository.reset('HEAD~');
		} else {
			await repository.deleteRef('HEAD');
			await this.unstageAll(repository);
		}
J
Joao Moreno 已提交
1429

J
Joao Moreno 已提交
1430
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1431 1432
	}

J
Joao Moreno 已提交
1433
	@command('git.checkout', { repository: true })
1434
	async checkout(repository: Repository, treeish: string): Promise<boolean> {
J
Joao Moreno 已提交
1435
		if (typeof treeish === 'string') {
1436 1437
			await repository.checkout(treeish);
			return true;
J
Joao Moreno 已提交
1438
		}
J
Joao Moreno 已提交
1439

J
Joao Moreno 已提交
1440 1441 1442
		const createBranch = new CreateBranchItem(this);
		const createBranchFrom = new CreateBranchFromItem(this);
		const picks = [createBranch, createBranchFrom, ...createCheckoutItems(repository)];
1443
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
1444 1445 1446 1447 1448 1449 1450 1451

		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 已提交
1452 1453

		if (!choice) {
1454
			return false;
J
Joao Moreno 已提交
1455 1456
		}

1457 1458
		if (choice === createBranch) {
			await this._branch(repository, quickpick.value);
J
Joao Moreno 已提交
1459 1460
		} else if (choice === createBranchFrom) {
			await this._branch(repository, quickpick.value, true);
1461 1462 1463 1464
		} else {
			await (choice as CheckoutItem).run(repository);
		}

1465
		return true;
J
Joao Moreno 已提交
1466 1467
	}

J
Joao Moreno 已提交
1468
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1469
	async branch(repository: Repository): Promise<void> {
1470 1471
		await this._branch(repository);
	}
J
Joao Moreno 已提交
1472

J
Joao Moreno 已提交
1473 1474 1475 1476 1477 1478
	@command('git.branchFrom', { repository: true })
	async branchFrom(repository: Repository): Promise<void> {
		await this._branch(repository, undefined, true);
	}

	private async _branch(repository: Repository, defaultName?: string, from = false): Promise<void> {
1479 1480 1481 1482 1483 1484 1485
		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 已提交
1486
		const rawBranchName = defaultName || await window.showInputBox({
1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502
			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) {
1503 1504
			return;
		}
J
Joao Moreno 已提交
1505

J
Joao Moreno 已提交
1506
		let target = 'HEAD';
J
Joao Moreno 已提交
1507

J
Joao Moreno 已提交
1508 1509 1510 1511 1512 1513 1514 1515 1516 1517
		if (from) {
			const picks = [new HEADItem(repository), ...createCheckoutItems(repository)];
			const placeHolder = localize('select a ref to create a new branch from', 'Select a ref to create the \'{0}\' branch from', branchName);
			const choice = await window.showQuickPick(picks, { placeHolder });

			if (!choice) {
				return;
			}

			target = choice.label;
J
Joao Moreno 已提交
1518
		}
J
Joao Moreno 已提交
1519

J
Joao Moreno 已提交
1520
		await repository.branch(branchName, true, target);
J
Joao Moreno 已提交
1521 1522
	}

J
Joao Moreno 已提交
1523
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1524
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1525 1526
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1527
			run = force => repository.deleteBranch(name, force);
1528
		} else {
J
Joao Moreno 已提交
1529 1530
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1531
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1532

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

M
Maik Riechert 已提交
1536
			if (!choice || !choice.branchName) {
1537 1538
				return;
			}
M
Maik Riechert 已提交
1539
			name = choice.branchName;
J
Joao Moreno 已提交
1540
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1541 1542
		}

1543 1544 1545 1546 1547 1548 1549 1550 1551
		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");
1552
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1553 1554 1555 1556 1557

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

1560 1561
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
J
Justin Horner 已提交
1562 1563 1564 1565 1566 1567 1568 1569
		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 {
1570
			await repository.renameBranch(name);
J
Justin Horner 已提交
1571 1572 1573
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1574 1575
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1576
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1577
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", name));
1578 1579 1580
					return;
				default:
					throw err;
J
Justin Horner 已提交
1581 1582 1583 1584
			}
		}
	}

J
Joao Moreno 已提交
1585
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1586
	async merge(repository: Repository): Promise<void> {
1587 1588 1589 1590
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1591
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1592 1593
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1594

J
Joao Moreno 已提交
1595
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1596 1597
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1598 1599

		const picks = [...heads, ...remoteHeads];
1600 1601
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1602 1603 1604 1605 1606

		if (!choice) {
			return;
		}

1607
		await choice.run(repository);
1608 1609
	}

J
Joao Moreno 已提交
1610
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1611
	async createTag(repository: Repository): Promise<void> {
1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623
		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 已提交
1624
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1625 1626 1627 1628 1629
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
1633 1634 1635 1636 1637 1638 1639
	@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 已提交
1640
		await repository.fetchDefault();
J
Joao Moreno 已提交
1641 1642
	}

R
Ryan Scott 已提交
1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653
	@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 已提交
1654 1655 1656 1657 1658 1659 1660 1661 1662 1663
	@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 已提交
1664
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1665 1666
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1667 1668 1669 1670 1671 1672

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

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

D
Dozed12 已提交
1677
		if (!remotePick) {
1678 1679 1680
			return;
		}

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

D
Dozed12 已提交
1687
		if (!branchPick) {
1688 1689 1690
			return;
		}

F
Francisco Moreira 已提交
1691 1692
		const remoteCharCnt = remotePick.label.length;

1693
		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1694 1695
	}

J
Joao Moreno 已提交
1696
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1697 1698
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1699 1700 1701 1702 1703 1704

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

J
Joao Moreno 已提交
1705
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1706 1707
	}

J
Joao Moreno 已提交
1708
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1709 1710
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1711 1712 1713 1714 1715 1716

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

J
Joao Moreno 已提交
1717
		await repository.pullWithRebase(repository.HEAD);
J
Joao Moreno 已提交
1718 1719
	}

J
Joao Moreno 已提交
1720
	private async _push(repository: Repository, pushOptions: PushOptions) {
J
Joao Moreno 已提交
1721
		const remotes = repository.remotes;
1722

J
Joao Moreno 已提交
1723
		if (remotes.length === 0) {
J
Joao Moreno 已提交
1724 1725 1726
			if (!pushOptions.silent) {
				window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
			}
J
Joao Moreno 已提交
1727 1728
			return;
		}
1729

J
Joao Moreno 已提交
1730 1731 1732 1733 1734 1735
		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."));
1736 1737
				return;
			}
J
Joao Moreno 已提交
1738

J
Joao Moreno 已提交
1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752
			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 已提交
1753 1754
		}

1755 1756 1757 1758 1759 1760 1761
		if (pushOptions.pushType === PushType.PushTags) {
			await repository.pushTags(undefined, forcePushMode);

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

1762
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1763 1764 1765
			if (!pushOptions.silent) {
				window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			}
1766 1767 1768
			return;
		}

1769 1770 1771 1772 1773 1774 1775
		if (pushOptions.pushType === PushType.Push) {
			try {
				await repository.push(repository.HEAD, forcePushMode);
			} catch (err) {
				if (err.gitErrorCode !== GitErrorCodes.NoUpstreamBranch) {
					throw err;
				}
1776

J
Joao Moreno 已提交
1777 1778 1779 1780
				if (pushOptions.silent) {
					return;
				}

1781 1782 1783 1784 1785 1786 1787 1788 1789 1790
				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 {
1791
			const branchName = repository.HEAD.name;
1792 1793 1794
			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 });
1795

1796 1797
			if (!pick) {
				return;
1798
			}
1799 1800

			await repository.pushTo(pick.label, branchName, undefined, forcePushMode);
1801
		}
J
Joao Moreno 已提交
1802 1803
	}

1804 1805
	@command('git.push', { repository: true })
	async push(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1806
		await this._push(repository, { pushType: PushType.Push });
1807
	}
1808

1809 1810
	@command('git.pushForce', { repository: true })
	async pushForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1811
		await this._push(repository, { pushType: PushType.Push, forcePush: true });
1812
	}
1813

1814 1815
	@command('git.pushWithTags', { repository: true })
	async pushWithTags(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1816
		await this._push(repository, { pushType: PushType.PushTags });
1817
	}
1818

1819 1820
	@command('git.pushWithTagsForce', { repository: true })
	async pushWithTagsForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1821
		await this._push(repository, { pushType: PushType.PushTags, forcePush: true });
1822 1823
	}

J
Joao Moreno 已提交
1824
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1825
	async pushTo(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1826
		await this._push(repository, { pushType: PushType.PushTo });
1827
	}
J
Joao Moreno 已提交
1828

1829 1830
	@command('git.pushToForce', { repository: true })
	async pushToForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1831
		await this._push(repository, { pushType: PushType.PushTo, forcePush: true });
J
Joao Moreno 已提交
1832 1833
	}

O
Omkar Manjrekar 已提交
1834 1835
	@command('git.addRemote', { repository: true })
	async addRemote(repository: Repository): Promise<void> {
1836 1837
		const remotes = repository.remotes;

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

O
Omkar Manjrekar 已提交
1843
		const resultName = await window.showInputBox({
O
Omkar Manjrekar 已提交
1844 1845 1846 1847
			placeHolder: localize('remote name', "Remote name"),
			prompt: localize('provide remote name', "Please provide a remote name"),
			ignoreFocusOut: true,
			validateInput: (name: string) => {
O
Omkar Manjrekar 已提交
1848
				if (sanitize(name)) {
O
Omkar Manjrekar 已提交
1849 1850
					return null;
				}
O
Omkar Manjrekar 已提交
1851
				return localize('remote name format invalid', "Remote name format invalid");
O
Omkar Manjrekar 已提交
1852
			}
O
Omkar Manjrekar 已提交
1853
		});
O
Omkar Manjrekar 已提交
1854

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

O
Omkar Manjrekar 已提交
1857 1858 1859 1860 1861
		if (!name) {
			return;
		}

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

J
Joao Moreno 已提交
1866
		const url = await window.showInputBox({
O
Omkar Manjrekar 已提交
1867
			placeHolder: localize('remote url', "Remote URL"),
O
Omkar Manjrekar 已提交
1868
			prompt: localize('provide remote URL', "Enter URL for remote \"{0}\"", name),
1869
			ignoreFocusOut: true
O
Omkar Manjrekar 已提交
1870 1871 1872 1873 1874 1875 1876
		});

		if (!url) {
			return;
		}

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

O
Omkar Manjrekar 已提交
1879 1880
	@command('git.removeRemote', { repository: true })
	async removeRemote(repository: Repository): Promise<void> {
O
Omkar Manjrekar 已提交
1881 1882 1883
		const remotes = repository.remotes;

		if (remotes.length === 0) {
1884
			window.showErrorMessage(localize('no remotes added', "Your repository has no remotes."));
O
Omkar Manjrekar 已提交
1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895
			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 已提交
1896

O
Omkar Manjrekar 已提交
1897
		await repository.removeRemote(remoteName);
O
Omkar Manjrekar 已提交
1898
	}
O
Omkar Manjrekar 已提交
1899

J
Joao Moreno 已提交
1900
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1901
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1902 1903 1904 1905 1906

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

J
Joao Moreno 已提交
1907 1908 1909 1910
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
1911
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1912
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
1913 1914

		if (shouldPrompt) {
J
Joao Moreno 已提交
1915
			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 已提交
1916
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
1917
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
1918 1919 1920 1921 1922 1923 1924 1925 1926
			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 已提交
1927
		if (rebase) {
J
Joao Moreno 已提交
1928
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
1929
		} else {
J
Joao Moreno 已提交
1930
			await repository.sync(HEAD);
J
Joao Moreno 已提交
1931 1932 1933 1934 1935 1936
		}
	}

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

J
Joao 已提交
1939 1940 1941 1942 1943 1944 1945 1946 1947
	@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 已提交
1948
			await repository.sync(HEAD);
J
Joao 已提交
1949 1950 1951
		}));
	}

1952
	@command('git.syncRebase', { repository: true })
J
Joao Moreno 已提交
1953 1954
	syncRebase(repository: Repository): Promise<void> {
		return this._sync(repository, true);
J
Joao Moreno 已提交
1955 1956
	}

J
Joao Moreno 已提交
1957
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1958 1959
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1960 1961 1962 1963 1964 1965

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

J
Joao Moreno 已提交
1966
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1967 1968 1969 1970 1971 1972
		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 已提交
1973 1974 1975 1976 1977

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1978
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1979 1980
	}

1981 1982
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
1983 1984
		resourceStates = resourceStates.filter(s => !!s);

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

1988
			if (!resource) {
J
Joao Moreno 已提交
1989 1990 1991
				return;
			}

1992
			resourceStates = [resource];
J
Joao Moreno 已提交
1993 1994
		}

1995
		const resources = resourceStates
J
Joao Moreno 已提交
1996 1997 1998
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1999
		if (!resources.length) {
N
NKumar2 已提交
2000 2001 2002
			return;
		}

2003
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
2004 2005
	}

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

2010
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
2011 2012 2013
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
2014

2015
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
2016 2017 2018 2019 2020

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

J
Joao Moreno 已提交
2021
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
2022 2023
	}

2024 2025 2026 2027 2028 2029 2030
	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 已提交
2031 2032 2033 2034 2035 2036 2037 2038 2039 2040
	@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 已提交
2041
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
2042
	async stashPop(repository: Repository): Promise<void> {
2043
		const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
J
Joao Moreno 已提交
2044
		const stash = await this.pickStash(repository, placeHolder);
2045

J
Joao Moreno 已提交
2046
		if (!stash) {
2047 2048 2049
			return;
		}

J
Joao Moreno 已提交
2050
		await repository.popStash(stash.index);
2051 2052 2053 2054
	}

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

J
Joao Moreno 已提交
2057 2058
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
2059 2060 2061
			return;
		}

2062 2063 2064 2065 2066 2067
		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 已提交
2068
		const stash = await this.pickStash(repository, placeHolder);
K
Krzysztof Cieślak 已提交
2069

J
Joao Moreno 已提交
2070
		if (!stash) {
K
Krzysztof Cieślak 已提交
2071 2072
			return;
		}
J
Joao Moreno 已提交
2073

J
Joao Moreno 已提交
2074
		await repository.applyStash(stash.index);
K
Krzysztof Cieślak 已提交
2075 2076
	}

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

J
Joao Moreno 已提交
2081 2082
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
2083 2084 2085 2086 2087 2088
			return;
		}

		await repository.applyStash();
	}

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

J
Joao Moreno 已提交
2092 2093
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
2094 2095 2096
			return;
		}

J
Joao Moreno 已提交
2097 2098 2099
		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 已提交
2100
	}
K
Krzysztof Cieślak 已提交
2101

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

J
Joao Moreno 已提交
2106
			if (!options.repository) {
J
Joao Moreno 已提交
2107 2108
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
2109 2110
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
2111 2112 2113 2114 2115 2116 2117 2118 2119
				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();
				}
2120

J
Joao Moreno 已提交
2121
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
2122
					if (!repository) {
J
Joao 已提交
2123
						return Promise.resolve();
J
Joao Moreno 已提交
2124 2125
					}

J
Joao Moreno 已提交
2126
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
2127
				});
J
Joao Moreno 已提交
2128 2129
			}

K
kieferrm 已提交
2130
			/* __GDPR__
K
kieferrm 已提交
2131 2132 2133 2134
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
2135 2136
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
2137
			return result.catch(async err => {
J
Joao Moreno 已提交
2138
				const options: MessageOptions = {
2139
					modal: true
J
Joao Moreno 已提交
2140 2141
				};

J
Joao Moreno 已提交
2142
				let message: string;
2143
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
2144

J
Joao Moreno 已提交
2145 2146 2147 2148 2149
				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 已提交
2150
				switch (err.gitErrorCode) {
2151
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
2152 2153
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
2154
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
2155
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
2156
						break;
2157 2158 2159 2160 2161
					case GitErrorCodes.Conflict:
						message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
						type = 'warning';
						options.modal = false;
						break;
J
Joao Moreno 已提交
2162 2163 2164 2165 2166
					case GitErrorCodes.StashConflict:
						message = localize('stash merge conflicts', "There were merge conflicts while applying the stash.");
						type = 'warning';
						options.modal = false;
						break;
2167 2168
					case GitErrorCodes.NoUserNameConfigured:
					case GitErrorCodes.NoUserEmailConfigured:
J
Joao Moreno 已提交
2169 2170
						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')));
2171
						break;
J
Joao Moreno 已提交
2172
					default:
2173 2174 2175
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
2176
							.split(/[\r\n]/)
J
João Moreno 已提交
2177
							.filter((line: string) => !!line)
2178 2179 2180 2181 2182
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
2183 2184 2185 2186 2187 2188 2189 2190 2191

						break;
				}

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

J
Joao Moreno 已提交
2192 2193 2194 2195 2196 2197 2198
				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 已提交
2199

J
Joao Moreno 已提交
2200 2201 2202
					if (resultFn) {
						resultFn();
					}
J
Joao Moreno 已提交
2203 2204 2205
				}
			});
		};
2206 2207

		// patch this object, so people can call methods directly
2208
		(this as any)[key] = result;
2209 2210

		return result;
J
Joao Moreno 已提交
2211 2212
	}

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

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

J
Joao Moreno 已提交
2218 2219 2220
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
2221

J
Joao Moreno 已提交
2222
		if (!uri) {
2223
			return undefined;
J
Joao Moreno 已提交
2224 2225 2226
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
2227 2228
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
2229 2230 2231 2232
		}

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

J
Joao Moreno 已提交
2235
			if (!repository) {
2236 2237
				return undefined;
			}
J
Joao Moreno 已提交
2238

J
Joao Moreno 已提交
2239 2240
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
2241
		}
2242
		return undefined;
J
Joao Moreno 已提交
2243 2244
	}

J
Joao Moreno 已提交
2245
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
2246 2247 2248 2249 2250 2251
	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) => {
2252
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
2253 2254 2255 2256 2257 2258

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

2259
			// Could it be a submodule?
2260
			if (pathEquals(resource.fsPath, repository.root)) {
2261 2262 2263
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
2264
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280

			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 已提交
2281 2282 2283
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
2284
}