commands.ts 73.0 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> {
55 56
		const ref = this.ref.name;
		if (!ref) {
J
Joao Moreno 已提交
57 58 59
			return;
		}

60 61 62 63 64 65
		// Check whether there's a local branch which already has the target branch as an upstream
		const trackings = await repository.getTracking(ref);
		if (trackings.length > 0) {
			//Just checkout the local branch
			await repository.checkout(trackings[0].local);
		} else {
L
laphets 已提交
66
			// Default: checkout a new local branch tracking the upstream
67 68
			await repository.checkoutTracking(ref);
		}
J
Joao Moreno 已提交
69 70 71
	}
}

M
Maik Riechert 已提交
72 73
class BranchDeleteItem implements QuickPickItem {

74 75 76
	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 已提交
77 78
	get description(): string { return this.shortCommit; }

79
	constructor(private ref: Ref) { }
M
Maik Riechert 已提交
80

J
Joao Moreno 已提交
81
	async run(repository: Repository, force?: boolean): Promise<void> {
82
		if (!this.branchName) {
M
Maik Riechert 已提交
83 84
			return;
		}
J
Joao Moreno 已提交
85
		await repository.deleteBranch(this.branchName, force);
M
Maik Riechert 已提交
86 87 88
	}
}

89 90 91 92 93 94
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 已提交
95

J
Joao Moreno 已提交
96 97
	async run(repository: Repository): Promise<void> {
		await repository.merge(this.ref.name! || this.ref.commit!);
J
Joao Moreno 已提交
98
	}
99 100
}

J
Joao Moreno 已提交
101 102
class CreateBranchItem implements QuickPickItem {

J
Joao Moreno 已提交
103 104
	constructor(private cc: CommandCenter) { }

J
...  
Joao Moreno 已提交
105
	get label(): string { return localize('create branch', '$(plus) Create new branch...'); }
J
Joao Moreno 已提交
106 107
	get description(): string { return ''; }

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

J
Joao Moreno 已提交
110
	async run(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
111
		await this.cc.branch(repository);
J
Joao Moreno 已提交
112 113 114
	}
}

J
Joao Moreno 已提交
115 116 117 118 119 120 121 122 123 124 125 126 127 128
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 已提交
129 130 131 132 133 134 135 136 137
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 已提交
138
interface CommandOptions {
J
Joao Moreno 已提交
139
	repository?: boolean;
J
Joao Moreno 已提交
140 141 142
	diff?: boolean;
}

143 144 145 146
interface Command {
	commandId: string;
	key: string;
	method: Function;
J
Joao Moreno 已提交
147
	options: CommandOptions;
148 149 150
}

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

J
Joao Moreno 已提交
152
function command(commandId: string, options: CommandOptions = {}): Function {
153
	return (_target: any, key: string, descriptor: any) => {
J
Joao Moreno 已提交
154 155 156 157
		if (!(typeof descriptor.value === 'function')) {
			throw new Error('not supported');
		}

J
Joao Moreno 已提交
158
		Commands.push({ commandId, key, method: descriptor.value, options });
J
Joao Moreno 已提交
159 160
	};
}
J
Joao Moreno 已提交
161

J
Joao Moreno 已提交
162 163 164 165 166 167 168 169 170
const ImageMimetypes = [
	'image/png',
	'image/gif',
	'image/jpeg',
	'image/webp',
	'image/tiff',
	'image/bmp'
];

J
Joao Moreno 已提交
171
async function categorizeResourceByResolution(resources: Resource[]): Promise<{ merge: Resource[], resolved: Resource[], unresolved: Resource[], deletionConflicts: Resource[] }> {
172 173 174
	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 已提交
175
	const isAnyDeleted = (s: Resource) => s.type === Status.DELETED_BY_THEM || s.type === Status.DELETED_BY_US;
176 177 178
	const possibleUnresolved = merge.filter(isBothAddedOrModified);
	const promises = possibleUnresolved.map(s => grep(s.resourceUri.fsPath, /^<{7}|^={7}|^>{7}/));
	const unresolvedBothModified = await Promise.all<boolean>(promises);
179
	const resolved = possibleUnresolved.filter((_s, i) => !unresolvedBothModified[i]);
J
Joao Moreno 已提交
180
	const deletionConflicts = merge.filter(s => isAnyDeleted(s));
181
	const unresolved = [
J
Joao Moreno 已提交
182
		...merge.filter(s => !isBothAddedOrModified(s) && !isAnyDeleted(s)),
183
		...possibleUnresolved.filter((_s, i) => unresolvedBothModified[i])
184 185
	];

J
Joao Moreno 已提交
186
	return { merge, resolved, unresolved, deletionConflicts };
187 188
}

J
Joao Moreno 已提交
189
function createCheckoutItems(repository: Repository): CheckoutItem[] {
190 191 192 193 194 195 196 197 198 199 200 201 202 203 204
	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];
}

205 206 207 208 209 210 211 212 213
enum PushType {
	Push,
	PushTo,
	PushTags,
}

interface PushOptions {
	pushType: PushType;
	forcePush?: boolean;
J
Joao Moreno 已提交
214
	silent?: boolean;
215 216
}

