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

'use strict';

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

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

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

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

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

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

		if (!ref) {
			return;
		}

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

class CheckoutTagItem extends CheckoutItem {

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

class CheckoutRemoteHeadItem extends CheckoutItem {

J
Joao Moreno 已提交
52 53 54
	get description(): string {
		return localize('remote branch at', "Remote branch at {0}", this.shortCommit);
	}
J
Joao Moreno 已提交
55 56 57 58 59 60 61 62 63 64 65

	protected get treeish(): string | undefined {
		if (!this.ref.name) {
			return;
		}

		const match = /^[^/]+\/(.*)$/.exec(this.ref.name);
		return match ? match[1] : this.ref.name;
	}
}

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

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

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

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

83 84 85 86 87 88
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 已提交
89

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

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

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

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

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

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

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

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

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

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

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

J
Joao Moreno 已提交
140
export class CommandCenter {
J
Joao Moreno 已提交
141 142

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

J
Joao Moreno 已提交
144
	constructor(
J
Joao Moreno 已提交
145
		private git: Git,
J
Joao Moreno 已提交
146
		private model: Model,
J
Joao Moreno 已提交
147 148
		private outputChannel: OutputChannel,
		private telemetryReporter: TelemetryReporter
J
Joao Moreno 已提交
149
	) {
J
Joao Moreno 已提交
150 151
		this.disposables = Commands.map(({ commandId, key, method, options }) => {
			const command = this.createCommand(commandId, key, method, options);
152

J
Joao Moreno 已提交
153
			if (options.diff) {
J
Joao Moreno 已提交
154 155 156 157 158
				return commands.registerDiffInformationCommand(commandId, command);
			} else {
				return commands.registerCommand(commandId, command);
			}
		});
J
Joao Moreno 已提交
159 160
	}

J
Joao Moreno 已提交
161 162
	@command('git.refresh', { repository: true })
	async refresh(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
163
		await repository.status();
J
Joao Moreno 已提交
164
	}
J
Joao Moreno 已提交
165

J
Joao Moreno 已提交
166 167
	@command('git.openResource')
	async openResource(resource: Resource): Promise<void> {
J
Joao 已提交
168
		await this._openResource(resource, undefined, true, false);
J
Joao Moreno 已提交
169 170
	}

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

174 175 176 177
		try {
			stat = await new Promise<Stats>((c, e) => lstat(resource.resourceUri.fsPath, (err, stat) => err ? e(err) : c(stat)));
		} catch (err) {
			// noop
178
		}
179

180 181 182 183
		let left: Uri | undefined;
		let right: Uri | undefined;

		if (stat && stat.isDirectory()) {
184 185 186 187
			const repository = this.model.getRepositoryForSubmodule(resource.resourceUri);

			if (repository) {
				right = toGitUri(resource.resourceUri, resource.resourceGroupType === ResourceGroupType.Index ? 'index' : 'wt', { submoduleOf: repository.root });
188 189 190 191 192
			}
		} else {
			left = await this.getLeftResource(resource);
			right = await this.getRightResource(resource);
		}
193

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

J
Joao Moreno 已提交
196 197 198 199 200
		if (!right) {
			// TODO
			console.error('oh no');
			return;
		}
J
Joao Moreno 已提交
201

J
Joao Moreno 已提交
202
		const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
203 204
			preserveFocus,
			preview,
205
			viewColumn: ViewColumn.Active
J
Joao Moreno 已提交
206 207
		};

J
Joao Moreno 已提交
208 209
		const activeTextEditor = window.activeTextEditor;

210 211 212
		// 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 已提交
213 214 215
			opts.selection = activeTextEditor.selection;
		}

216
		if (!left) {
J
Joao Moreno 已提交
217 218 219 220 221
			await commands.executeCommand<void>('vscode.open', right, opts);
		} else {
			await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
		}
	}
J
Joao Moreno 已提交
222

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

J
Joao Moreno 已提交
226 227 228
		if (!repository) {
			return toGitUri(uri, ref);
		}
J
Joao Moreno 已提交
229

J
Joao Moreno 已提交
230
		try {
J
Joao Moreno 已提交
231 232 233
			let gitRef = ref;

			if (gitRef === '~') {
J
Joao Moreno 已提交
234
				const uriString = uri.toString();
J
Joao Moreno 已提交
235
				const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString);
J
Joao Moreno 已提交
236
				gitRef = indexStatus ? '' : 'HEAD';
J
Joao Moreno 已提交
237 238
			}

J
Joao Moreno 已提交
239
			const { size, object } = await repository.lstree(gitRef, uri.fsPath);
J
Joao Moreno 已提交
240
			const { mimetype } = await repository.detectObjectType(object);
J
Joao Moreno 已提交
241

J
Joao Moreno 已提交
242 243 244
			if (mimetype === 'text/plain') {
				return toGitUri(uri, ref);
			}
245

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

J
Joao Moreno 已提交
250
			if (ImageMimetypes.indexOf(mimetype) > -1) {
J
Joao Moreno 已提交
251 252
				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 已提交
253 254
			}

J
Joao Moreno 已提交
255
			return Uri.parse(`data:;label:${path.basename(uri.fsPath)};description:${gitRef},`);
J
Joao Moreno 已提交
256 257 258 259

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

J
Joao Moreno 已提交
262
	private async getLeftResource(resource: Resource): Promise<Uri | undefined> {
J
Joao Moreno 已提交
263 264 265
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
266
				return this.getURI(resource.original, 'HEAD');
J
Joao Moreno 已提交
267 268

			case Status.MODIFIED:
J
Joao Moreno 已提交
269
				return this.getURI(resource.resourceUri, '~');
270 271

			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
272
				return this.getURI(resource.resourceUri, '');
J
Joao Moreno 已提交
273
		}
J
Joao Moreno 已提交
274
	}
J
Joao Moreno 已提交
275

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

			case Status.INDEX_DELETED:
285
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
286
			case Status.DELETED:
J
Joao Moreno 已提交
287
				return this.getURI(resource.resourceUri, 'HEAD');
J
Joao Moreno 已提交
288 289 290 291

			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
