commands.ts 34.1 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';

J
Joao Moreno 已提交
8
import { Uri, commands, scm, Disposable, window, workspace, QuickPickItem, OutputChannel, Range, WorkspaceEdit, Position, LineChange, SourceControlResourceState, TextDocumentShowOptions, ViewColumn } from 'vscode';
J
Joao Moreno 已提交
9
import { Ref, RefType, Git, GitErrorCodes, Branch } from './git';
10
import { Model, Resource, Status, CommitOptions, WorkingTreeGroup, IndexGroup, MergeGroup } from './model';
J
Joao Moreno 已提交
11
import { toGitUri, fromGitUri } from './uri';
12
import { applyLineChanges, intersectDiffWithRange, toLineRanges, invertLineChange } from './staging';
J
Joao Moreno 已提交
13
import * as path from 'path';
J
Joao Moreno 已提交
14
import * as os from 'os';
J
Joao Moreno 已提交
15
import TelemetryReporter from 'vscode-extension-telemetry';
J
Joao Moreno 已提交
16 17 18
import * as nls from 'vscode-nls';

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

J
Joao Moreno 已提交
20 21 22 23 24 25 26
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 已提交
27
	constructor(protected ref: Ref) { }
J
Joao Moreno 已提交
28 29 30 31 32 33 34 35 36 37 38 39 40 41

	async run(model: Model): Promise<void> {
		const ref = this.treeish;

		if (!ref) {
			return;
		}

		await model.checkout(ref);
	}
}

class CheckoutTagItem extends CheckoutItem {

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

class CheckoutRemoteHeadItem extends CheckoutItem {

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

	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 已提交
63 64
class BranchDeleteItem implements QuickPickItem {

65 66 67
	private get shortCommit(): string { return (this.ref.commit || '').substr(0, 8); }
	get branchName(): string | undefined { return this.ref.name; }
	get label(): string { return this.branchName || ''; }
M
Maik Riechert 已提交
68 69
	get description(): string { return this.shortCommit; }

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

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

80 81 82 83 84 85
class MergeItem implements QuickPickItem {

	get label(): string { return this.ref.name || ''; }
	get description(): string { return this.ref.name || ''; }

	constructor(protected ref: Ref) { }
J
Joao Moreno 已提交
86 87

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

J
Joao Moreno 已提交
92 93 94 95 96 97 98 99 100 101
class CreateBranchItem implements QuickPickItem {

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

	async run(model: Model): Promise<void> {
		await commands.executeCommand('git.branch');
	}
}

102 103 104 105 106 107 108 109 110
interface Command {
	commandId: string;
	key: string;
	method: Function;
	skipModelCheck: boolean;
	requiresDiffInformation: boolean;
}

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

112
function command(commandId: string, skipModelCheck = false, requiresDiffInformation = false): Function {
J
Joao Moreno 已提交
113
	return (target: any, key: string, descriptor: any) => {
J
Joao Moreno 已提交
114 115 116 117
		if (!(typeof descriptor.value === 'function')) {
			throw new Error('not supported');
		}

118
		Commands.push({ commandId, key, method: descriptor.value, skipModelCheck, requiresDiffInformation });
J
Joao Moreno 已提交
119 120
	};
}
J
Joao Moreno 已提交
121

J
Joao Moreno 已提交
122
export class CommandCenter {
J
Joao Moreno 已提交
123

J
Joao Moreno 已提交
124
	private model: Model;
J
Joao Moreno 已提交
125
	private disposables: Disposable[];
J
Joao Moreno 已提交
126

J
Joao Moreno 已提交
127
	constructor(
J
Joao Moreno 已提交
128
		private git: Git,
J
Joao Moreno 已提交
129
		model: Model | undefined,
J
Joao Moreno 已提交
130 131
		private outputChannel: OutputChannel,
		private telemetryReporter: TelemetryReporter
J
Joao Moreno 已提交
132
	) {
J
Joao Moreno 已提交
133 134 135 136
		if (model) {
			this.model = model;
		}

J
Joao Moreno 已提交
137
		this.disposables = Commands
138 139 140 141 142 143 144 145 146
			.map(({ commandId, key, method, skipModelCheck, requiresDiffInformation }) => {
				const command = this.createCommand(commandId, key, method, skipModelCheck);

				if (requiresDiffInformation) {
					return commands.registerDiffInformationCommand(commandId, command);
				} else {
					return commands.registerCommand(commandId, command);
				}
			});
J
Joao Moreno 已提交
147 148
	}

J
Joao Moreno 已提交
149
	@command('git.refresh')
J
Joao Moreno 已提交
150
	async refresh(): Promise<void> {
J
Joao Moreno 已提交
151
		await this.model.status();
J
Joao Moreno 已提交
152
	}
J
Joao Moreno 已提交
153

J
Joao Moreno 已提交
154 155 156 157 158
	@command('git.openResource')
	async openResource(resource: Resource): Promise<void> {
		await this._openResource(resource);
	}

159
	private async _openResource(resource: Resource, preview?: boolean): Promise<void> {
J
Joao Moreno 已提交
160 161 162 163
		const left = this.getLeftResource(resource);
		const right = this.getRightResource(resource);
		const title = this.getTitle(resource);

J
Joao Moreno 已提交
164 165 166 167 168
		if (!right) {
			// TODO
			console.error('oh no');
			return;
		}
J
Joao Moreno 已提交
169

J
Joao Moreno 已提交
170
		const opts: TextDocumentShowOptions = {
171 172
			preserveFocus: true,
			preview: preview,
J
Joao Moreno 已提交
173
			viewColumn: window.activeTextEditor && window.activeTextEditor.viewColumn || ViewColumn.One
J
Joao Moreno 已提交
174 175
		};

J
Joao Moreno 已提交
176 177 178 179 180 181
		const activeTextEditor = window.activeTextEditor;

		if (activeTextEditor && activeTextEditor.document.uri.toString() === right.toString()) {
			opts.selection = activeTextEditor.selection;
		}

182 183 184 185 186 187
		if (!left) {
			const document = await workspace.openTextDocument(right);
			await window.showTextDocument(document, opts);
			return;
		}

J
Joao Moreno 已提交
188
		return await commands.executeCommand<void>('vscode.diff', left, right, title, opts);
J
Joao Moreno 已提交
189 190 191 192 193 194
	}

