Automatically add upstream (#2560)

src/github/folderRepositoryManager.ts

@@ -486,6 +486,10 @@ export class FolderRepositoryManager implements vscode.Disposable {
 					this._githubRepositories.some(newRepo => newRepo.remote.equals(oldRepo.remote)),
 				);
 
+			if (this._githubRepositories.length && repositoriesChanged) {
+				this.checkIfMissingUpstream();
+			}
+
 			this.getMentionableUsers(repositoriesChanged);
 			this.getAssignableUsers(repositoriesChanged);
 			this._onDidLoadRepositories.fire(
@@ -500,6 +504,30 @@ export class FolderRepositoryManager implements vscode.Disposable {
 		});
 	}
 
+	private async checkIfMissingUpstream(): Promise<void> {
+		try {
+			const origin = await this.getOrigin();
+			const metadata = await origin.getMetadata();
+			if (metadata.fork) {
+				const parentUrl = new Protocol(metadata.parent.git_url);
+				const missingParentRemote = !this._githubRepositories.some(
+					repo =>
+						repo.remote.owner === parentUrl.owner &&
+						repo.remote.repositoryName === parentUrl.repositoryName,
+				);
+
+				if (missingParentRemote) {
+					const upstreamAvailable = !this.repository.state.remotes.some(remote => remote.name === 'upstream');
+					const remoteName = upstreamAvailable ? 'upstream' : metadata.parent.owner.login;
+					await this.repository.addRemote(remoteName, metadata.parent.git_url);
+				}
+			}
+		} catch (e) {
+			Logger.appendLine(`Missing upstream check failed: ${e}`);
+			// ignore
+		}
+	}
+
 	getAllAssignableUsers(): IAccount[] | undefined {
 		if (this._assignableUsers) {
 			const allAssignableUsers: IAccount[] = [];

src/github/githubRepository.ts

@@ -183,7 +183,7 @@ export class GitHubRepository implements vscode.Disposable {
 		return defaultSchema as any;
 	}
 
-	async getMetadata(): Promise<any> {
+	async getMetadata(): Promise<IMetadata> {
 		Logger.debug(`Fetch metadata - enter`, GitHubRepository.ID);
 		if (this._metadata) {
 			Logger.debug(