J
Joao Moreno 已提交
292 293 294 295 296 297
				const repository = this.model.getRepository(resource.resourceUri);

				if (!repository) {
					return;
				}

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

J
Joao Moreno 已提交
301 302
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
303 304
				}

J
Joao Moreno 已提交
305
				return resource.resourceUri;
J
Joao Moreno 已提交
306

307
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
308
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
309
				return resource.resourceUri;
J
Joao Moreno 已提交
310 311 312 313
		}
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
314
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
315 316 317 318

		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
M
Marc Kassay 已提交
319
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
320 321 322
				return `${basename} (Index)`;

			case Status.MODIFIED:
M
Marc Kassay 已提交
323 324
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
325 326 327 328 329 330
				return `${basename} (Working Tree)`;
		}

		return '';
	}

J
Joao Moreno 已提交
331
	@command('git.clone')
332 333 334 335 336 337 338
	async clone(url?: string): Promise<void> {
		if (!url) {
			url = await window.showInputBox({
				prompt: localize('repourl', "Repository URL"),
				ignoreFocusOut: true
			});
		}
J
Joao Moreno 已提交
339 340

		if (!url) {
K
kieferrm 已提交
341
			/* __GDPR__
K
kieferrm 已提交
342 343 344 345
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
346 347
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
348 349
		}

350
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
351 352 353 354 355 356 357 358 359
		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 已提交
360 361
		});

J
Joao Moreno 已提交
362
		if (!uris || uris.length === 0) {
K
kieferrm 已提交
363
			/* __GDPR__
K
kieferrm 已提交
364 365 366 367
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
368 369
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
			return;
J
Joao Moreno 已提交
370 371
		}

J
Joao Moreno 已提交
372 373 374
		const uri = uris[0];
		const parentPath = uri.fsPath;

375
		try {
376 377 378 379 380
			const opts = {
				location: ProgressLocation.Notification,
				title: localize('cloning', "Cloning git repository '{0}'...", url),
				cancellable: true
			};
M
Maryam Archie 已提交
381

382 383
			const repositoryPath = await window.withProgress(
				opts,
J
Joao Moreno 已提交
384
				(_, token) => this.git.clone(url!, parentPath, token)
385
			);
386

387 388
			const choices = [];
			let message = localize('proposeopen', "Would you like to open the cloned repository?");
389
			const open = localize('openrepo', "Open Repository");
390 391 392 393 394 395 396 397 398
			choices.push(open);

			const addToWorkspace = localize('add', "Add to Workspace");
			if (workspace.workspaceFolders) {
				message = localize('proposeopen2', "Would you like to open the cloned repository, or add it to the current workspace?");
				choices.push(addToWorkspace);
			}

			const result = await window.showInformationMessage(message, ...choices);
399 400

			const openFolder = result === open;
K
kieferrm 已提交
401
			/* __GDPR__
K
kieferrm 已提交
402 403 404 405 406
				"clone" : {
					"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
					"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
				}
			*/
407
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
408 409 410

			const uri = Uri.file(repositoryPath);

411
			if (openFolder) {
412 413 414
				commands.executeCommand('vscode.openFolder', uri);
			} else if (result === addToWorkspace) {
				workspace.updateWorkspaceFolders(workspace.workspaceFolders!.length, 0, { uri });
415
			}
416 417
		} catch (err) {
			if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
K
kieferrm 已提交
418
				/* __GDPR__
K
kieferrm 已提交
419 420 421 422
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
423
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'directory_not_empty' });
J
Joao Moreno 已提交
424 425
			} else if (/Cancelled/i.test(err && (err.message || err.stderr || ''))) {
				return;
426
			} else {
K
kieferrm 已提交
427
				/* __GDPR__
K
kieferrm 已提交
428 429 430 431
					"clone" : {
						"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
					}
				*/
432
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'error' });
433
			}
J
Joao Moreno 已提交
434

435
			throw err;
J
Joao Moreno 已提交
436 437 438
		}
	}

J
Joao Moreno 已提交
439
	@command('git.init')
J
Joao Moreno 已提交
440
	async init(): Promise<void> {
J
Joao Moreno 已提交
441
		let path: string | undefined;
J
Joao Moreno 已提交
442

J
Joao Moreno 已提交
443 444 445 446 447 448 449 450
		if (workspace.workspaceFolders && workspace.workspaceFolders.length > 1) {
			const placeHolder = localize('init', "Pick workspace folder to initialize git repo in");
			const items = workspace.workspaceFolders.map(folder => ({ label: folder.name, description: folder.uri.fsPath, folder }));
			const item = await window.showQuickPick(items, { placeHolder, ignoreFocusOut: true });

			if (!item) {
				return;
			}
J
Joao Moreno 已提交
451

J
Joao Moreno 已提交
452 453
			path = item.folder.uri.fsPath;
		}
J
Joao Moreno 已提交
454

J
Joao Moreno 已提交
455 456 457 458 459 460 461 462 463 464 465 466 467
		if (!path) {
			const homeUri = Uri.file(os.homedir());
			const defaultUri = workspace.workspaceFolders && workspace.workspaceFolders.length > 0
				? Uri.file(workspace.workspaceFolders[0].uri.fsPath)
				: homeUri;

			const result = await window.showOpenDialog({
				canSelectFiles: false,
				canSelectFolders: true,
				canSelectMany: false,
				defaultUri,
				openLabel: localize('init repo', "Initialize Repository")
			});
J
Joao Moreno 已提交
468

J
Joao Moreno 已提交
469
			if (!result || result.length === 0) {
J
Joao Moreno 已提交
470 471
				return;
			}
J
Joao Moreno 已提交
472 473 474 475 476 477 478 479 480 481 482 483 484

			const uri = result[0];

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

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

			path = uri.fsPath;
J
Joao Moreno 已提交
485 486
		}

J
Joao Moreno 已提交
487 488
		await this.git.init(path);
		await this.model.tryOpenRepository(path);
J
Joao Moreno 已提交
489 490
	}

J
Joao Moreno 已提交
491 492 493 494 495
	@command('git.close', { repository: true })
	async close(repository: Repository): Promise<void> {
		this.model.close(repository);
	}

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