	private getLeftResource(resource: Resource): Uri | undefined {
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
195
				return toGitUri(resource.original, 'HEAD');
J
Joao Moreno 已提交
196 197

			case Status.MODIFIED:
J
Joao Moreno 已提交
198
				return toGitUri(resource.resourceUri, '~');
199 200 201

			case Status.DELETED_BY_THEM:
				return toGitUri(resource.resourceUri, '');
J
Joao Moreno 已提交
202
		}
J
Joao Moreno 已提交
203
	}
J
Joao Moreno 已提交
204

J
Joao Moreno 已提交
205 206 207 208 209 210
	private getRightResource(resource: Resource): Uri | undefined {
		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_ADDED:
			case Status.INDEX_COPIED:
			case Status.INDEX_RENAMED:
J
Joao Moreno 已提交
211
				return toGitUri(resource.resourceUri, '');
J
Joao Moreno 已提交
212 213

			case Status.INDEX_DELETED:
214
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
215
			case Status.DELETED:
J
Joao Moreno 已提交
216
				return toGitUri(resource.resourceUri, 'HEAD');
J
Joao Moreno 已提交
217 218 219 220

			case Status.MODIFIED:
			case Status.UNTRACKED:
			case Status.IGNORED:
J
Joao Moreno 已提交
221 222
				const uriString = resource.resourceUri.toString();
				const [indexStatus] = this.model.indexGroup.resources.filter(r => r.resourceUri.toString() === uriString);
J
Joao Moreno 已提交
223

J
Joao Moreno 已提交
224 225
				if (indexStatus && indexStatus.renameResourceUri) {
					return indexStatus.renameResourceUri;
J
Joao Moreno 已提交
226 227
				}

J
Joao Moreno 已提交
228
				return resource.resourceUri;
J
Joao Moreno 已提交
229

230
			case Status.BOTH_ADDED:
J
Joao Moreno 已提交
231
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
232
				return resource.resourceUri;
J
Joao Moreno 已提交
233 234 235 236
		}
	}

	private getTitle(resource: Resource): string {
J
Joao Moreno 已提交
237
		const basename = path.basename(resource.resourceUri.fsPath);
J
Joao Moreno 已提交
238 239 240 241

		switch (resource.type) {
			case Status.INDEX_MODIFIED:
			case Status.INDEX_RENAMED:
M
Marc Kassay 已提交
242
			case Status.DELETED_BY_THEM:
J
Joao Moreno 已提交
243 244 245
				return `${basename} (Index)`;

			case Status.MODIFIED:
M
Marc Kassay 已提交
246 247
			case Status.BOTH_ADDED:
			case Status.BOTH_MODIFIED:
J
Joao Moreno 已提交
248 249 250 251 252 253
				return `${basename} (Working Tree)`;
		}

		return '';
	}

254 255
	@command('git.clone', true)
	async clone(): Promise<void> {
J
Joao Moreno 已提交
256
		const url = await window.showInputBox({
J
Joao Moreno 已提交
257 258
			prompt: localize('repourl', "Repository URL"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
259 260 261
		});

		if (!url) {
262 263
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_URL' });
			return;
J
Joao Moreno 已提交
264 265
		}

266
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
267
		const value = config.get<string>('defaultCloneDirectory') || os.homedir();
268

J
Joao Moreno 已提交
269 270
		const parentPath = await window.showInputBox({
			prompt: localize('parent', "Parent Directory"),
J
Joao Moreno 已提交
271
			value,
J
Joao Moreno 已提交
272
			ignoreFocusOut: true
J
Joao Moreno 已提交
273 274 275
		});

		if (!parentPath) {
276 277
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'no_directory' });
			return;
J
Joao Moreno 已提交
278 279
		}

J
Joao Moreno 已提交
280
		const clonePromise = this.git.clone(url, parentPath);
J
Joao Moreno 已提交
281 282
		window.setStatusBarMessage(localize('cloning', "Cloning git repository..."), clonePromise);

283
		try {
284 285 286 287 288 289 290 291 292 293
			const repositoryPath = await clonePromise;

			const open = localize('openrepo', "Open Repository");
			const result = await window.showInformationMessage(localize('proposeopen', "Would you like to open the cloned repository?"), open);

			const openFolder = result === open;
			this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'success' }, { openFolder: openFolder ? 1 : 0 });
			if (openFolder) {
				commands.executeCommand('vscode.openFolder', Uri.file(repositoryPath));
			}
294 295
		} catch (err) {
			if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
296 297 298
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'directory_not_empty' });
			} else {
				this.telemetryReporter.sendTelemetryEvent('clone', { outcome: 'error' });
299 300
			}
			throw err;