J
Joao Moreno 已提交
217
export class CommandCenter {
J
Joao Moreno 已提交
218 219

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

J
Joao Moreno 已提交
221
	constructor(
J
Joao Moreno 已提交
222
		private git: Git,
J
Joao Moreno 已提交
223
		private model: Model,
J
Joao Moreno 已提交
224 225
		private outputChannel: OutputChannel,
		private telemetryReporter: TelemetryReporter
J
Joao Moreno 已提交
226
	) {
J
Joao Moreno 已提交
227 228
		this.disposables = Commands.map(({ commandId, key, method, options }) => {
			const command = this.createCommand(commandId, key, method, options);
229

J
Joao Moreno 已提交
230
			if (options.diff) {
J
Joao Moreno 已提交
231 232 233 234 235
				return commands.registerDiffInformationCommand(commandId, command);
			} else {
				return commands.registerCommand(commandId, command);
			}
		});
J
Joao Moreno 已提交
236 237
	}

J
Joao Moreno 已提交
238 239
	@command('git.refresh', { repository: true })
	async refresh(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
240
		await repository.status();
J
Joao Moreno 已提交
241
	}
J
Joao Moreno 已提交
242

J
Joao Moreno 已提交
243 244
	@command('git.openResource')
	async openResource(resource: Resource): Promise<void> {
J
Joao Moreno 已提交
245 246 247 248 249 250 251 252 253 254 255 256 257 258
		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 已提交
259 260
	}

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

264 265 266 267
		try {
			stat = await new Promise<Stats>((c, e) => lstat(resource.resourceUri.fsPath, (err, stat) => err ? e(err) : c(stat)));
		} catch (err) {
			// noop
268
		}
269

270 271 272 273
		let left: Uri | undefined;
		let right: Uri | undefined;

		if (stat && stat.isDirectory()) {
274 275 276 277
			const repository = this.model.getRepositoryForSubmodule(resource.resourceUri);

			if (repository) {
				right = toGitUri(resource.resourceUri, resource.resourceGroupType === ResourceGroupType.Index ? 'index' : 'wt', { submoduleOf: repository.root });
278 279
			}
		} else {
J
Joao Moreno 已提交
280 281 282 283
			if (resource.type !== Status.DELETED_BY_THEM) {
				left = await this.getLeftResource(resource);
			}

284 285
			right = await this.getRightResource(resource);
		}
286

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

J
Joao Moreno 已提交
289 290 291 292 293
		if (!right) {
			// TODO
			console.error('oh no');
			return;
		}
J
Joao Moreno 已提交
294

J
Joao Moreno 已提交
295
		const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
296 297
			preserveFocus,
			preview,
298
			viewColumn: ViewColumn.Active
J
Joao Moreno 已提交
299 300
		};

J
Joao Moreno 已提交
301 302
		const activeTextEditor = window.activeTextEditor;

303 304 305
		// 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 已提交
306 307 308
			opts.selection = activeTextEditor.selection;
		}

309
		if (!left) {
J
Joao Moreno 已提交
310
			await commands.executeCommand<void>('vscode.open', right, opts, title);
J
Joao Moreno 已提交
311 312 313 314
		} else {
			await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
		}
	}
J
Joao Moreno 已提交
315

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

J
Joao Moreno 已提交
319 320 321
		if (!repository) {
			return toGitUri(uri, ref);
		}
J
Joao Moreno 已提交
322

J
Joao Moreno 已提交
323
		try {
J
Joao Moreno 已提交
324 325 326
			let gitRef = ref;

			if (gitRef === '~') {
J
Joao Moreno 已提交
327
				const uriString = uri.toString();
J
Joao Moreno 已提交
328
				const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString);
J
Joao Moreno 已提交
329
				gitRef = indexStatus ? '' : 'HEAD';
J
Joao Moreno 已提交
330 331
			}

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

J
Joao Moreno 已提交
335 336 337
			if (mimetype === 'text/plain') {
				return toGitUri(uri, ref);
			}
338

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

J
Joao Moreno 已提交
343
			if (ImageMimetypes.indexOf(mimetype) > -1) {
J
Joao Moreno 已提交
344 345
				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 已提交
346 347
			}

J
Joao Moreno 已提交
348
			return Uri.parse(`data:;label:${path.basename(uri.fsPath)};description:${gitRef},`);
J
Joao Moreno 已提交
349 350 351 352

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

J
Joao Moreno 已提交
355
	private async getLeftResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
356 357 358
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
359
				return this.getURI(resource.original, 'HEAD');
J
Joao Moreno 已提交
360 361

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

			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
365
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
366
		}
367
		return undefined;
J
Joao Moreno 已提交
368
	}
J
Joao Moreno 已提交
369

J
Joao Moreno 已提交
370
	private async getRightResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
371 372 373 374 375
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_ADDED:
			case Status.INDEX_COPIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
376
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
377 378 379

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

J
Joao Moreno 已提交
382 383 384 385 386 387
			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 已提交
388 389 390
			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
391
			case Status.INTENT_TO_ADD:
J
Joao Moreno 已提交
392 393 394 395 396 397
				const repository = this.model.getRepository(resource.resourceUri);

				if (!repository) {
					return;
				}

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

J
Joao Moreno 已提交
401 402
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
403 404
				}

J
Joao Moreno 已提交
405
				return resource.resourceUri;
J
Joao Moreno 已提交
406

407
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
408
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
409
				return resource.resourceUri;
J
Joao Moreno 已提交
410
		}
411
		return undefined;
J
Joao Moreno 已提交
412 413 414
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
415
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
416 417 418 419 420 421 422

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

			case Status.MODIFIED:
M
Marc Kassay 已提交
423 424
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
425
				return `${basename} (Working Tree)`;
J
Joao Moreno 已提交
426 427 428 429 430 431

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

			case Status.DELETED_BY_THEM:
				return `${basename} (Ours)`;
J
Joao Moreno 已提交
432 433 434 435 436
		}

		return '';
	}

J
Joao Moreno 已提交
437
	@command('git.clone')