500
		let uris: Uri[] | undefined;
501 502 503

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
504
				uris = [Uri.file(fromGitUri(arg).path)];
505
			} else if (arg.scheme === 'file') {
506
				uris = [arg];
507 508 509 510 511 512
			}
		} else {
			let resource = arg;

			if (!(resource instanceof Resource)) {
				// can happen when called from a keybinding
513
				resource = this.getSCMResource();
514 515 516
			}

			if (resource) {
J
Joao Moreno 已提交
517 518 519 520
				const resources = ([resource, ...resourceStates] as Resource[])
					.filter(r => r.type !== Status.DELETED && r.type !== Status.INDEX_DELETED);

				uris = resources.map(r => r.resourceUri);
521
			}
J
Joao Moreno 已提交
522 523
		}

524
		if (!uris) {
J
Joao Moreno 已提交
525
			return;
J
Joao Moreno 已提交
526 527
		}

528 529 530 531
		const preview = uris.length === 1 ? true : false;
		const activeTextEditor = window.activeTextEditor;
		for (const uri of uris) {
			const opts: TextDocumentShowOptions = {
J
Joao Moreno 已提交
532
				preserveFocus,
533
				preview,
534
				viewColumn: ViewColumn.Active
535 536
			};

537 538 539
			// 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) {
B
Benjamin Pasero 已提交
540 541 542
				opts.selection = activeTextEditor.selection;
			}

543
			await commands.executeCommand<void>('vscode.open', uri, opts);
J
Joao Moreno 已提交
544
		}
J
Joao Moreno 已提交
545 546
	}

J
Joao Moreno 已提交
547 548 549 550 551
	@command('git.openFile2')
	async openFile2(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
		this.openFile(arg, ...resourceStates);
	}

J
Joao Moreno 已提交
552 553
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
554 555 556 557 558
		let resource: Resource | undefined = undefined;

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
559
			resource = this.getSCMResource(arg);
D
Duroktar 已提交
560
		} else {
561
			resource = this.getSCMResource();
D
Duroktar 已提交
562 563 564 565 566 567
		}

		if (!resource) {
			return;
		}

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

J
Joao Moreno 已提交
570 571 572
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
573
		}
J
Joao Moreno 已提交
574 575

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

J
Joao Moreno 已提交
578 579
	@command('git.openChange')
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
580
		const preserveFocus = arg instanceof Resource;
J
Joao 已提交
581
		const preserveSelection = arg instanceof Uri || !arg;
582
		let resources: Resource[] | undefined = undefined;
583

584
		if (arg instanceof Uri) {
585
			const resource = this.getSCMResource(arg);
586 587 588
			if (resource !== undefined) {
				resources = [resource];
			}
589
		} else {
590
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
591

592 593 594
			if (arg instanceof Resource) {
				resource = arg;
			} else {
595
				resource = this.getSCMResource();
596 597 598 599 600
			}

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

603
		if (!resources) {
J
Joao Moreno 已提交
604
			return;
J
Joao Moreno 已提交
605
		}
J
Joao Moreno 已提交
606

607 608
		const preview = resources.length === 1 ? undefined : false;
		for (const resource of resources) {
J
Joao 已提交
609
			await this._openResource(resource, preview, preserveFocus, preserveSelection);
610
		}
J
Joao Moreno 已提交
611 612
	}

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

617 618
		resourceStates = resourceStates.filter(s => !!s);

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

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

624 625 626 627 628 629 630
			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

631
		const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
J
Joao Moreno 已提交
632 633 634 635 636 637 638 639 640 641 642 643 644 645
		const merge = selection.filter(s => s.resourceGroupType === ResourceGroupType.Merge);
		const bothModified = merge.filter(s => s.type === Status.BOTH_MODIFIED);
		const promises = bothModified.map(s => grep(s.resourceUri.fsPath, /^<{7}|^={7}|^>{7}/));
		const unresolvedBothModified = await Promise.all<boolean>(promises);
		const resolvedConflicts = bothModified.filter((s, i) => !unresolvedBothModified[i]);
		const unresolvedConflicts = [
			...merge.filter(s => s.type !== Status.BOTH_MODIFIED),
			...bothModified.filter((s, i) => unresolvedBothModified[i])
		];

		if (unresolvedConflicts.length > 0) {
			const message = unresolvedConflicts.length > 1
				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", unresolvedConflicts.length)
				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(unresolvedConflicts[0].resourceUri.fsPath));
646

647 648 649 650 651 652 653 654
			const yes = localize('yes', "Yes");
			const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
655 656
		const workingTree = selection.filter(s => s.resourceGroupType === ResourceGroupType.WorkingTree);
		const scmResources = [...workingTree, ...resolvedConflicts, ...unresolvedConflicts];
657

J
Joao Moreno 已提交
658
		this.outputChannel.appendLine(`git.stage.scmResources ${scmResources.length}`);
659
		if (!scmResources.length) {
J
Joao Moreno 已提交
660 661
			return;
		}
J
Joao Moreno 已提交
662

663
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
664
		await this.runByRepository(resources, async (repository, resources) => repository.add(resources));
J
Joao Moreno 已提交
665 666
	}

J
Joao Moreno 已提交
667 668
	@command('git.stageAll', { repository: true })
	async stageAll(repository: Repository): Promise<void> {
669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684
		const resources = repository.mergeGroup.resourceStates.filter(s => s instanceof Resource) as Resource[];
		const mergeConflicts = resources.filter(s => s.resourceGroupType === ResourceGroupType.Merge);

		if (mergeConflicts.length > 0) {
			const message = mergeConflicts.length > 1
				? localize('confirm stage files with merge conflicts', "Are you sure you want to stage {0} files with merge conflicts?", mergeConflicts.length)
				: localize('confirm stage file with merge conflicts', "Are you sure you want to stage {0} with merge conflicts?", path.basename(mergeConflicts[0].resourceUri.fsPath));

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

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

J
Joao Moreno 已提交
685
		await repository.add([]);
J
Joao Moreno 已提交
686 687
	}

J
Joao Moreno 已提交
688
	@command('git.stageChange')
J
Joao Moreno 已提交
689 690 691 692 693 694 695 696
	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 已提交
697 698
	}