J
Joao Moreno 已提交
301 302 303
		}
	}

J
Joao Moreno 已提交
304 305 306 307 308
	@command('git.init')
	async init(): Promise<void> {
		await this.model.init();
	}

J
Joao Moreno 已提交
309
	@command('git.openFile')
310 311
	async openFile(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
		let uris: Uri[] | undefined;
312 313 314

		if (arg instanceof Uri) {
			if (arg.scheme === 'git') {
315
				uris = [Uri.file(fromGitUri(arg).path)];
316
			} else if (arg.scheme === 'file') {
317
				uris = [arg];
318 319 320 321 322 323 324 325 326 327
			}
		} else {
			let resource = arg;

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

			if (resource) {
328
				uris = [...resourceStates.map(r => r.resourceUri), resource.resourceUri];
329
			}
J
Joao Moreno 已提交
330 331
		}

332
		if (!uris) {
J
Joao Moreno 已提交
333
			return;
J
Joao Moreno 已提交
334 335
		}

336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355
		const preview = uris.length === 1 ? true : false;
		const activeTextEditor = window.activeTextEditor;
		for (const uri of uris) {
			// If the active editor matches the current uri, get its selection
			const selections = activeTextEditor && activeTextEditor.document.uri.toString() === uri.toString()
				? activeTextEditor.selections
				: undefined;

			const opts: TextDocumentShowOptions = {
				preserveFocus: true,
				preview: preview,
				viewColumn: activeTextEditor && activeTextEditor.viewColumn || ViewColumn.One
			};

			const document = await workspace.openTextDocument(uri);
			await window.showTextDocument(document, opts);

			if (selections && window.activeTextEditor) {
				window.activeTextEditor.selections = selections;
			}
J
Joao Moreno 已提交
356
		}
J
Joao Moreno 已提交
357 358
	}

J
Joao Moreno 已提交
359 360
	@command('git.openHEADFile')
	async openHEADFile(arg?: Resource | Uri): Promise<void> {
D
Duroktar 已提交
361 362 363 364 365 366 367 368 369 370 371 372 373 374
		let resource: Resource | undefined = undefined;

		if (arg instanceof Resource) {
			resource = arg;
		} else if (arg instanceof Uri) {
			resource = this.getSCMResource(arg);
		} else {
			resource = this.getSCMResource();
		}

		if (!resource) {
			return;
		}

J
Joao Moreno 已提交
375
		const HEAD = this.getLeftResource(resource);
D
Duroktar 已提交
376

J
Joao Moreno 已提交
377 378 379
		if (!HEAD) {
			window.showWarningMessage(localize('HEAD not available', "HEAD version of '{0}' is not available.", path.basename(resource.resourceUri.fsPath)));
			return;
D
Duroktar 已提交
380
		}
J
Joao Moreno 已提交
381 382

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

J
Joao Moreno 已提交
385
	@command('git.openChange')
386 387
	async openChange(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
		let resources: Resource[] | undefined = undefined;
388

389 390 391 392 393 394 395 396
		if (arg instanceof Uri) {
			const resource = this.getSCMResource(arg);
			if (resource !== undefined) {
				resources = [resource];
			}
		}
		else {
			let resource: Resource | undefined = undefined;
J
Joao Moreno 已提交
397

398 399 400 401 402 403 404 405 406
			if (arg instanceof Resource) {
				resource = arg;
			} else {
				resource = this.getSCMResource();
			}

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

409
		if (!resources) {
J
Joao Moreno 已提交
410
			return;
J
Joao Moreno 已提交
411
		}
J
Joao Moreno 已提交
412

413 414 415 416
		const preview = resources.length === 1 ? undefined : false;
		for (const resource of resources) {
			await this._openResource(resource, preview);
		}
J
Joao Moreno 已提交
417 418
	}

J
Joao Moreno 已提交
419
	@command('git.stage')
420
	async stage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
421
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
422
			const resource = this.getSCMResource();
423 424 425 426 427 428 429 430

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

431 432 433
		const resources = resourceStates
			.filter(s => s instanceof Resource && (s.resourceGroup instanceof WorkingTreeGroup || s.resourceGroup instanceof MergeGroup)) as Resource[];

434
		if (!resources.length) {
J
Joao Moreno 已提交
435 436
			return;
		}
J
Joao Moreno 已提交
437

438
		return await this.model.add(...resources);
J
Joao Moreno 已提交
439 440
	}

J
Joao Moreno 已提交
441
	@command('git.stageAll')
J
Joao Moreno 已提交
442
	async stageAll(): Promise<void> {
J
Joao Moreno 已提交
443 444 445
		return await this.model.add();
	}

446 447
	@command('git.stageSelectedRanges', false, true)
	async stageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
448 449 450 451 452 453 454 455 456
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

J
Joao Moreno 已提交
457
		if (modifiedUri.scheme !== 'file') {
J
Joao Moreno 已提交
458 459 460
			return;
		}

J
Joao Moreno 已提交
461
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
462
		const originalDocument = await workspace.openTextDocument(originalUri);
463 464 465 466
		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 已提交
467 468 469 470 471

		if (!selectedDiffs.length) {
			return;
		}

472 473
		const result = applyLineChanges(originalDocument, modifiedDocument, selectedDiffs);

J
Joao Moreno 已提交
474
		await this.model.stage(modifiedUri, result);
J
Joao Moreno 已提交
475
	}