438 439 440 441 442 443 444
	async clone(url?: string): Promise<void> {
		if (!url) {
			url = await window.showInputBox({
				prompt: localize('repourl', "Repository URL"),
				ignoreFocusOut: true
			});
		}
J
Joao Moreno 已提交
445 446

		if (!url) {
K
kieferrm 已提交
447
			/* __GDPR__
K
kieferrm 已提交
448 449 450 451
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
452 453
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
454 455
		}

456
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
457 458 459 460 461 462 463 464 465
		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 已提交
466 467
		});

J
Joao Moreno 已提交
468
		if (!uris || uris.length === 0) {
K
kieferrm 已提交
469
			/* __GDPR__
K
kieferrm 已提交
470 471 472 473
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
474 475
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
			return;
J
Joao Moreno 已提交
476 477
		}

J
Joao Moreno 已提交
478 479 480
		const uri = uris[0];
		const parentPath = uri.fsPath;

481
		try {
482 483 484 485 486
			const opts = {
				location: ProgressLocation.Notification,
				title: localize('cloning', "Cloning git repository '{0}'...", url),
				cancellable: true
			};
M
Maryam Archie 已提交
487

488 489
			const repositoryPath = await window.withProgress(
				opts,
J
Joao Moreno 已提交
490
				(_, token) => this.git.clone(url!, parentPath, token)
491
			);
492

493 494
			const choices = [];
			let message = localize('proposeopen', "Would you like to open the cloned repository?");
495
			const open = localize('openrepo', "Open Repository");
496 497 498 499 500 501 502 503 504
			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);
505 506

			const openFolder = result === open;
K
kieferrm 已提交
507
			/* __GDPR__
K
kieferrm 已提交
508 509 510 511 512
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
					"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
				}
			*/
513
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
514 515 516

			const uri = Uri.file(repositoryPath);

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

541
			throw err;
J
Joao Moreno 已提交
542 543 544
		}
	}

J
Joao Moreno 已提交
545
	@command('git.init')
J
Joao Moreno 已提交
546
	async init(): Promise<void> {
J
Joao Moreno 已提交
547
		let repositoryPath: string | undefined = undefined;
J
Joao Moreno 已提交
548
		let askToOpen = true;
J
Joao Moreno 已提交
549

J
Joao Moreno 已提交
550
		if (workspace.workspaceFolders) {
J
Joao Moreno 已提交
551
			const placeHolder = localize('init', "Pick workspace folder to initialize git repo in");
J
Joao Moreno 已提交
552 553 554 555 556
			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 已提交
557 558 559 560
			const item = await window.showQuickPick(items, { placeHolder, ignoreFocusOut: true });

			if (!item) {
				return;
J
Joao Moreno 已提交
561 562
			} else if (item.folder) {
				repositoryPath = item.folder.uri.fsPath;
J
Joao Moreno 已提交
563
				askToOpen = false;
J
Joao Moreno 已提交
564 565
			}
		}
J
Joao Moreno 已提交
566

J
Joao Moreno 已提交
567
		if (!repositoryPath) {
J
Joao Moreno 已提交
568 569 570 571 572 573 574 575 576 577 578 579
			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 已提交
580

J
Joao Moreno 已提交
581
			if (!result || result.length === 0) {
J
Joao Moreno 已提交
582 583
				return;
			}
J
Joao Moreno 已提交
584 585 586 587 588 589 590 591 592 593 594 595

			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 已提交
596
			repositoryPath = uri.fsPath;
J
Joao Moreno 已提交
597 598 599 600

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

J
Joao Moreno 已提交
603
		await this.git.init(repositoryPath);
I
Ivan Sučić 已提交
604 605

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

J
Joao Moreno 已提交
610 611 612 613
		if (!askToOpen) {
			return;
		}

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

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

J
Joao Moreno 已提交
623 624 625 626 627 628
		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ć 已提交
629
		}
J
Joao Moreno 已提交
630 631
	}

J
Joao Moreno 已提交
632 633
	@command('git.openRepository', { repository: false })
	async openRepository(path?: string): Promise<void> {
634
		if (!path) {
J
Joao Moreno 已提交
635 636 637 638 639 640
			const result = await window.showOpenDialog({
				canSelectFiles: false,
				canSelectFolders: true,
				canSelectMany: false,
				defaultUri: Uri.file(os.homedir()),
				openLabel: localize('open repo', "Open Repository")
641 642
			});

J
Joao Moreno 已提交
643
			if (!result || result.length === 0) {
644 645 646
				return;
			}

J
Joao Moreno 已提交
647
			path = result[0].fsPath;
648
		}
J
Joao Moreno 已提交
649 650

		await this.model.openRepository(path);
651 652
	}

J
Joao Moreno 已提交
653 654 655 656 657
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

662
		let uris: Uri[] | undefined;
663 664 665

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
666
				uris = [Uri.file(fromGitUri(arg).path)];
667
			} else if (arg.scheme === 'file') {
668
				uris = [arg];
669 670 671 672 673 674
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
J
Joao Moreno 已提交
675
				console.log('WHAT');
676
				resource = this.getSCMResource();
677 678 679
			}

			if (resource) {
J
Joao Moreno 已提交
680 681 682 683 684
				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];
685
			}
J
Joao Moreno 已提交
686 687
		}

688
		if (!uris) {
J
Joao Moreno 已提交
689
			return;
J
Joao Moreno 已提交
690 691
		}

692
		const activeTextEditor = window.activeTextEditor;
J
Joao Moreno 已提交
693

694 695
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
696
				preserveFocus,
J
Joao Moreno 已提交
697
				preview: false,
698
				viewColumn: ViewColumn.Active
699 700
			};

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

703 704 705
			// 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 已提交
706
				// preserve not only selection but also visible range
B
Benjamin Pasero 已提交
707
				opts.selection = activeTextEditor.selection;