J
Joao Moreno 已提交
699
	@command('git.stageSelectedRanges', { diff: true })
J
Joao Moreno 已提交
700
	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
701 702 703 704 705 706 707
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
708 709 710 711
		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 已提交
712

J
Joao Moreno 已提交
713
		if (!selectedChanges.length) {
J
Joao Moreno 已提交
714 715 716
			return;
		}

J
Joao Moreno 已提交
717 718
		await this._stageChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
719

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

J
Joao Moreno 已提交
724
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
725 726 727
			return;
		}

J
Joao Moreno 已提交
728
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
729
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
730
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
731

J
Joao Moreno 已提交
732
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
733
	}
J
Joao Moreno 已提交
734

J
Joao Moreno 已提交
735
	@command('git.revertChange')
J
Joao Moreno 已提交
736 737 738 739
	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 已提交
740 741 742
			return;
		}

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

J
Joao Moreno 已提交
746
	@command('git.revertSelectedRanges', { diff: true })
J
Joao Moreno 已提交
747
	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
748 749 750 751 752 753 754
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

		const modifiedDocument = textEditor.document;
J
Joao Moreno 已提交
755 756
		const selections = textEditor.selections;
		const selectedChanges = changes.filter(change => {
J
Joao Moreno 已提交
757
			const modifiedRange = getModifiedRange(modifiedDocument, change);
J
Joao Moreno 已提交
758 759 760 761
			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedChanges.length === changes.length) {
J
Joao Moreno 已提交
762 763 764
			return;
		}

J
Joao Moreno 已提交
765 766
		await this._revertChanges(textEditor, selectedChanges);
	}
J
Joao Moreno 已提交
767

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

J
Joao Moreno 已提交
772
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
773 774 775
			return;
		}

J
Joao Moreno 已提交
776 777
		const originalUri = toGitUri(modifiedUri, '~');
		const originalDocument = await workspace.openTextDocument(originalUri);
J
Joao Moreno 已提交
778 779 780 781 782 783 784 785 786
		const basename = path.basename(modifiedUri.fsPath);
		const message = localize('confirm revert', "Are you sure you want to revert the selected changes in {0}?", basename);
		const yes = localize('revert', "Revert Changes");
		const pick = await window.showWarningMessage(message, { modal: true }, yes);

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

J
Joao Moreno 已提交
787
		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
J
Joao Moreno 已提交
788 789 790
		const edit = new WorkspaceEdit();
		edit.replace(modifiedUri, new Range(new Position(0, 0), modifiedDocument.lineAt(modifiedDocument.lineCount - 1).range.end), result);
		workspace.applyEdit(edit);
J
Joao Moreno 已提交
791
		await modifiedDocument.save();
J
Joao Moreno 已提交
792 793
	}

J
Joao Moreno 已提交
794 795
	@command('git.unstage')
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
796 797
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
798
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
799
			const resource = this.getSCMResource();
800 801 802 803 804 805 806 807

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

811
		if (!scmResources.length) {
J
Joao Moreno 已提交
812 813 814
			return;
		}

815
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
816
		await this.runByRepository(resources, async (repository, resources) => repository.revert(resources));
J
Joao Moreno 已提交
817 818
	}

J
Joao Moreno 已提交
819 820
	@command('git.unstageAll', { repository: true })
	async unstageAll(repository: Repository): Promise<void> {
821
		await repository.revert([]);
J
Joao Moreno 已提交
822
	}
J
Joao Moreno 已提交
823

J
Joao Moreno 已提交
824 825
	@command('git.unstageSelectedRanges', { diff: true })
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
826 827 828 829 830 831 832 833 834
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

835 836 837 838 839 840 841
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
842 843 844
			return;
		}

J
Joao Moreno 已提交
845
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
846
		const originalDocument = await workspace.openTextDocument(originalUri);
847 848 849 850
		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 已提交
851 852 853 854 855

		if (!selectedDiffs.length) {
			return;
		}

856 857
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
858

J
Joao Moreno 已提交
859
		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
J
Joao Moreno 已提交
860 861
	}

J
Joao Moreno 已提交
862 863
	@command('git.clean')
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
864 865
		resourceStates = resourceStates.filter(s => !!s);

J
Joao Moreno 已提交
866
		if (resourceStates.length === 0 || (resourceStates[0] && !(resourceStates[0].resourceUri instanceof Uri))) {
867
			const resource = this.getSCMResource();
868 869 870 871 872 873 874 875

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

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

J
Joao Moreno 已提交
879
		if (!scmResources.length) {
J
Joao Moreno 已提交
880 881
			return;
		}
J
Joao Moreno 已提交
882

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

J
Joao Moreno 已提交
887
		if (scmResources.length === 1) {
J
Joao Moreno 已提交
888
			if (untrackedCount > 0) {
J
Joao Moreno 已提交
889
				message = localize('confirm delete', "Are you sure you want to DELETE {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
890 891
				yes = localize('delete file', "Delete file");
			} else {
J
Joao Moreno 已提交
892
				message = localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(scmResources[0].resourceUri.fsPath));
J
Joao Moreno 已提交
893 894
			}
		} else {
J
Joao Moreno 已提交
895
			message = localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", scmResources.length);
J
Joao Moreno 已提交
896 897 898 899 900

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

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

J
Joao Moreno 已提交
904 905 906 907
		if (pick !== yes) {
			return;
		}

J
Joao Moreno 已提交
908
		const resources = scmResources.map(r => r.resourceUri);
J
Joao Moreno 已提交
909
		await this.runByRepository(resources, async (repository, resources) => repository.clean(resources));
J
Joao Moreno 已提交
910
	}
J
Joao Moreno 已提交
911

J
Joao Moreno 已提交
912 913
	@command('git.cleanAll', { repository: true })
	async cleanAll(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
914
		let resources = repository.workingTreeGroup.resourceStates;
J
Joao Moreno 已提交
915 916 917 918 919

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

J
Joao Moreno 已提交
920 921
		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 已提交
922

J
Joao Moreno 已提交
923 924 925 926 927 928
		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 已提交
929
				: localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
930
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
931

J
Joao Moreno 已提交
932
			if (pick !== yes) {
J
Joao Moreno 已提交
933 934 935
				return;
			}

J
Joao 已提交
936
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
937 938 939 940 941 942 943 944
			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 已提交
945 946
			}

J
Joao 已提交
947
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
948 949 950 951
		} 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 已提交