J
Joao Moreno 已提交
476

477 478
	@command('git.revertSelectedRanges', false, true)
	async revertSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
479 480 481 482 483 484 485 486 487 488 489 490 491
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

		if (modifiedUri.scheme !== 'file') {
			return;
		}

J
Joao Moreno 已提交
492
		const originalUri = toGitUri(modifiedUri, '~');
J
Joao Moreno 已提交
493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515
		const originalDocument = await workspace.openTextDocument(originalUri);
		const selections = textEditor.selections;
		const selectedDiffs = diffs.filter(diff => {
			const modifiedRange = diff.modifiedEndLineNumber === 0
				? new Range(modifiedDocument.lineAt(diff.modifiedStartLineNumber - 1).range.end, modifiedDocument.lineAt(diff.modifiedStartLineNumber).range.start)
				: new Range(modifiedDocument.lineAt(diff.modifiedStartLineNumber - 1).range.start, modifiedDocument.lineAt(diff.modifiedEndLineNumber - 1).range.end);

			return selections.every(selection => !selection.intersection(modifiedRange));
		});

		if (selectedDiffs.length === diffs.length) {
			return;
		}

		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;
		}

516
		const result = applyLineChanges(originalDocument, modifiedDocument, selectedDiffs);
J
Joao Moreno 已提交
517 518 519 520 521
		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 已提交
522
	@command('git.unstage')
523
	async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
524
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
525
			const resource = this.getSCMResource();
526 527 528 529 530 531 532 533

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

534 535 536
		const resources = resourceStates
			.filter(s => s instanceof Resource && s.resourceGroup instanceof IndexGroup) as Resource[];

537
		if (!resources.length) {
J
Joao Moreno 已提交
538 539 540
			return;
		}

541
		return await this.model.revertFiles(...resources);
J
Joao Moreno 已提交
542 543
	}

J
Joao Moreno 已提交
544
	@command('git.unstageAll')
J
Joao Moreno 已提交
545
	async unstageAll(): Promise<void> {
J
Joao Moreno 已提交
546
		return await this.model.revertFiles();
J
Joao Moreno 已提交
547
	}
J
Joao Moreno 已提交
548

549 550
	@command('git.unstageSelectedRanges', false, true)
	async unstageSelectedRanges(diffs: LineChange[]): Promise<void> {
J
Joao Moreno 已提交
551 552 553 554 555 556 557 558 559
		const textEditor = window.activeTextEditor;

		if (!textEditor) {
			return;
		}

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

560 561 562 563 564 565 566
		if (modifiedUri.scheme !== 'git') {
			return;
		}

		const { ref } = fromGitUri(modifiedUri);

		if (ref !== '') {
J
Joao Moreno 已提交
567 568 569
			return;
		}

J
Joao Moreno 已提交
570
		const originalUri = toGitUri(modifiedUri, 'HEAD');
J
Joao Moreno 已提交
571
		const originalDocument = await workspace.openTextDocument(originalUri);
572 573 574 575
		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 已提交
576 577 578 579 580

		if (!selectedDiffs.length) {
			return;
		}

581 582
		const invertedDiffs = selectedDiffs.map(invertLineChange);
		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
J
Joao Moreno 已提交
583 584 585 586

		await this.model.stage(modifiedUri, result);
	}

J
Joao Moreno 已提交
587
	@command('git.clean')
588
	async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
589
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
590
			const resource = this.getSCMResource();
591 592 593 594 595 596 597 598

			if (!resource) {
				return;
			}

			resourceStates = [resource];
		}

599 600 601
		const resources = resourceStates
			.filter(s => s instanceof Resource && s.resourceGroup instanceof WorkingTreeGroup) as Resource[];

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

606
		const message = resources.length === 1
J
Joao Moreno 已提交
607
			? localize('confirm discard', "Are you sure you want to discard changes in {0}?", path.basename(resources[0].resourceUri.fsPath))
608 609
			: localize('confirm discard multiple', "Are you sure you want to discard changes in {0} files?", resources.length);

610
		const yes = localize('discard', "Discard Changes");
J
Joao Moreno 已提交
611
		const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
612

J
Joao Moreno 已提交
613 614 615 616
		if (pick !== yes) {
			return;
		}

617
		await this.model.clean(...resources);
J
Joao Moreno 已提交
618
	}
J
Joao Moreno 已提交
619

J
Joao Moreno 已提交
620
	@command('git.cleanAll')