E
Eric Gang 已提交
708 709 710 711 712
				const previousVisibleRanges = activeTextEditor.visibleRanges;
				const editor = await window.showTextDocument(document, opts);
				editor.revealRange(previousVisibleRanges[0]);
			} else {
				await window.showTextDocument(document, opts);
B
Benjamin Pasero 已提交
713
			}
J
Joao Moreno 已提交
714
		}
J
Joao Moreno 已提交
715 716
	}

J
Joao Moreno 已提交
717 718 719 720 721
	@command('git.openFile2')
	async openFile2(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
		this.openFile(arg, ...resourceStates);
	}

J
Joao Moreno 已提交
722 723
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
724
		let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
725
		const preview = !(arg instanceof Resource);
D
Duroktar 已提交
726 727 728 729

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
730
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
731
		} else {
732
			resource = this.getSCMResource();
D
Duroktar 已提交
733 734 735 736 737 738
		}

		if (!resource) {
			return;
		}

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

J
Joao Moreno 已提交
741 742 743
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
744
		}
J
Joao Moreno 已提交
745

J
Joao Moreno 已提交
746 747 748 749 750
		const opts: TextDocumentShowOptions = {
			preview
		};

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

J
Joao Moreno 已提交
753 754
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
755
		const preserveFocus = arg instanceof Resource;
J
Joao Moreno 已提交
756 757
		const preview = !(arg instanceof Resource);

J
Joao 已提交
758
		const preserveSelection = arg instanceof Uri || !arg;
759
		let resources: Resource[] | undefined = undefined;
760

761
		if (arg instanceof Uri) {
762
			const resource = this.getSCMResource(arg);
763 764 765
			if (resource !== undefined) {
				resources = [resource];
			}
766
		} else {
767
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
768

769 770 771
			if (arg instanceof Resource) {
				resource = arg;
			} else {
772
				resource = this.getSCMResource();
773 774 775 776 777
			}

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

780
		if (!resources) {
J
Joao Moreno 已提交
781
			return;
J
Joao Moreno 已提交
782
		}
J
Joao Moreno 已提交
783

784
		for (const resource of resources) {
J
Joao 已提交
785
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
786
		}
J
Joao Moreno 已提交
787 788
	}

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

793 794
		resourceStates = resourceStates.filter(s => !!s);

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

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

800 801 802 803 804 805 806
			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

807
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
808
		const { resolved, unresolved, deletionConflicts } = await categorizeResourceByResolution(selection);
809 810 811 812 813

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

815 816 817 818 819 820 821 822
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
823 824 825 826 827 828 829 830 831 832 833 834 835 836
		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 已提交
837
		const workingTree = selection.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
838
		const scmResources = [...workingTree, ...resolved, ...unresolved];
839

J
Joao Moreno 已提交
840
		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
841
		if (!scmResources.length) {
J
Joao Moreno 已提交
842 843
			return;
		}
J
Joao Moreno 已提交
844

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

J
Joao Moreno 已提交
849 850
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
851
		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
852 853 854 855 856 857 858 859 860 861 862 863 864
		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;
		}
865 866 867

		if (unresolved.length > 0) {
			const message = unresolved.length > 1
J
Joao Moreno 已提交
868 869
				? 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));
870 871 872 873 874 875 876 877 878

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

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

J
Joao Moreno 已提交
879
		await repository.add([]);
J
Joao Moreno 已提交
880 881
	}

J
Joao Moreno 已提交
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 908 909 910 911 912 913 914 915 916
	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 已提交
917
	@command('git.stageChange')
J
Joao Moreno 已提交
918 919 920 921 922 923 924 925
	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 已提交
926 927
	}

J
Joao Moreno 已提交
928
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
929
	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
930 931 932 933 934 935 936
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
937 938 939 940
		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 已提交
941

J
Joao Moreno 已提交
942
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
943 944 945
			return;
		}

J
Joao Moreno 已提交
946 947
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
948

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

J
Joao Moreno 已提交
953
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
954 955 956
			return;
		}

J
Joao Moreno 已提交
957
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
958
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
959
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
960

J
Joao Moreno 已提交
961
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
962
	}
J
Joao Moreno 已提交
963

J
Joao Moreno 已提交
964
	@command('git.revertChange')
J
Joao Moreno 已提交
965 966 967 968
	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 已提交
969 970 971
			return;
		}

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

J
Joao Moreno 已提交
975
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
976
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
977 978 979 980 981 982 983
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
984 985
		const selections = textEditor.selections;
		const selectedChanges = changes.filter(change => {
J
Joao Moreno 已提交
986
			const modifiedRange = getModifiedRange(modifiedDocument, change);
J
Joao Moreno 已提交
987 988 989 990
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
991 992 993
			return;
		}

J
Joao Moreno 已提交
994 995
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
996

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

J
Joao Moreno 已提交
1001
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
1002 1003 1004
			return;
		}

J
Joao Moreno 已提交
1005 1006
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
1007 1008
		const selectionsBeforeRevert = textEditor.selections;
		const visibleRangesBeforeRevert = textEditor.visibleRanges;
J
Joao Moreno 已提交
1009
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
1010

J
Joao Moreno 已提交
1011 1012 1013
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
1014

J
Joao Moreno 已提交
1015 1016
		await modifiedDocument.save();

1017 1018
		textEditor.selections = selectionsBeforeRevert;
		textEditor.revealRange(visibleRangesBeforeRevert[0]);
J
Joao Moreno 已提交
1019 1020
	}

J
Joao Moreno 已提交
1021 1022
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
1023 1024
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1025
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1026
			const resource = this.getSCMResource();
1027 1028 1029 1030 1031 1032 1033 1034

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

1038
		if (!scmResources.length) {
J
Joao Moreno 已提交
1039 1040 1041
			return;
		}

1042
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1043
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
1044 1045
	}

J
Joao Moreno 已提交
1046 1047
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
1048
		await repository.revert([]);