952

J
Joao Moreno 已提交
953 954 955
			if (pick !== yes) {
				return;
			}
J
Joao Moreno 已提交
956

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

J
Joao Moreno 已提交
959 960 961 962
		} 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 已提交
963

J
Joao Moreno 已提交
964 965 966 967 968
			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 已提交
969

J
Joao Moreno 已提交
970
			const yesAll = localize('discardAll', "Discard All {0} Files", resources.length);
J
Joao Moreno 已提交
971 972 973 974 975 976 977 978
			const pick = await window.showWarningMessage(message, { modal: true }, yesTracked, yesAll);

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

J
Joao 已提交
979
			await repository.clean(resources.map(r => r.resourceUri));
J
Joao Moreno 已提交
980
		}
J
Joao Moreno 已提交
981 982
	}

J
Joao Moreno 已提交
983
	private async smartCommit(
J
Joao Moreno 已提交
984
		repository: Repository,
985
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
986 987
		opts?: CommitOptions
	): Promise<boolean> {
J
Joao Moreno 已提交
988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008
		const config = workspace.getConfiguration('git');
		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
					? localize('unsaved files single', "The following file is unsaved: {0}.\n\nWould you like to save it before comitting?", path.basename(unsavedTextDocuments[0].uri.fsPath))
					: localize('unsaved files', "There are {0} unsaved files.\n\nWould you like to save them before comitting?", unsavedTextDocuments.length);
				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
				}
1009 1010 1011
			}
		}

1012
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
1013
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
J
Joao Moreno 已提交
1014 1015
		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
1016 1017

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

J
Joao Moreno 已提交
1020 1021
			// 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?");
1022 1023 1024 1025 1026
			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 已提交
1027 1028 1029
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
1030 1031 1032
			}
		}

J
Joao Moreno 已提交
1033
		if (!opts) {
1034
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
1035 1036
		} else if (!opts.all && noStagedChanges) {
			opts = { ...opts, all: true };
J
Joao Moreno 已提交
1037 1038
		}

1039 1040 1041
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

J
Joao Moreno 已提交
1042 1043
		if (
			// no changes
1044
			(noStagedChanges && noUnstagedChanges)
J
Joao Moreno 已提交
1045
			// or no staged changes and not `all`
1046
			|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
1047
		) {
J
Joao Moreno 已提交
1048 1049 1050 1051
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
1052
		const message = await getCommitMessage();
J
Joao Moreno 已提交
1053 1054 1055 1056 1057

		if (!message) {
			return false;
		}

J
Joao Moreno 已提交
1058
		await repository.commit(message, opts);
J
Joao Moreno 已提交
1059 1060 1061 1062

		return true;
	}

J
Joao Moreno 已提交
1063
	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
J
Joao Moreno 已提交
1064
		const message = repository.inputBox.value;
J
Joao Moreno 已提交
1065
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
1066 1067 1068 1069
			if (message) {
				return message;
			}

1070 1071 1072 1073 1074 1075
			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 已提交
1076
			return await window.showInputBox({
1077
				value,
J
Joao Moreno 已提交
1078
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
1079 1080
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
1081
			});
J
Joao Moreno 已提交
1082 1083
		};

J
Joao Moreno 已提交
1084
		const didCommit = await this.smartCommit(repository, getCommitMessage, opts);
J
Joao Moreno 已提交
1085 1086

		if (message && didCommit) {
J
Joao Moreno 已提交
1087
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1088
		}
J
Joao Moreno 已提交
1089 1090
	}

J
Joao Moreno 已提交
1091
	@command('git.commit', { repository: true })
J
Joao Moreno 已提交
1092 1093
	async commit(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository);
J
Joao Moreno 已提交
1094 1095
	}

J
Joao Moreno 已提交
1096
	@command('git.commitWithInput', { repository: true })
J
Joao Moreno 已提交
1097
	async commitWithInput(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1098
		if (!repository.inputBox.value) {
J
Joao Moreno 已提交
1099 1100 1101
			return;
		}

J
Joao Moreno 已提交
1102
		const didCommit = await this.smartCommit(repository, async () => repository.inputBox.value);
J
Joao Moreno 已提交
1103 1104

		if (didCommit) {
J
Joao Moreno 已提交
1105
			repository.inputBox.value = await repository.getCommitTemplate();
J
Joao Moreno 已提交
1106
		}
J
Joao Moreno 已提交
1107 1108
	}

J
Joao Moreno 已提交
1109
	@command('git.commitStaged', { repository: true })
J
Joao Moreno 已提交
1110 1111
	async commitStaged(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false });
J
Joao Moreno 已提交
1112 1113
	}

J
Joao Moreno 已提交
1114
	@command('git.commitStagedSigned', { repository: true })
J
Joao Moreno 已提交
1115 1116
	async commitStagedSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: false, signoff: true });
J
Joao Moreno 已提交
1117 1118
	}

J
Joao Moreno 已提交
1119
	@command('git.commitStagedAmend', { repository: true })
J
Joao Moreno 已提交
1120
	async commitStagedAmend(repository: Repository): Promise<void> {
1121
		await this.commitWithAnyInput(repository, { all: false, amend: true });
K
Krzysztof Cieślak 已提交
1122 1123
	}

J
Joao Moreno 已提交
1124
	@command('git.commitAll', { repository: true })
J
Joao Moreno 已提交
1125 1126
	async commitAll(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true });
J
Joao Moreno 已提交
1127 1128
	}

J
Joao Moreno 已提交
1129
	@command('git.commitAllSigned', { repository: true })
J
Joao Moreno 已提交
1130 1131
	async commitAllSigned(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, signoff: true });