J
Joao Moreno 已提交
621
	async cleanAll(): Promise<void> {
622 623
		const message = localize('confirm discard all', "Are you sure you want to discard ALL changes? This is IRREVERSIBLE!");
		const yes = localize('discardAll', "Discard ALL Changes");
J
Joao Moreno 已提交
624
		const pick = await window.showWarningMessage(message, { modal: true }, yes);
J
Joao Moreno 已提交
625 626 627 628 629

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

J
Joao Moreno 已提交
630
		await this.model.clean(...this.model.workingTreeGroup.resources);
J
Joao Moreno 已提交
631 632
	}

J
Joao Moreno 已提交
633
	private async smartCommit(
634
		getCommitMessage: () => Promise<string | undefined>,
J
Joao Moreno 已提交
635 636
		opts?: CommitOptions
	): Promise<boolean> {
637 638
		const config = workspace.getConfiguration('git');
		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
639
		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
640
		const noStagedChanges = this.model.indexGroup.resources.length === 0;
641
		const noUnstagedChanges = this.model.workingTreeGroup.resources.length === 0;
642 643

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

J
Joao Moreno 已提交
646 647
			// 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?");
648 649 650 651 652
			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 已提交
653 654 655
				config.update('enableSmartCommit', true, true);
			} else if (pick !== yes) {
				return false; // do not commit on cancel
656 657 658
			}
		}

J
Joao Moreno 已提交
659
		if (!opts) {
660
			opts = { all: noStagedChanges };
J
Joao Moreno 已提交
661 662
		}

663 664 665
		// enable signing of commits if configurated
		opts.signCommit = enableCommitSigning;

J
Joao Moreno 已提交
666 667
		if (
			// no changes
668
			(noStagedChanges && noUnstagedChanges)
J
Joao Moreno 已提交
669
			// or no staged changes and not `all`
670
			|| (!opts.all && noStagedChanges)
J
Joao Moreno 已提交
671
		) {
J
Joao Moreno 已提交
672 673 674 675
			window.showInformationMessage(localize('no changes', "There are no changes to commit."));
			return false;
		}

J
Joao Moreno 已提交
676
		const message = await getCommitMessage();
J
Joao Moreno 已提交
677 678 679 680 681 682

		if (!message) {
			// TODO@joao: show modal dialog to confirm empty message commit
			return false;
		}

J
Joao Moreno 已提交
683
		await this.model.commit(message, opts);
J
Joao Moreno 已提交
684 685 686 687

		return true;
	}

J
Joao Moreno 已提交
688
	private async commitWithAnyInput(opts?: CommitOptions): Promise<void> {
689
		const message = scm.inputBox.value;
J
Joao Moreno 已提交
690
		const getCommitMessage = async () => {
J
Joao Moreno 已提交
691 692 693 694 695 696
			if (message) {
				return message;
			}

			return await window.showInputBox({
				placeHolder: localize('commit message', "Commit message"),
J
Joao Moreno 已提交
697 698
				prompt: localize('provide commit message', "Please provide a commit message"),
				ignoreFocusOut: true
J
Joao Moreno 已提交
699
			});
J
Joao Moreno 已提交
700 701 702
		};

		const didCommit = await this.smartCommit(getCommitMessage, opts);
J
Joao Moreno 已提交
703 704

		if (message && didCommit) {
J
Joao Moreno 已提交
705
			scm.inputBox.value = await this.model.getCommitTemplate();
J
Joao Moreno 已提交
706
		}
J
Joao Moreno 已提交
707 708
	}

J
Joao Moreno 已提交
709
	@command('git.commit')
J
Joao Moreno 已提交
710 711 712 713
	async commit(): Promise<void> {
		await this.commitWithAnyInput();
	}

J
Joao Moreno 已提交
714
	@command('git.commitWithInput')
J
Joao Moreno 已提交
715
	async commitWithInput(): Promise<void> {
J
Joao Moreno 已提交
716 717 718 719
		if (!scm.inputBox.value) {
			return;
		}

J
Joao Moreno 已提交
720
		const didCommit = await this.smartCommit(async () => scm.inputBox.value);
J
Joao Moreno 已提交
721 722

		if (didCommit) {
J
Joao Moreno 已提交
723
			scm.inputBox.value = await this.model.getCommitTemplate();
J
Joao Moreno 已提交
724
		}
J
Joao Moreno 已提交
725 726
	}

J
Joao Moreno 已提交
727
	@command('git.commitStaged')
J
Joao Moreno 已提交
728
	async commitStaged(): Promise<void> {
J
Joao Moreno 已提交
729
		await this.commitWithAnyInput({ all: false });
J
Joao Moreno 已提交
730 731
	}

J
Joao Moreno 已提交
732
	@command('git.commitStagedSigned')
J
Joao Moreno 已提交
733
	async commitStagedSigned(): Promise<void> {
J
Joao Moreno 已提交
734
		await this.commitWithAnyInput({ all: false, signoff: true });
J
Joao Moreno 已提交
735 736
	}

J
Joao Moreno 已提交
737
	@command('git.commitAll')