J
Joao Moreno 已提交
1049
	}
J
Joao Moreno 已提交
1050

J
Joao Moreno 已提交
1051 1052
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
1053 1054 1055 1056 1057 1058 1059 1060 1061
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

1062 1063 1064 1065 1066 1067 1068
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
1069 1070 1071
			return;
		}

J
Joao Moreno 已提交
1072
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
1073
		const originalDocument = await workspace.openTextDocument(originalUri);
1074 1075 1076 1077
		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 已提交
1078 1079 1080 1081 1082

		if (!selectedDiffs.length) {
			return;
		}

1083 1084
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
1085

J
Joao Moreno 已提交
1086
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
1087 1088
	}

J
Joao Moreno 已提交
1089 1090
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
1091 1092
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
1093
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
1094
			const resource = this.getSCMResource();
1095 1096 1097 1098 1099 1100 1101 1102

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
1106
		if (!scmResources.length) {
J
Joao Moreno 已提交
1107 1108
			return;
		}
J
Joao Moreno 已提交
1109

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

J
Joao Moreno 已提交
1114
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
1115
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
1116
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
1117 1118
				yes = localize('delete file', "Delete file");
			} else {
1119 1120 1121 1122 1123 1124
				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 已提交
1125 1126
			}
		} else {
1127 1128 1129 1130 1131 1132
			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 已提交
1133 1134 1135 1136 1137

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

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

J
Joao Moreno 已提交
1141 1142 1143 1144
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
1145
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
1146
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
1147
	}
J
Joao Moreno 已提交
1148

J
Joao Moreno 已提交
1149 1150
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1151
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
1152 1153 1154 1155 1156

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

J
Joao Moreno 已提交
1157 1158
		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 已提交
1159

J
Joao Moreno 已提交
1160 1161 1162 1163 1164 1165
		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 已提交
1166
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1167
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
1168

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

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

J
Joao 已提交
1184
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1185 1186 1187 1188
		} 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 已提交
1189

J
Joao Moreno 已提交
1190 1191 1192
			if (pick !== yes) {
				return;
			}
J
Joao Moreno 已提交
1193

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

J
Joao Moreno 已提交
1196 1197 1198 1199
		} 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 已提交
1200

J
Joao Moreno 已提交
1201 1202 1203 1204 1205
			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 已提交
1206

J
Joao Moreno 已提交
1207
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
1208 1209 1210 1211 1212 1213 1214 1215
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
1216
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
1217
		}
J
Joao Moreno 已提交
1218 1219
	}

J
Joao Moreno 已提交
1220
	private async smartCommit(
J
Joao Moreno 已提交
1221
		repository: Repository,
1222
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
1223 1224
		opts?: CommitOptions
	): Promise<boolean> {
1225
		const config = workspace.getConfiguration('git', Uri.file(repository.root));
J
Joao Moreno 已提交
1226 1227 1228 1229 1230 1231 1232 1233
		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 已提交
1234 1235
					? 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 已提交
1236 1237 1238 1239 1240 1241 1242 1243 1244 1245
				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
				}
1246 1247 1248
			}
		}

1249
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
1250
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
1251 1252
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
1253 1254

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

J
Joao Moreno 已提交
1257 1258
			// 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?");
1259 1260 1261 1262 1263
			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 已提交
1264 1265 1266
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
1267 1268 1269
			}
		}

J
Joao Moreno 已提交
1270
		if (!opts) {
1271
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
1272 1273
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
1274 1275
		}

1276 1277 1278
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

1279 1280 1281 1282
		if (config.get<boolean>('alwaysSignOff')) {
			opts.signoff = true;
		}

J
Joao Moreno 已提交
1283
		if (
1284
			(
J
Joao Moreno 已提交
1285 1286 1287 1288 1289
				// no changes
				(noStagedChanges && noUnstagedChanges)
				// or no staged changes and not `all`
				|| (!opts.all && noStagedChanges)
			)
1290
			&& !opts.empty
J
Joao Moreno 已提交
1291
		) {
J
Joao Moreno 已提交
1292 1293 1294 1295
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1296
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1297 1298 1299 1300 1301

		if (!message) {
			return false;
		}

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

J
Joao Moreno 已提交
1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314
		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 已提交
1315 1316 1317
		return true;
	}

J
Joao Moreno 已提交
1318
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1319
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1320
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
1321 1322 1323 1324
			if (message) {
				return message;
			}

1325 1326 1327 1328 1329 1330
			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 已提交
1331
			return await window.showInputBox({
1332
				value,
J
Joao Moreno 已提交
1333
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
1334 1335
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
1336
			});
J
Joao Moreno 已提交
1337 1338
		};

J
Joao Moreno 已提交
1339
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1340 1341

		if (message && didCommit) {
J
Joao Moreno 已提交
1342
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1343
		}
J
Joao Moreno 已提交
1344 1345
	}

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

J
Joao Moreno 已提交
1351
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
1352
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1353
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
1354 1355 1356
			return;
		}

J
Joao Moreno 已提交
1357
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1358 1359

		if (didCommit) {
J
Joao Moreno 已提交
1360
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1361
		}
J
Joao Moreno 已提交
1362 1363
	}

J
Joao Moreno 已提交
1364
	@command('git.commitStaged', { repository: true })
J
Joao Moreno 已提交
1365 1366
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
1367 1368
	}

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

J
Joao Moreno 已提交
1374
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
1375
	async commitStagedAmend(repository: Repository): Promise<void> {
1376
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
1377 1378
	}

J
Joao Moreno 已提交
1379
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
1380 1381
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
1382 1383
	}

J
Joao Moreno 已提交
1384
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1385 1386
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1387 1388
	}

J
Joao Moreno 已提交
1389
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
1390 1391
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
1392 1393
	}