J
Joao Moreno 已提交
1132 1133
	}

J
Joao Moreno 已提交
1134
	@command('git.commitAllAmend', { repository: true })
J
Joao Moreno 已提交
1135 1136
	async commitAllAmend(repository: Repository): Promise<void> {
		await this.commitWithAnyInput(repository, { all: true, amend: true });
K
Krzysztof Cieślak 已提交
1137 1138
	}

J
Joao Moreno 已提交
1139
	@command('git.undoCommit', { repository: true })
J
Joao Moreno 已提交
1140 1141
	async undoCommit(repository: Repository): Promise<void> {
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1142 1143 1144 1145 1146

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

J
Joao Moreno 已提交
1147 1148
		const commit = await repository.getCommit('HEAD');
		await repository.reset('HEAD~');
J
Joao Moreno 已提交
1149
		repository.inputBox.value = commit.message;
J
Joao Moreno 已提交
1150 1151
	}

J
Joao Moreno 已提交
1152
	@command('git.checkout', { repository: true })
J
Joao Moreno 已提交
1153
	async checkout(repository: Repository, treeish: string): Promise<void> {
J
Joao Moreno 已提交
1154
		if (typeof treeish === 'string') {
J
Joao Moreno 已提交
1155
			return await repository.checkout(treeish);
J
Joao Moreno 已提交
1156 1157
		}

J
Joao Moreno 已提交
1158
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1159
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
1160 1161 1162
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1163
		const createBranch = new CreateBranchItem(this);
J
Joao Moreno 已提交
1164

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

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

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

J
Joao Moreno 已提交
1174
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
1175
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
1176
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
1177 1178 1179 1180 1181

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1182
		await choice.run(repository);
J
Joao Moreno 已提交
1183 1184
	}

J
Joao Moreno 已提交
1185
	@command('git.branch', { repository: true })
J
Joao Moreno 已提交
1186
	async branch(repository: Repository): Promise<void> {
J
Joao Moreno 已提交
1187
		const result = await window.showInputBox({
J
Joao Moreno 已提交
1188
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
1189 1190
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
1191
		});
J
Joao Moreno 已提交
1192

J
Joao Moreno 已提交
1193 1194 1195
		if (!result) {
			return;
		}
J
Joao Moreno 已提交
1196

J
Joao Moreno 已提交
1197
		const name = result.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
J
Joao Moreno 已提交
1198
		await repository.branch(name);
J
Joao Moreno 已提交
1199 1200
	}

J
Joao Moreno 已提交
1201
	@command('git.deleteBranch', { repository: true })
J
Joao Moreno 已提交
1202
	async deleteBranch(repository: Repository, name: string, force?: boolean): Promise<void> {
1203 1204
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
J
Joao Moreno 已提交
1205
			run = force => repository.deleteBranch(name, force);
1206
		} else {
J
Joao Moreno 已提交
1207 1208
			const currentHead = repository.HEAD && repository.HEAD.name;
			const heads = repository.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
1209
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
1210

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

M
Maik Riechert 已提交
1214
			if (!choice || !choice.branchName) {
1215 1216
				return;
			}
M
Maik Riechert 已提交
1217
			name = choice.branchName;
J
Joao Moreno 已提交
1218
			run = force => choice.run(repository, force);
M
Maik Riechert 已提交
1219 1220
		}

1221 1222 1223 1224 1225 1226 1227 1228 1229
		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");
1230
			const pick = await window.showWarningMessage(message, { modal: true }, yes);
1231 1232 1233 1234 1235

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

1238 1239
	@command('git.renameBranch', { repository: true })
	async renameBranch(repository: Repository): Promise<void> {
J
Justin Horner 已提交
1240 1241 1242 1243 1244 1245 1246 1247
		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 {
1248
			await repository.renameBranch(name);
J
Justin Horner 已提交
1249 1250 1251
		} catch (err) {
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
1252 1253
					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
					return;
J
Justin Horner 已提交
1254
				case GitErrorCodes.BranchAlreadyExists:
J
Joao Moreno 已提交
1255
					window.showErrorMessage(localize('branch already exists', "A branch named '{0}' already exists", name));
1256 1257 1258
					return;
				default:
					throw err;
J
Justin Horner 已提交
1259 1260 1261 1262
			}
		}
	}

J
Joao Moreno 已提交
1263
	@command('git.merge', { repository: true })
J
Joao Moreno 已提交
1264
	async merge(repository: Repository): Promise<void> {
1265 1266 1267 1268
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
1269
		const heads = repository.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
1270 1271
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1272

J
Joao Moreno 已提交
1273
		const remoteHeads = (includeRemotes ? repository.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
1274 1275
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
1276 1277

		const picks = [...heads, ...remoteHeads];
1278 1279
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
1280 1281 1282 1283 1284

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1285
		try {
J
Joao Moreno 已提交
1286
			await choice.run(repository);
J
Joao Moreno 已提交
1287 1288 1289 1290 1291 1292 1293 1294
		} catch (err) {
			if (err.gitErrorCode !== GitErrorCodes.Conflict) {
				throw err;
			}

			const message = localize('merge conflicts', "There are merge conflicts. Resolve them before committing.");
			await window.showWarningMessage(message);
		}
1295 1296
	}

J
Joao Moreno 已提交
1297
	@command('git.createTag', { repository: true })
J
Joao Moreno 已提交
1298
	async createTag(repository: Repository): Promise<void> {
1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310
		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 已提交
1311
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
1312 1313 1314 1315 1316
			ignoreFocusOut: true
		});

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

J
Joao Moreno 已提交
1320 1321 1322 1323 1324 1325 1326 1327 1328 1329
	@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;
		}

		await repository.fetch();
	}

J
Joao Moreno 已提交
1330
	@command('git.pullFrom', { repository: true })