J
Joao Moreno 已提交
738
	async commitAll(): Promise<void> {
J
Joao Moreno 已提交
739
		await this.commitWithAnyInput({ all: true });
J
Joao Moreno 已提交
740 741
	}

J
Joao Moreno 已提交
742
	@command('git.commitAllSigned')
J
Joao Moreno 已提交
743
	async commitAllSigned(): Promise<void> {
J
Joao Moreno 已提交
744
		await this.commitWithAnyInput({ all: true, signoff: true });
J
Joao Moreno 已提交
745 746
	}

J
Joao Moreno 已提交
747
	@command('git.undoCommit')
J
Joao Moreno 已提交
748
	async undoCommit(): Promise<void> {
J
Joao Moreno 已提交
749 750 751 752 753 754 755 756 757
		const HEAD = this.model.HEAD;

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

		const commit = await this.model.getCommit('HEAD');
		await this.model.reset('HEAD~');
		scm.inputBox.value = commit.message;
J
Joao Moreno 已提交
758 759
	}

J
Joao Moreno 已提交
760
	@command('git.checkout')
J
Joao Moreno 已提交
761 762 763 764 765
	async checkout(treeish: string): Promise<void> {
		if (typeof treeish === 'string') {
			return await this.model.checkout(treeish);
		}

J
Joao Moreno 已提交
766
		const config = workspace.getConfiguration('git');
J
Joao Moreno 已提交
767
		const checkoutType = config.get<string>('checkoutType') || 'all';
J
Joao Moreno 已提交
768 769 770
		const includeTags = checkoutType === 'all' || checkoutType === 'tags';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

J
Joao Moreno 已提交
771 772
		const createBranch = new CreateBranchItem();

J
Joao Moreno 已提交
773 774 775 776 777 778 779 780 781
		const heads = this.model.refs.filter(ref => ref.type === RefType.Head)
			.map(ref => new CheckoutItem(ref));

		const tags = (includeTags ? this.model.refs.filter(ref => ref.type === RefType.Tag) : [])
			.map(ref => new CheckoutTagItem(ref));

		const remoteHeads = (includeRemotes ? this.model.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
			.map(ref => new CheckoutRemoteHeadItem(ref));

J
Joao Moreno 已提交
782
		const picks = [createBranch, ...heads, ...tags, ...remoteHeads];
783
		const placeHolder = localize('select a ref to checkout', 'Select a ref to checkout');
J
Joao Moreno 已提交
784
		const choice = await window.showQuickPick(picks, { placeHolder });
J
Joao Moreno 已提交
785 786 787 788 789 790

		if (!choice) {
			return;
		}

		await choice.run(this.model);
J
Joao Moreno 已提交
791 792
	}

J
Joao Moreno 已提交
793
	@command('git.branch')
J
Joao Moreno 已提交
794 795
	async branch(): Promise<void> {
		const result = await window.showInputBox({
J
Joao Moreno 已提交
796
			placeHolder: localize('branch name', "Branch name"),
J
Joao Moreno 已提交
797 798
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
J
Joao Moreno 已提交
799
		});
J
Joao Moreno 已提交
800

J
Joao Moreno 已提交
801 802 803
		if (!result) {
			return;
		}
J
Joao Moreno 已提交
804

J
Joao Moreno 已提交
805 806
		const name = result.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
		await this.model.branch(name);
J
Joao Moreno 已提交
807 808
	}

M
Maik Riechert 已提交
809
	@command('git.deleteBranch')
810 811 812 813 814 815 816 817
	async deleteBranch(name: string, force?: boolean): Promise<void> {
		let run: (force?: boolean) => Promise<void>;
		if (typeof name === 'string') {
			run = force => this.model.deleteBranch(name, force);
		} else {
			const currentHead = this.model.HEAD && this.model.HEAD.name;
			const heads = this.model.refs.filter(ref => ref.type === RefType.Head && ref.name !== currentHead)
				.map(ref => new BranchDeleteItem(ref));
M
Maik Riechert 已提交
818

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

M
Maik Riechert 已提交
822
			if (!choice || !choice.branchName) {
823 824
				return;
			}
M
Maik Riechert 已提交
825
			name = choice.branchName;
826
			run = force => choice.run(this.model, force);
M
Maik Riechert 已提交
827 828
		}

829 830 831 832 833 834 835 836 837 838 839 840 841 842 843
		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");
			const pick = await window.showWarningMessage(message, yes);

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

J
Justin Horner 已提交
846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883
	@command('git.renameBranch')
	async renameBranch(): Promise<void> {
		const placeHolder = localize('provide branch name', "Please provide a branch name");
		const name = await window.showInputBox({ placeHolder });

		if (!name || name.trim().length === 0) {
			return;
		}
		const run = force => this.model.renameBranch(name);

		try {
			await run(name);
		} catch (err) {
			console.log(err);
			if (err.gitErrorCode !== GitErrorCodes.InvalidBranchName &&
				err.gitErrorCode !== GitErrorCodes.BranchAlreadyExists) {
				return err;
			}

			let message = '';
			switch (err.gitErrorCode) {
				case GitErrorCodes.InvalidBranchName:
					message = localize('invalid branch name', 'Invalid branch name');
					break;
				case GitErrorCodes.BranchAlreadyExists:
					message = localize('branch already exists', `A branch named '${name}' already exists`);
					break;
			}

			if (!message) {
				return;
			}

			window.showErrorMessage(message);
		}

	}

884 885 886 887 888 889 890
	@command('git.merge')
	async merge(): Promise<void> {
		const config = workspace.getConfiguration('git');
		const checkoutType = config.get<string>('checkoutType') || 'all';
		const includeRemotes = checkoutType === 'all' || checkoutType === 'remote';

		const heads = this.model.refs.filter(ref => ref.type === RefType.Head)
J
Joao Moreno 已提交
891 892
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
893 894

		const remoteHeads = (includeRemotes ? this.model.refs.filter(ref => ref.type === RefType.RemoteHead) : [])
J
Joao Moreno 已提交
895 896
			.filter(ref => ref.name || ref.commit)
			.map(ref => new MergeItem(ref as Branch));
897 898

		const picks = [...heads, ...remoteHeads];
899 900
		const placeHolder = localize('select a branch to merge from', 'Select a branch to merge from');
		const choice = await window.showQuickPick<MergeItem>(picks, { placeHolder });
901 902 903 904 905

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
906 907 908 909 910 911 912 913 914 915
		try {
			await choice.run(this.model);
		} 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);
		}
916 917
	}