J
Joao Moreno 已提交
1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415
	@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 已提交
1416 1417 1418 1419 1420
	@command('git.restoreCommitTemplate', { repository: true })
	async restoreCommitTemplate(repository: Repository): Promise<void> {
		repository.inputBox.value = await repository.getCommitTemplate();
	}

J
Joao Moreno 已提交
1421
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
1422 1423
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1424 1425

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

J
Joao Moreno 已提交
1430
		const commit = await repository.getCommit('HEAD');
J
Joao Moreno 已提交
1431 1432

		if (commit.parents.length > 0) {
1433 1434 1435 1436 1437
			await repository.reset('HEAD~');
		} else {
			await repository.deleteRef('HEAD');
			await this.unstageAll(repository);
		}
J
Joao Moreno 已提交
1438

J
Joao Moreno 已提交
1439
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1440 1441
	}

J
Joao Moreno 已提交
1442
	@command('git.checkout', { repository: true })
1443
	async checkout(repository: Repository, treeish: string): Promise<boolean> {
J
Joao Moreno 已提交
1444
		if (typeof treeish === 'string') {
1445 1446
			await repository.checkout(treeish);
			return true;
J
Joao Moreno 已提交
1447
		}
J
Joao Moreno 已提交
1448

J
Joao Moreno 已提交
1449 1450 1451
		const createBranch = new CreateBranchItem(this);
		const createBranchFrom = new CreateBranchFromItem(this);
		const picks = [createBranch, createBranchFrom, ...createCheckoutItems(repository)];
1452
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
1453 1454 1455 1456

		const quickpick = window.createQuickPick();
		quickpick.items = picks;
		quickpick.placeholder = placeHolder;
J
Joao Moreno 已提交
1457
		quickpick.ignoreFocusOut = true;
1458 1459 1460 1461
		quickpick.show();

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

		if (!choice) {
1464
			return false;
J
Joao Moreno 已提交
1465 1466
		}

1467 1468
		if (choice === createBranch) {
			await this._branch(repository, quickpick.value);
J
Joao Moreno 已提交
1469 1470
		} else if (choice === createBranchFrom) {
			await this._branch(repository, quickpick.value, true);
1471 1472 1473 1474
		} else {
			await (choice as CheckoutItem).run(repository);
		}

1475
		return true;
J
Joao Moreno 已提交
1476 1477
	}

J
Joao Moreno 已提交
1478
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1479
	async branch(repository: Repository): Promise<void> {
1480 1481
		await this._branch(repository);
	}
J
Joao Moreno 已提交
1482

J
Joao Moreno 已提交
1483 1484 1485 1486 1487 1488
	@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> {
1489 1490 1491 1492 1493 1494 1495
		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 已提交
1496
		const rawBranchName = defaultName || await window.showInputBox({
1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512
			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) {
1513 1514
			return;
		}
J
Joao Moreno 已提交
1515

J
Joao Moreno 已提交
1516
		let target = 'HEAD';
J
Joao Moreno 已提交
1517

J
Joao Moreno 已提交
1518 1519 1520 1521 1522 1523 1524 1525 1526 1527
		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 已提交
1528
		}
J
Joao Moreno 已提交
1529

J
Joao Moreno 已提交
1530
		await repository.branch(branchName, true, target);
J
Joao Moreno 已提交
1531 1532
	}

J
Joao Moreno 已提交
1533
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1534
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1535 1536
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1537
			run = force => repository.deleteBranch(name, force);
1538
		} else {
J
Joao Moreno 已提交
1539 1540
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1541
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1542

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

M
Maik Riechert 已提交
1546
			if (!choice || !choice.branchName) {
1547 1548
				return;
			}
M
Maik Riechert 已提交
1549
			name = choice.branchName;
J
Joao Moreno 已提交
1550
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1551 1552
		}

1553 1554 1555 1556 1557 1558 1559 1560 1561
		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");
1562
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1563 1564 1565 1566 1567

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

1570 1571
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
J
Justin Horner 已提交
1572 1573 1574 1575 1576 1577 1578 1579
		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 {
1580
			await repository.renameBranch(name);
J
Justin Horner 已提交
1581 1582 1583
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1584 1585
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1586
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1587
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", name));
1588 1589 1590
					return;
				default:
					throw err;
J
Justin Horner 已提交
1591 1592 1593 1594
			}
		}
	}

J
Joao Moreno 已提交
1595
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1596
	async merge(repository: Repository): Promise<void> {
1597 1598 1599 1600
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1601
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1602 1603
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1604

J
Joao Moreno 已提交
1605
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1606 1607
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1608 1609

		const picks = [...heads, ...remoteHeads];
1610 1611
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1612 1613 1614 1615 1616

		if (!choice) {
			return;
		}

1617
		await choice.run(repository);
1618 1619
	}

J
Joao Moreno 已提交
1620
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1621
	async createTag(repository: Repository): Promise<void> {
1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633
		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 已提交
1634
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1635 1636 1637 1638 1639
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
1643 1644 1645 1646 1647 1648 1649
	@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 已提交
1650
		await repository.fetchDefault();
J
Joao Moreno 已提交
1651 1652
	}

R
Ryan Scott 已提交
1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663
	@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 已提交
1664 1665 1666 1667 1668 1669 1670 1671 1672 1673
	@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 已提交
1674
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1675 1676
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1677 1678 1679 1680 1681 1682

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

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

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

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

D
Dozed12 已提交
1697
		if (!branchPick) {
1698 1699 1700
			return;
		}

F
Francisco Moreira 已提交
1701 1702
		const remoteCharCnt = remotePick.label.length;

1703
		await repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1704 1705
	}

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

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

J
Joao Moreno 已提交
1715
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1716 1717
	}