J
Joao Moreno 已提交
1331 1332
	async pullFrom(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
1333 1334 1335 1336 1337 1338

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

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

D
Dozed12 已提交
1343
		if (!remotePick) {
1344 1345 1346
			return;
		}

D
Dozed12 已提交
1347 1348
		const remoteRefs = repository.refs;
		const remoteRefsFiltered = remoteRefs.filter(r => (r.remote === remotePick.label));
J
Joao Moreno 已提交
1349
		const branchPicks = remoteRefsFiltered.map(r => ({ label: r.name })) as { label: string; description: string }[];
D
Dozed12 已提交
1350
		const branchPick = await window.showQuickPick(branchPicks, { placeHolder });
1351

D
Dozed12 已提交
1352
		if (!branchPick) {
1353 1354 1355
			return;
		}

F
Francisco Moreira 已提交
1356 1357
		const remoteCharCnt = remotePick.label.length;

J
Joao Moreno 已提交
1358
		repository.pullFrom(false, remotePick.label, branchPick.label.slice(remoteCharCnt + 1));
1359 1360
	}

J
Joao Moreno 已提交
1361
	@command('git.pull', { repository: true })
J
Joao Moreno 已提交
1362 1363
	async pull(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1364 1365 1366 1367 1368 1369

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

J
Joao Moreno 已提交
1370
		await repository.pull(repository.HEAD);
J
Joao Moreno 已提交
1371 1372
	}

J
Joao Moreno 已提交
1373
	@command('git.pullRebase', { repository: true })
J
Joao Moreno 已提交
1374 1375
	async pullRebase(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1376 1377 1378 1379 1380 1381

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

J
Joao Moreno 已提交
1382
		await repository.pullWithRebase(repository.HEAD);
J
Joao Moreno 已提交
1383 1384
	}

J
Joao Moreno 已提交
1385
	@command('git.push', { repository: true })
J
Joao Moreno 已提交
1386 1387
	async push(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1388 1389 1390 1391 1392 1393

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

1394 1395 1396 1397 1398 1399
		if (!repository.HEAD || !repository.HEAD.name) {
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

		try {
J
Joao Moreno 已提交
1400
			await repository.push(repository.HEAD);
1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414
		} catch (err) {
			if (err.gitErrorCode !== GitErrorCodes.NoUpstreamBranch) {
				throw err;
			}

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

			if (pick === yes) {
				await this.publish(repository);
			}
		}
J
Joao Moreno 已提交
1415 1416
	}

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

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

J
Joao Moreno 已提交
1426
		await repository.pushTags();
1427 1428 1429 1430

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

J
Joao Moreno 已提交
1431
	@command('git.pushTo', { repository: true })
J
Joao Moreno 已提交
1432 1433
	async pushTo(repository: Repository): Promise<void> {
		const remotes = repository.remotes;
J
Joao Moreno 已提交
1434 1435 1436 1437 1438 1439

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

J
Joao Moreno 已提交
1440
		if (!repository.HEAD || !repository.HEAD.name) {
J
Joao Moreno 已提交
1441 1442 1443 1444
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

J
Joao Moreno 已提交
1445
		const branchName = repository.HEAD.name;
1446
		const picks = remotes.filter(r => r.pushUrl !== undefined).map(r => ({ label: r.name, description: r.pushUrl! }));
J
Joao Moreno 已提交
1447 1448 1449 1450 1451 1452 1453
		const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
		const pick = await window.showQuickPick(picks, { placeHolder });

		if (!pick) {
			return;
		}

J
Joao Moreno 已提交
1454
		repository.pushTo(pick.label, branchName);
J
Joao Moreno 已提交
1455 1456
	}

J
Joao Moreno 已提交
1457
	private async _sync(repository: Repository, rebase: boolean): Promise<void> {
J
Joao Moreno 已提交
1458
		const HEAD = repository.HEAD;
J
Joao Moreno 已提交
1459 1460 1461 1462 1463

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

J
Joao Moreno 已提交
1464 1465 1466 1467
		const remoteName = HEAD.remote || HEAD.upstream.remote;
		const remote = repository.remotes.find(r => r.name === remoteName);
		const isReadonly = remote && remote.isReadOnly;

J
Joao Moreno 已提交
1468
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
1469
		const shouldPrompt = !isReadonly && config.get<boolean>('confirmSync') === true;
J
Joao Moreno 已提交
1470 1471

		if (shouldPrompt) {
J
Joao Moreno 已提交
1472
			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 已提交
1473
			const yes = localize('ok', "OK");
B
Benjamin Pasero 已提交
1474
			const neverAgain = localize('never again', "OK, Don't Show Again");
J
Joao Moreno 已提交
1475 1476 1477 1478 1479 1480 1481 1482 1483
			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 已提交
1484
		if (rebase) {
J
Joao Moreno 已提交
1485
			await repository.syncRebase(HEAD);
J
Joao Moreno 已提交
1486
		} else {
J
Joao Moreno 已提交
1487
			await repository.sync(HEAD);
J
Joao Moreno 已提交
1488 1489 1490 1491 1492 1493
		}
	}

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

J
Joao 已提交
1496 1497 1498 1499 1500 1501 1502 1503 1504
	@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 已提交
1505
			await repository.sync(HEAD);
J
Joao 已提交
1506 1507 1508
		}));
	}

1509
	@command('git.syncRebase', { repository: true })
J
Joao Moreno 已提交
1510 1511
	syncRebase(repository: Repository): Promise<void> {
		return this._sync(repository, true);
J
Joao Moreno 已提交
1512 1513
	}

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

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

J
Joao Moreno 已提交
1523
		const branchName = repository.HEAD && repository.HEAD.name || '';
M
Markus Wolf 已提交
1524 1525 1526 1527 1528 1529
		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 已提交
1530 1531 1532 1533 1534

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1535
		await repository.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1536 1537
	}

1538 1539
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
1540 1541
		resourceStates = resourceStates.filter(s => !!s);

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

1545
			if (!resource) {
J
Joao Moreno 已提交
1546 1547 1548
				return;
			}

1549
			resourceStates = [resource];
J
Joao Moreno 已提交
1550 1551
		}

1552
		const resources = resourceStates
J
Joao Moreno 已提交
1553 1554 1555
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

1556
		if (!resources.length) {
N
NKumar2 已提交
1557 1558 1559
			return;
		}

1560
		await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