918 919 920 921 922 923 924 925 926 927 928 929 930 931
	@command('git.createTag')
	async createTag(): Promise<void> {
		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 已提交
932
			prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
933 934 935 936 937 938 939 940
			ignoreFocusOut: true
		});

		const name = inputTagName.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
		const message = inputMessage || name;
		await this.model.tag(name, message);
	}

J
Joao Moreno 已提交
941
	@command('git.pullFrom')
942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970
	async pullFrom(): Promise<void> {
		const remotes = this.model.remotes;

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

		const picks = remotes.map(r => ({ label: r.name, description: r.url }));
		const placeHolder = localize('pick remote pull repo', "Pick a remote to pull the branch from");
		const pick = await window.showQuickPick(picks, { placeHolder });

		if (!pick) {
			return;
		}

		const branchName = await window.showInputBox({
			placeHolder: localize('branch name', "Branch name"),
			prompt: localize('provide branch name', "Please provide a branch name"),
			ignoreFocusOut: true
		});

		if (!branchName) {
			return;
		}

		this.model.pull(false, pick.label, branchName);
	}

J
Joao Moreno 已提交
971
	@command('git.pull')
J
Joao Moreno 已提交
972
	async pull(): Promise<void> {
J
Joao Moreno 已提交
973 974 975 976 977 978 979 980
		const remotes = this.model.remotes;

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

		await this.model.pull();
J
Joao Moreno 已提交
981 982
	}

J
Joao Moreno 已提交
983
	@command('git.pullRebase')
J
Joao Moreno 已提交
984
	async pullRebase(): Promise<void> {
J
Joao Moreno 已提交
985 986 987 988 989 990 991
		const remotes = this.model.remotes;

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

J
Joao Moreno 已提交
992
		await this.model.pullWithRebase();
J
Joao Moreno 已提交
993 994
	}

J
Joao Moreno 已提交
995
	@command('git.push')
J
Joao Moreno 已提交
996
	async push(): Promise<void> {
J
Joao Moreno 已提交
997 998 999 1000 1001 1002 1003 1004
		const remotes = this.model.remotes;

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

		await this.model.push();
J
Joao Moreno 已提交
1005 1006
	}