J
Joao Moreno 已提交
1718
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1719 1720
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1721 1722 1723 1724 1725 1726

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

J
Joao Moreno 已提交
1727
		await repository.pullWithRebase(repository.HEAD);
J
Joao Moreno 已提交
1728 1729
	}

J
Joao Moreno 已提交
1730
	private async _push(repository: Repository, pushOptions: PushOptions) {
J
Joao Moreno 已提交
1731
		const remotes = repository.remotes;
1732

J
Joao Moreno 已提交
1733
		if (remotes.length === 0) {
J
Joao Moreno 已提交
1734 1735 1736
			if (!pushOptions.silent) {
				window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
			}
J
Joao Moreno 已提交
1737 1738
			return;
		}
1739

J
Joao Moreno 已提交
1740 1741 1742 1743 1744 1745
		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."));
1746 1747
				return;
			}
J
Joao Moreno 已提交
1748

J
Joao Moreno 已提交
1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762
			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 已提交
1763 1764
		}

1765 1766 1767 1768 1769 1770 1771
		if (pushOptions.pushType === PushType.PushTags) {
			await repository.pushTags(undefined, forcePushMode);

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

1772
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1773 1774 1775
			if (!pushOptions.silent) {
				window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			}
1776 1777 1778
			return;
		}

1779 1780 1781 1782 1783 1784 1785
		if (pushOptions.pushType === PushType.Push) {
			try {
				await repository.push(repository.HEAD, forcePushMode);
			} catch (err) {
				if (err.gitErrorCode !== GitErrorCodes.NoUpstreamBranch) {
					throw err;
				}
1786

J
Joao Moreno 已提交
1787 1788 1789 1790
				if (pushOptions.silent) {
					return;
				}

1791 1792 1793 1794 1795 1796 1797 1798 1799 1800
				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 {
1801
			const branchName = repository.HEAD.name;
1802 1803 1804
			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 });
1805

1806 1807
			if (!pick) {
				return;
1808
			}
1809 1810

			await repository.pushTo(pick.label, branchName, undefined, forcePushMode);
1811
		}
J
Joao Moreno 已提交
1812 1813
	}

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

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

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

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

J
Joao Moreno 已提交
1834
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1835
	async pushTo(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1836
		await this._push(repository, { pushType: PushType.PushTo });
1837
	}
J
Joao Moreno 已提交
1838

1839 1840
	@command('git.pushToForce', { repository: true })
	async pushToForce(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1841
		await this._push(repository, { pushType: PushType.PushTo, forcePush: true });
J
Joao Moreno 已提交
1842 1843
	}

O
Omkar Manjrekar 已提交
1844 1845
	@command('git.addRemote', { repository: true })
	async addRemote(repository: Repository): Promise<void> {
1846 1847
		const remotes = repository.remotes;

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

O
Omkar Manjrekar 已提交
1853
		const resultName = await window.showInputBox({
O
Omkar Manjrekar 已提交
1854 1855 1856 1857
			placeHolder: localize('remote name', "Remote name"),
			prompt: localize('provide remote name', "Please provide a remote name"),
			ignoreFocusOut: true,
			validateInput: (name: string) => {
O
Omkar Manjrekar 已提交
1858
				if (sanitize(name)) {
O
Omkar Manjrekar 已提交
1859 1860
					return null;
				}
O
Omkar Manjrekar 已提交
1861
				return localize('remote name format invalid', "Remote name format invalid");
O
Omkar Manjrekar 已提交
1862
			}
O
Omkar Manjrekar 已提交
1863
		});
O
Omkar Manjrekar 已提交
1864

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

O
Omkar Manjrekar 已提交
1867 1868 1869 1870 1871
		if (!name) {
			return;
		}

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

J
Joao Moreno 已提交
1876
		const url = await window.showInputBox({
O
Omkar Manjrekar 已提交
1877
			placeHolder: localize('remote url', "Remote URL"),
O
Omkar Manjrekar 已提交
1878
			prompt: localize('provide remote URL', "Enter URL for remote \"{0}\"", name),
1879
			ignoreFocusOut: true
O
Omkar Manjrekar 已提交
1880 1881 1882 1883 1884 1885 1886
		});

		if (!url) {
			return;
		}

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

O
Omkar Manjrekar 已提交
1889 1890
	@command('git.removeRemote', { repository: true })
	async removeRemote(repository: Repository): Promise<void> {
O
Omkar Manjrekar 已提交
1891 1892 1893
		const remotes = repository.remotes;

		if (remotes.length === 0) {
1894
			window.showErrorMessage(localize('no remotes added', "Your repository has no remotes."));
O
Omkar Manjrekar 已提交
1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905
			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 已提交
1906

O
Omkar Manjrekar 已提交
1907
		await repository.removeRemote(remoteName);
O
Omkar Manjrekar 已提交
1908
	}
O
Omkar Manjrekar 已提交
1909

J
Joao Moreno 已提交
1910
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1911
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1912 1913 1914 1915 1916

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

J
Joao Moreno 已提交
1917 1918 1919 1920
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
1921
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1922
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
1923 1924

		if (shouldPrompt) {
J
Joao Moreno 已提交
1925
			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 已提交
1926
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
1927
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
1928 1929 1930 1931 1932 1933 1934 1935 1936
			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 已提交
1937
		if (rebase) {
J
Joao Moreno 已提交
1938
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
1939
		} else {
J
Joao Moreno 已提交
1940
			await repository.sync(HEAD);
J
Joao Moreno 已提交
1941 1942 1943 1944 1945 1946
		}
	}

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

J
Joao 已提交
1949 1950 1951 1952 1953 1954 1955 1956 1957
	@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 已提交
1958
			await repository.sync(HEAD);
J
Joao 已提交
1959 1960 1961
		}));
	}