N
NKumar2 已提交
1561 1562
	}

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

1567
		if (noUnstagedChanges && noStagedChanges) {
K
Krzysztof Cieślak 已提交
1568 1569 1570
			window.showInformationMessage(localize('no changes stash', "There are no changes to stash."));
			return;
		}
J
Joao Moreno 已提交
1571

1572
		const message = await this.getStashMessage();
J
Joao Moreno 已提交
1573 1574 1575 1576 1577

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

J
Joao Moreno 已提交
1578
		await repository.createStash(message, includeUntracked);
K
Krzysztof Cieślak 已提交
1579 1580
	}

1581 1582 1583 1584 1585 1586 1587
	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 已提交
1588 1589 1590 1591 1592 1593 1594 1595 1596 1597
	@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 已提交
1598
	@command('git.stashPop', { repository: true })
J
Joao Moreno 已提交
1599 1600
	async stashPop(repository: Repository): Promise<void> {
		const stashes = await repository.getStashes();
J
Joao Moreno 已提交
1601 1602

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1603 1604 1605 1606
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1607 1608
		const picks = stashes.map(r => ({ label: `#${r.index}:  ${r.description}`, description: '', details: '', id: r.index }));
		const placeHolder = localize('pick stash to pop', "Pick a stash to pop");
K
Krzysztof Cieślak 已提交
1609 1610 1611 1612 1613
		const choice = await window.showQuickPick(picks, { placeHolder });

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

J
Joao Moreno 已提交
1615
		await repository.popStash(choice.id);
K
Krzysztof Cieślak 已提交
1616 1617
	}

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

		if (stashes.length === 0) {
K
Krzysztof Cieślak 已提交
1623 1624 1625 1626
			window.showInformationMessage(localize('no stashes', "There are no stashes to restore."));
			return;
		}

J
Joao Moreno 已提交
1627
		await repository.popStash();
J
Joao Moreno 已提交
1628
	}
K
Krzysztof Cieślak 已提交
1629

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

J
Joao Moreno 已提交
1634
			if (!options.repository) {
J
Joao Moreno 已提交
1635 1636
				result = Promise.resolve(method.apply(this, args));
			} else {
J
Joao Moreno 已提交
1637 1638
				// try to guess the repository based on the first argument
				const repository = this.model.getRepository(args[0]);
J
Joao Moreno 已提交
1639 1640 1641 1642 1643 1644 1645 1646 1647
				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();
				}
1648

J
Joao Moreno 已提交
1649
				result = repositoryPromise.then(repository => {
J
Joao Moreno 已提交
1650
					if (!repository) {
J
Joao 已提交
1651
						return Promise.resolve();
J
Joao Moreno 已提交
1652 1653
					}

J
Joao Moreno 已提交
1654
					return Promise.resolve(method.apply(this, [repository, ...args]));
J
Joao Moreno 已提交
1655
				});
J
Joao Moreno 已提交
1656 1657
			}

K
kieferrm 已提交
1658
			/* __GDPR__
K
kieferrm 已提交
1659 1660 1661 1662
				"git.command" : {
					"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
				}
			*/
J
Joao Moreno 已提交
1663 1664
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1665
			return result.catch(async err => {
J
Joao Moreno 已提交
1666 1667 1668 1669
				const options: MessageOptions = {
					modal: err.gitErrorCode === GitErrorCodes.DirtyWorkTree
				};

J
Joao Moreno 已提交
1670 1671 1672
				let message: string;

				switch (err.gitErrorCode) {
1673
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1674 1675
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1676
					case GitErrorCodes.PushRejected:
J
Joao Moreno 已提交
1677
						message = localize('cant push', "Can't push refs to remote. Try running 'Pull' first to integrate your changes.");
1678
						break;
J
Joao Moreno 已提交
1679
					default:
1680 1681 1682
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1683
							.split(/[\r\n]/)
J
João Moreno 已提交
1684
							.filter((line: string) => !!line)
1685 1686 1687 1688 1689
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1690 1691 1692 1693 1694 1695 1696 1697 1698

						break;
				}

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

J
Joao Moreno 已提交
1699 1700
				options.modal = true;

J
Joao Moreno 已提交
1701 1702
				const outputChannel = this.outputChannel as OutputChannel;
				const openOutputChannelChoice = localize('open git log', "Open Git Log");
J
Joao Moreno 已提交
1703
				const choice = await window.showErrorMessage(message, options, openOutputChannelChoice);
J
Joao Moreno 已提交
1704 1705 1706 1707 1708 1709

				if (choice === openOutputChannelChoice) {
					outputChannel.show();
				}
			});
		};
1710 1711

		// patch this object, so people can call methods directly
1712
		(this as any)[key] = result;
1713 1714

		return result;
J
Joao Moreno 已提交
1715 1716
	}

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

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

J
Joao Moreno 已提交
1722
		if (!uri) {
1723
			return undefined;
J
Joao Moreno 已提交
1724 1725 1726
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1727 1728
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1729 1730 1731 1732
		}

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

J
Joao Moreno 已提交
1735
			if (!repository) {
1736 1737
				return undefined;
			}
J
Joao Moreno 已提交
1738

J
Joao Moreno 已提交
1739 1740
			return repository.workingTreeGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0]
				|| repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1741 1742 1743
		}
	}

J
Joao Moreno 已提交
1744
	private runByRepository<T>(resource: Uri, fn: (repository: Repository, resource: Uri) => Promise<T>): Promise<T[]>;
J
Joao Moreno 已提交
1745 1746 1747 1748 1749 1750
	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) => {
1751
			let repository = this.model.getRepository(resource);
J
Joao Moreno 已提交
1752 1753 1754 1755 1756 1757

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

1758
			// Could it be a submodule?
1759
			if (pathEquals(resource.fsPath, repository.root)) {
1760 1761 1762
				repository = this.model.getRepositoryForSubmodule(resource) || repository;
			}

J
Joao Moreno 已提交
1763
			const tuple = result.filter(p => p.repository === repository)[0];
J
Joao Moreno 已提交
1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779

			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 已提交
1780 1781 1782
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
João Moreno 已提交
1783
}