Merge from vscode 1b314ab317fbff7d799b21754326b7d849889ceb

extensions/git/src/api/api1.ts

@@ -5,10 +5,12 @@
 
 import { Model } from '../model';
 import { Repository as BaseRepository, Resource } from '../repository';
-import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, GitExtension, RefType, RemoteSourceProvider, CredentialsProvider, BranchQuery } from './git';
+import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, RemoteSourceProvider, CredentialsProvider, BranchQuery, PushErrorHandler } from './git';
 import { Event, SourceControlInputBox, Uri, SourceControl, Disposable, commands } from 'vscode';
 import { mapEvent } from '../util';
 import { toGitUri } from '../uri';
+import { pickRemoteSource, PickRemoteSourceOptions } from '../remoteSource';
+import { GitExtensionImpl } from './extension';
 
 class ApiInputBox implements InputBox {
 	set value(value: string) { this._inputBox.value = value; }
@@ -271,6 +273,10 @@ export class ApiImpl implements API {
 		return this._model.registerCredentialsProvider(provider);
 	}
 
+	registerPushErrorHandler(handler: PushErrorHandler): Disposable {
+		return this._model.registerPushErrorHandler(handler);
+	}
+
 	constructor(private _model: Model) { }
 }
 
@@ -308,41 +314,51 @@ function getStatus(status: Status): string {
 	return 'UNKNOWN';
 }
 
-export function registerAPICommands(extension: GitExtension): Disposable {
-	return Disposable.from(
-		commands.registerCommand('git.api.getRepositories', () => {
-			const api = extension.getAPI(1);
-			return api.repositories.map(r => r.rootUri.toString());
-		}),
+export function registerAPICommands(extension: GitExtensionImpl): Disposable {
+	const disposables: Disposable[] = [];
 
-		commands.registerCommand('git.api.getRepositoryState', (uri: string) => {
-			const api = extension.getAPI(1);
-			const repository = api.getRepository(Uri.parse(uri));
+	disposables.push(commands.registerCommand('git.api.getRepositories', () => {
+		const api = extension.getAPI(1);
+		return api.repositories.map(r => r.rootUri.toString());
+	}));
 
-			if (!repository) {
-				return null;
-			}
+	disposables.push(commands.registerCommand('git.api.getRepositoryState', (uri: string) => {
+		const api = extension.getAPI(1);
+		const repository = api.getRepository(Uri.parse(uri));
 
-			const state = repository.state;
+		if (!repository) {
+			return null;
+		}
 
-			const ref = (ref: Ref | undefined) => (ref && { ...ref, type: getRefType(ref.type) });
-			const change = (change: Change) => ({
-				uri: change.uri.toString(),
-				originalUri: change.originalUri.toString(),
-				renameUri: change.renameUri?.toString(),
-				status: getStatus(change.status)
-			});
+		const state = repository.state;
 
-			return {
-				HEAD: ref(state.HEAD),
-				refs: state.refs.map(ref),
-				remotes: state.remotes,
-				submodules: state.submodules,
-				rebaseCommit: state.rebaseCommit,
-				mergeChanges: state.mergeChanges.map(change),
-				indexChanges: state.indexChanges.map(change),
-				workingTreeChanges: state.workingTreeChanges.map(change)
-			};
-		})
-	);
+		const ref = (ref: Ref | undefined) => (ref && { ...ref, type: getRefType(ref.type) });
+		const change = (change: Change) => ({
+			uri: change.uri.toString(),
+			originalUri: change.originalUri.toString(),
+			renameUri: change.renameUri?.toString(),
+			status: getStatus(change.status)
+		});
+
+		return {
+			HEAD: ref(state.HEAD),
+			refs: state.refs.map(ref),
+			remotes: state.remotes,
+			submodules: state.submodules,
+			rebaseCommit: state.rebaseCommit,
+			mergeChanges: state.mergeChanges.map(change),
+			indexChanges: state.indexChanges.map(change),
+			workingTreeChanges: state.workingTreeChanges.map(change)
+		};
+	}));
+
+	disposables.push(commands.registerCommand('git.api.getRemoteSources', (opts?: PickRemoteSourceOptions) => {
+		if (!extension.model) {
+			return;
+		}
+
+		return pickRemoteSource(extension.model, opts);
+	}));
+
+	return Disposable.from(...disposables);
 }

extensions/git/src/api/extension.ts

@@ -7,7 +7,6 @@ import { Model } from '../model';
 import { GitExtension, Repository, API } from './git';
 import { ApiRepository, ApiImpl } from './api1';
 import { Event, EventEmitter } from 'vscode';
-import { latchEvent } from '../util';
 
 export function deprecated(_target: any, key: string, descriptor: any): void {
 	if (typeof descriptor.value !== 'function') {
@@ -26,17 +25,27 @@ export class GitExtensionImpl implements GitExtension {
 	enabled: boolean = false;
 
 	private _onDidChangeEnablement = new EventEmitter<boolean>();
-	readonly onDidChangeEnablement: Event<boolean> = latchEvent(this._onDidChangeEnablement.event);
+	readonly onDidChangeEnablement: Event<boolean> = this._onDidChangeEnablement.event;
 
 	private _model: Model | undefined = undefined;
 
 	set model(model: Model | undefined) {
 		this._model = model;
 
-		this.enabled = !!model;
+		const enabled = !!model;
+
+		if (this.enabled === enabled) {
+			return;
+		}
+
+		this.enabled = enabled;
 		this._onDidChangeEnablement.fire(this.enabled);
 	}
 
+	get model(): Model | undefined {
+		return this._model;
+	}
+
 	constructor(model?: Model) {
 		if (model) {
 			this.enabled = true;
@@ -73,4 +82,4 @@ export class GitExtensionImpl implements GitExtension {
 
 		return new ApiImpl(this._model);
 	}
-}
+}

extensions/git/src/api/git.d.ts

@@ -223,6 +223,10 @@ export interface CredentialsProvider {
 	getCredentials(host: Uri): ProviderResult<Credentials>;
 }
 
+export interface PushErrorHandler {
+	handlePushError(repository: Repository, remote: Remote, refspec: string, error: Error & { gitErrorCode: GitErrorCodes }): Promise<boolean>;
+}
+
 export type APIState = 'uninitialized' | 'initialized';
 
 export interface API {
@@ -239,6 +243,7 @@ export interface API {
 
 	registerRemoteSourceProvider(provider: RemoteSourceProvider): Disposable;
 	registerCredentialsProvider(provider: CredentialsProvider): Disposable;
+	registerPushErrorHandler(handler: PushErrorHandler): Disposable;
 }
 
 export interface GitExtension {
@@ -276,6 +281,7 @@ export const enum GitErrorCodes {
 	CantOpenResource = 'CantOpenResource',
 	GitNotFound = 'GitNotFound',
 	CantCreatePipe = 'CantCreatePipe',
+	PermissionDenied = 'PermissionDenied',
 	CantAccessRemote = 'CantAccessRemote',
 	RepositoryNotFound = 'RepositoryNotFound',
 	RepositoryIsLocked = 'RepositoryIsLocked',