1962
	@command('git.syncRebase', { repository: true })
J
Joao Moreno 已提交
1963 1964
	syncRebase(repository: Repository): Promise<void> {
		return this._sync(repository, true);
J
Joao Moreno 已提交
1965 1966
	}

J
Joao Moreno 已提交
1967
	@command('git.publish', { repository: true })
J
Joao Moreno 已提交
1968 1969
	async publish(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1970 1971 1972 1973 1974 1975

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

J
Joao Moreno 已提交
1976
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1977 1978 1979 1980 1981 1982
		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 已提交
1983 1984 1985 1986 1987

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1988
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1989 1990
	}

1991 1992
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
1993 1994
		resourceStates = resourceStates.filter(s => !!s);

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

1998
			if (!resource) {
J
Joao Moreno 已提交
1999 2000 2001
				return;
			}

2002
			resourceStates = [resource];
J
Joao Moreno 已提交
2003 2004
		}

2005
		const resources = resourceStates
J
Joao Moreno 已提交
2006 2007 2008
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

2009
		if (!resources.length) {
N
NKumar2 已提交
2010 2011 2012
			return;
		}

2013
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
2014 2015
	}

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

2020
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
2021 2022 2023
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
2024

2025
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
2026 2027 2028 2029 2030

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

J
Joao Moreno 已提交
2031
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
2032 2033
	}

2034 2035 2036 2037 2038 2039 2040
	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 已提交
2041 2042 2043 2044 2045 2046 2047 2048 2049 2050
	@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 已提交
2051
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
2052
	async stashPop(repository: Repository): Promise<void> {
2053
		const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
J
Joao Moreno 已提交
2054
		const stash = await this.pickStash(repository, placeHolder);
2055

J
Joao Moreno 已提交
2056
		if (!stash) {
2057 2058 2059
			return;
		}

J
Joao Moreno 已提交
2060
		await repository.popStash(stash.index);
2061 2062 2063 2064
	}

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

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

2072 2073 2074 2075 2076 2077
		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 已提交
2078
		const stash = await this.pickStash(repository, placeHolder);
K
Krzysztof Cieślak 已提交
2079

J
Joao Moreno 已提交
2080
		if (!stash) {
K
Krzysztof Cieślak 已提交
2081 2082
			return;
		}
J
Joao Moreno 已提交
2083

J
Joao Moreno 已提交
2084
		await repository.applyStash(stash.index);
K
Krzysztof Cieślak 已提交
2085 2086
	}

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

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

		await repository.applyStash();
	}

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

J
Joao Moreno 已提交
2102 2103
		if (stashes.length === 0) {
			window.showInformationMessage(localize('no stashes', "There are no stashes in the repository."));
K
Krzysztof Cieślak 已提交
2104 2105 2106
			return;
		}

J
Joao Moreno 已提交
2107 2108 2109
		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 已提交
2110
	}
K
Krzysztof Cieślak 已提交
2111

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

J
Joao Moreno 已提交
2116
			if (!options.repository) {
J
Joao Moreno 已提交
2117 2118
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
2119 2120
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
2121 2122 2123 2124 2125 2126 2127 2128 2129
				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();
				}
2130

J
Joao Moreno 已提交
2131
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
2132
					if (!repository) {
J
Joao 已提交
2133
						return Promise.resolve();
J
Joao Moreno 已提交
2134 2135
					}

J
Joao Moreno 已提交
2136
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
2137
				});
J
Joao Moreno 已提交
2138 2139
			}

K
kieferrm 已提交
2140
			/* __GDPR__
K
kieferrm 已提交
2141 2142 2143 2144
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
2145 2146
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
2147
			return result.catch(async err => {
J
Joao Moreno 已提交
2148
				const options: MessageOptions = {
2149
					modal: true
J
Joao Moreno 已提交
2150 2151
				};

J
Joao Moreno 已提交
2152
				let message: string;
2153
				let type: 'error' | 'warning' = 'error';
J
Joao Moreno 已提交
2154

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

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
2193 2194 2195 2196 2197 2198 2199 2200 2201

						break;
				}

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

J
Joao Moreno 已提交
2202 2203 2204 2205 2206 2207 2208
				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 已提交
2209

J
Joao Moreno 已提交
2210 2211 2212
					if (resultFn) {
						resultFn();
					}
J
Joao Moreno 已提交
2213 2214 2215
				}
			});
		};
2216 2217

		// patch this object, so people can call methods directly
2218
		(this as any)[key] = result;
2219 2220

		return result;
J
Joao Moreno 已提交
2221 2222
	}

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

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

J
Joao Moreno 已提交
2228 2229 2230
		for (const r of this.model.repositories.map(r => r.root)) {
			this.outputChannel.appendLine(`repo root ${r}`);
		}
J
Joao Moreno 已提交
2231

J
Joao Moreno 已提交
2232
		if (!uri) {
2233
			return undefined;
J
Joao Moreno 已提交
2234 2235 2236
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
2237 2238
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
2239 2240 2241 2242
		}

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

J
Joao Moreno 已提交
2245
			if (!repository) {
2246 2247
				return undefined;
			}
J
Joao Moreno 已提交
2248

J
Joao Moreno 已提交
2249 2250
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
2251
		}
2252
		return undefined;
J
Joao Moreno 已提交
2253 2254
	}

J
Joao Moreno 已提交
2255
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
2256 2257 2258 2259 2260 2261
	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) => {
2262
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
2263 2264 2265 2266 2267 2268

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

2269
			// Could it be a submodule?
2270
			if (pathEquals(resource.fsPath, repository.root)) {
2271 2272 2273
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
2274
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290

			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 已提交
2291 2292 2293
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
2294
}