1007 1008 1009 1010 1011 1012 1013 1014 1015
	@command('git.pushWithTags')
	async pushWithTags(): Promise<void> {
		const remotes = this.model.remotes;

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

1016
		await this.model.pushTags();
1017 1018 1019 1020

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

J
Joao Moreno 已提交
1021
	@command('git.pushTo')
J
Joao Moreno 已提交
1022
	async pushTo(): Promise<void> {
J
Joao Moreno 已提交
1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043
		const remotes = this.model.remotes;

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

		if (!this.model.HEAD || !this.model.HEAD.name) {
			window.showWarningMessage(localize('nobranch', "Please check out a branch to push to a remote."));
			return;
		}

		const branchName = this.model.HEAD.name;
		const picks = remotes.map(r => ({ label: r.name, description: r.url }));
		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 已提交
1044
		this.model.pushTo(pick.label, branchName);
J
Joao Moreno 已提交
1045 1046
	}

J
Joao Moreno 已提交
1047
	@command('git.sync')
J
Joao Moreno 已提交
1048
	async sync(): Promise<void> {
J
Joao Moreno 已提交
1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070
		const HEAD = this.model.HEAD;

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

		const config = workspace.getConfiguration('git');
		const shouldPrompt = config.get<boolean>('confirmSync') === true;

		if (shouldPrompt) {
			const message = localize('sync is unpredictable', "This action will push and pull commits to and from '{0}'.", HEAD.upstream);
			const yes = localize('ok', "OK");
			const neverAgain = localize('never again', "OK, Never Show Again");
			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 已提交
1071 1072 1073
		await this.model.sync();
	}

J
Joao Moreno 已提交
1074
	@command('git.publish')
J
Joao Moreno 已提交
1075
	async publish(): Promise<void> {
J
Joao Moreno 已提交
1076 1077 1078 1079 1080 1081 1082
		const remotes = this.model.remotes;

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

J
Joao Moreno 已提交
1083 1084
		const branchName = this.model.HEAD && this.model.HEAD.name || '';
		const picks = this.model.remotes.map(r => r.name);
J
Joao Moreno 已提交
1085
		const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
J
Joao Moreno 已提交
1086 1087 1088 1089 1090 1091
		const choice = await window.showQuickPick(picks, { placeHolder });

		if (!choice) {
			return;
		}

J
Joao Moreno 已提交
1092
		await this.model.pushTo(choice, branchName, true);
J
Joao Moreno 已提交
1093 1094
	}

J
Joao Moreno 已提交
1095
	@command('git.showOutput')
J
Joao Moreno 已提交
1096 1097 1098 1099
	showOutput(): void {
		this.outputChannel.show();
	}

N
NKumar2 已提交
1100 1101
	@command('git.ignore')
	async ignore(...resourceStates: SourceControlResourceState[]): Promise<void> {
J
Joao Moreno 已提交
1102 1103
		if (resourceStates.length === 0 || !(resourceStates[0].resourceUri instanceof Uri)) {
			const uri = window.activeTextEditor && window.activeTextEditor.document.uri;
N
NKumar2 已提交
1104

J
Joao Moreno 已提交
1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116
			if (!uri) {
				return;
			}

			return await this.model.ignore([uri]);
		}

		const uris = resourceStates
			.filter(s => s instanceof Resource)
			.map(r => r.resourceUri);

		if (!uris.length) {
N
NKumar2 已提交
1117 1118 1119
			return;
		}

J
Joao Moreno 已提交
1120
		await this.model.ignore(uris);
N
NKumar2 已提交
1121 1122
	}

J
Joao Moreno 已提交
1123
	private createCommand(id: string, key: string, method: Function, skipModelCheck: boolean): (...args: any[]) => any {
1124
		const result = (...args) => {
J
Joao Moreno 已提交
1125
			if (!skipModelCheck && !this.model) {
J
Joao Moreno 已提交
1126 1127 1128 1129
				window.showInformationMessage(localize('disabled', "Git is either disabled or not supported in this workspace"));
				return;
			}

J
Joao Moreno 已提交
1130 1131
			this.telemetryReporter.sendTelemetryEvent('git.command', { command: id });

J
Joao Moreno 已提交
1132 1133 1134 1135 1136 1137
			const result = Promise.resolve(method.apply(this, args));

			return result.catch(async err => {
				let message: string;

				switch (err.gitErrorCode) {
1138
					case GitErrorCodes.DirtyWorkTree:
J
Joao Moreno 已提交
1139 1140
						message = localize('clean repo', "Please clean your repository working tree before checkout.");
						break;
1141 1142 1143
					case GitErrorCodes.PushRejected:
						message = localize('cant push', "Can't push refs to remote. Run 'Pull' first to integrate your changes.");
						break;
J
Joao Moreno 已提交
1144
					default:
1145 1146 1147
						const hint = (err.stderr || err.message || String(err))
							.replace(/^error: /mi, '')
							.replace(/^> husky.*$/mi, '')
J
Joao Moreno 已提交
1148
							.split(/[\r\n]/)
1149 1150 1151 1152 1153 1154
							.filter(line => !!line)
						[0];

						message = hint
							? localize('git error details', "Git: {0}", hint)
							: localize('git error', "Git error");
J
Joao Moreno 已提交
1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172

						break;
				}

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

				const outputChannel = this.outputChannel as OutputChannel;
				const openOutputChannelChoice = localize('open git log', "Open Git Log");
				const choice = await window.showErrorMessage(message, openOutputChannelChoice);

				if (choice === openOutputChannelChoice) {
					outputChannel.show();
				}
			});
		};
1173 1174 1175 1176 1177

		// patch this object, so people can call methods directly
		this[key] = result;

		return result;
J
Joao Moreno 已提交
1178 1179
	}

1180 1181
	private getSCMResource(uri?: Uri): Resource | undefined {
		uri = uri ? uri : window.activeTextEditor && window.activeTextEditor.document.uri;
J
Joao Moreno 已提交
1182 1183

		if (!uri) {
1184
			return undefined;
J
Joao Moreno 已提交
1185 1186 1187
		}

		if (uri.scheme === 'git') {
J
Joao Moreno 已提交
1188 1189
			const { path } = fromGitUri(uri);
			uri = Uri.file(path);
J
Joao Moreno 已提交
1190 1191 1192 1193 1194
		}

		if (uri.scheme === 'file') {
			const uriString = uri.toString();

J
Joao Moreno 已提交
1195 1196
			return this.model.workingTreeGroup.resources.filter(r => r.resourceUri.toString() === uriString)[0]
				|| this.model.indexGroup.resources.filter(r => r.resourceUri.toString() === uriString)[0];
J
Joao Moreno 已提交
1197 1198 1199
		}
	}

J
Joao Moreno 已提交
1200 1201 1202
	dispose(): void {
		this.disposables.forEach(d => d.dispose());
	}
J
Joao Moreno 已提交
1203
}