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

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

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

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

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

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

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

		if (!ref) {
			return;
		}

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

class CheckoutTagItem extends CheckoutItem {

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

class CheckoutRemoteHeadItem extends CheckoutItem {

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

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

J
Joao Moreno 已提交
59 60 61 62
		const branches = await repository.findTrackingBranches(this.ref.name);

		if (branches.length > 0) {
			await repository.checkout(branches[0].name!);
63
		} else {
J
Joao Moreno 已提交
64
			await repository.checkoutTracking(this.ref.name);
65
		}
J
Joao Moreno 已提交
66 67 68
	}
}

M
Maik Riechert 已提交
69 70
class BranchDeleteItem implements QuickPickItem {

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

76
	constructor(private ref: Ref) { }
M
Maik Riechert 已提交
77

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

86 87 88 89 90 91
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 已提交
92

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

J
Joao Moreno 已提交
98 99
class CreateBranchItem implements QuickPickItem {

J
Joao Moreno 已提交
100 101
	constructor(private cc: CommandCenter) { }

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

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

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

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

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

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

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

J
Joao Moreno 已提交
155
		Commands.push({ commandId, key, method: descriptor.value, options });
J
Joao Moreno 已提交
156 157
	};
}
J
Joao Moreno 已提交
158

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

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

J
Joao Moreno 已提交
183
	return { merge, resolved, unresolved, deletionConflicts };
184 185
}

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

202 203 204
enum PushType {
	Push,
	PushTo,
205
	PushFollowTags,
206 207 208 209 210
}

interface PushOptions {
	pushType: PushType;
	forcePush?: boolean;
J
Joao Moreno 已提交
211
	silent?: boolean;
212 213
}

J
Joao Moreno 已提交
214
export class CommandCenter {
J
Joao Moreno 已提交
215 216

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

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

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

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

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

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

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

267 268 269 270
		let left: Uri | undefined;
		let right: Uri | undefined;

		if (stat && stat.isDirectory()) {
271 272 273 274
			const repository = this.model.getRepositoryForSubmodule(resource.resourceUri);

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

281 282
			right = await this.getRightResource(resource);
		}
283

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

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

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

J
Joao Moreno 已提交
298 299
		const activeTextEditor = window.activeTextEditor;

300 301 302
		// 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 已提交
303 304 305
			opts.selection = activeTextEditor.selection;
		}

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

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

J
Joao Moreno 已提交
316 317 318
		if (!repository) {
			return toGitUri(uri, ref);
		}
J
Joao Moreno 已提交
319

J
Joao Moreno 已提交
320
		try {
J
Joao Moreno 已提交
321 322 323
			let gitRef = ref;

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

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

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

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

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

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

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

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

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

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

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

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

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

				if (!repository) {
					return;
				}

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

J
Joao Moreno 已提交
398 399
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
400 401
				}

J
Joao Moreno 已提交
402
				return resource.resourceUri;
J
Joao Moreno 已提交
403

404
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
405
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
406
				return resource.resourceUri;
J
Joao Moreno 已提交
407
		}
408
		return undefined;
J
Joao Moreno 已提交
409 410 411
	}

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

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

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

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

			case Status.DELETED_BY_THEM:
				return `${basename} (Ours)`;
J
Joao Moreno 已提交
429 430 431 432 433
		}

		return '';
	}

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

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

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

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

J
Joao Moreno 已提交
475 476 477
		const uri = uris[0];
		const parentPath = uri.fsPath;

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

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

J
Joao Moreno 已提交
490 491 492 493
			let message = localize('proposeopen', "Would you like to open the cloned repository?");
			const open = localize('openrepo', "Open");
			const openNewWindow = localize('openreponew', "Open in New Window");
			const choices = [open, openNewWindow];
494 495 496

			const addToWorkspace = localize('add', "Add to Workspace");
			if (workspace.workspaceFolders) {
J
Joao Moreno 已提交
497
				message = localize('proposeopen2', "Would you like to open the cloned repository, or add it to the current workspace?");
498 499 500 501
				choices.push(addToWorkspace);
			}

			const result = await window.showInformationMessage(message, ...choices);
502 503

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

			const uri = Uri.file(repositoryPath);

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

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

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

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

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

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

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

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

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

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

J
Joao Moreno 已提交
604 605 606 607
		let message = localize('proposeopen init', "Would you like to open the initialized repository?");
		const open = localize('openrepo', "Open");
		const openNewWindow = localize('openreponew', "Open in New Window");
		const choices = [open, openNewWindow];
J
Joao Moreno 已提交
608

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

J
Joao Moreno 已提交
613 614
		const addToWorkspace = localize('add', "Add to Workspace");
		if (workspace.workspaceFolders) {
J
Joao Moreno 已提交
615
			message = localize('proposeopen2 init', "Would you like to open the initialized repository, or add it to the current workspace?");
J
Joao Moreno 已提交
616 617
			choices.push(addToWorkspace);
		}
I
Ivan Sučić 已提交
618 619

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

J
Joao Moreno 已提交
622 623 624 625
		if (result === open) {
			commands.executeCommand('vscode.openFolder', uri);
		} else if (result === addToWorkspace) {
			workspace.updateWorkspaceFolders(workspace.workspaceFolders!.length, 0, { uri });
626 627
		} else if (result === openNewWindow) {
			commands.executeCommand('vscode.openFolder', uri, true);
J
Joao Moreno 已提交
628 629
		} else {
			await this.model.openRepository(repositoryPath);
I
Ivan Sučić 已提交
630
		}
J
Joao Moreno 已提交
631 632
	}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

		if (!resource) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

			resourceStates = [resource];
		}

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

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

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

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

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

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

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

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

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

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

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

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

J
Joao Moreno 已提交
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 917
	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 已提交
918
	@command('git.stageChange')
J
Joao Moreno 已提交
919 920 921 922 923 924 925 926
	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 已提交
927 928
	}

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

		if (!textEditor) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

		if (!textEditor) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

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

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

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

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

		if (!textEditor) {
			return;
		}

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

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

		const { ref } = fromGitUri(modifiedUri);

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

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

		if (!selectedDiffs.length) {
			return;
		}

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

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

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

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

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

		if (!message) {
			return false;
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

		if (!choice) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1766 1767
		if (pushOptions.pushType === PushType.PushFollowTags) {
			await repository.pushFollowTags(undefined, forcePushMode);
1768 1769 1770
			return;
		}

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

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

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

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

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

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

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

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

1823
	@command('git.pushWithTags', { repository: true })
1824 1825
	async pushFollowTags(repository: Repository): Promise<void> {
		await this._push(repository, { pushType: PushType.PushFollowTags });
1826
	}
1827

1828
	@command('git.pushWithTagsForce', { repository: true })
1829 1830
	async pushFollowTagsForce(repository: Repository): Promise<void> {
		await this._push(repository, { pushType: PushType.PushFollowTags, forcePush: true });
1831 1832
	}

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

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

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

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

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

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

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

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

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

		if (!url) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

		if (!choice) {
			return;
		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

		await repository.applyStash();
	}

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

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

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

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

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

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

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

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

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

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

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

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

						break;
				}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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