Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-04 07:15:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Auto publish branches before Continue On in git repositories (#171211)

Browse Source 
* Support syncing with remote before Continue On

* Auto publish before Continue On in git extension

* Add configuration description
This commit is contained in:
Joyce Er
2023-01-18 03:25:47 -08:00
committed by GitHub
parent 5bbd1f4745
commit e7d34457a5
4 changed files with 82 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
extensions/git/src/editSessionIdentityProvider.ts
View File

@@ -5,6 +5,7 @@
import * as path from 'path';
import * as vscode from 'vscode';
import { RefType } from './api/git';
import { Model } from './model';
export class GitEditSessionIdentityProvider implements vscode.EditSessionIdentityProvider, vscode.Disposable {
@@ -13,6 +14,12 @@ export class GitEditSessionIdentityProvider implements vscode.EditSessionIdentit
constructor(private model: Model) {
this.providerRegistration = vscode.workspace.registerEditSessionIdentityProvider('file', this);
vscode.workspace.onWillCreateEditSessionIdentity((e) => {
if (vscode.workspace.getConfiguration('git').get('publishBeforeContinueOn')) {
e.waitUntil(this._onWillCreateEditSessionIdentity(e.workspaceFolder, e.token));
}
});
}
dispose() {
@@ -58,6 +65,33 @@ export class GitEditSessionIdentityProvider implements vscode.EditSessionIdentit
return vscode.EditSessionIdentityMatch.Partial;
}
}
private async _onWillCreateEditSessionIdentity(workspaceFolder: vscode.WorkspaceFolder, cancellationToken: vscode.CancellationToken): Promise<void> {
const cancellationPromise = createCancellationPromise(cancellationToken);
await Promise.race([this._doPublish(workspaceFolder), cancellationPromise]);
}
private async _doPublish(workspaceFolder: vscode.WorkspaceFolder) {
await this.model.openRepository(path.dirname(workspaceFolder.uri.fsPath));
const repository = this.model.getRepository(workspaceFolder.uri);
if (!repository) {
return;
}
await repository.status();
// If this branch hasn't been published to the remote yet,
// ensure that it is published before Continue On is invoked
if (!repository.HEAD?.upstream && repository.HEAD?.type === RefType.Head) {
await vscode.window.withProgress({
location: vscode.ProgressLocation.Notification,
title: vscode.l10n.t('Publishing branch...')
}, async () => {
await vscode.commands.executeCommand('git.publish');
});
}
}
}
function normalizeEditSessionIdentity(identity: string) {
@@ -73,3 +107,14 @@ function normalizeEditSessionIdentity(identity: string) {
sha
};
}
function createCancellationPromise(cancellationToken: vscode.CancellationToken) {
return new Promise((resolve, _) => {
if (cancellationToken.isCancellationRequested) {
resolve(undefined);
}
cancellationToken.onCancellationRequested(() => {
resolve(undefined);
});
});
}