Skip to content

Merge queues part 3: Update create view and fix auto merge #5481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 17, 2023
Merged

Merge queues part 3: Update create view and fix auto merge #5481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions common/views.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ export interface CreateParamsNew {
allowAutoMerge?: boolean;
defaultMergeMethod?: MergeMethod;
mergeMethodsAvailability?: MergeMethodsAvailability;
baseHasMergeQueue: boolean;

creating: boolean;
}
Expand All @@ -137,6 +138,7 @@ export interface ChooseBaseRemoteAndBranchResult {
allowAutoMerge: boolean;
mergeMethodsAvailability: MergeMethodsAvailability;
autoMergeDefault: boolean;
baseHasMergeQueue: boolean;
defaultTitle: string;
defaultDescription: string;
}
Expand Down
14 changes: 14 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,6 +1108,11 @@
"title": "%command.pr.createPrMenuDraft.title%",
"category": "%command.pull.request.category%"
},
{
"command": "pr.createPrMenuMergeWhenReady",
"title": "%command.pr.createPrMenuMergeWhenReady.title%",
"category": "%command.pull.request.category%"
},
{
"command": "pr.createPrMenuMerge",
"title": "%command.pr.createPrMenuMerge.title%",
Expand Down Expand Up @@ -1733,6 +1738,10 @@
"command": "pr.createPrMenuDraft",
"when": "false"
},
{
"command": "pr.createPrMenuMergeWhenReady",
"when": "false"
},
{
"command": "pr.createPrMenuMerge",
"when": "false"
Expand Down Expand Up @@ -2514,6 +2523,11 @@
"when": "webviewId == 'github:createPullRequestWebview' && github:createPrMenu && github:createPrMenuDraft",
"group": "0_create@1"
},
{
"command": "pr.createPrMenuMergeWhenReady",
"when": "webviewId == 'github:createPullRequestWebview' && github:createPrMenu && github:createPrMenuMergeWhenReady",
"group": "1_create@0"
},
{
"command": "pr.createPrMenuMerge",
"when": "webviewId == 'github:createPullRequestWebview' && github:createPrMenu && github:createPrMenuMerge",
Expand Down
1 change: 1 addition & 0 deletions package.nls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@
"command.pr.createPrMenuCreate.title": "Create",
"command.pr.createPrMenuDraft.title": "Create Draft",
"command.pr.createPrMenuSquash.title": "Create + Auto-Squash",
"command.pr.createPrMenuMergeWhenReady.title": "Create + Merge When Ready",
"command.pr.createPrMenuMerge.title": "Create + Auto-Merge",
"command.pr.createPrMenuRebase.title": "Create + Auto-Rebase",
"command.pr.refreshComments.title": "Refresh Pull Request Comments",
Expand Down
16 changes: 11 additions & 5 deletions src/github/createPRViewProviderNew.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,11 @@ export class CreatePullRequestViewProviderNew extends WebviewViewBase implements
this._onDidChangeBaseBranch.fire(defaultBaseBranch);
}

const [defaultTitleAndDescription, mergeConfiguration, viewerPermission] = await Promise.all([
const [defaultTitleAndDescription, mergeConfiguration, viewerPermission, mergeQueueMethodForBranch] = await Promise.all([
this.getTitleAndDescription(this.defaultCompareBranch, defaultBaseBranch),
this.getMergeConfiguration(defaultBaseRemote.owner, defaultBaseRemote.repositoryName),
defaultOrigin.getViewerPermission()
defaultOrigin.getViewerPermission(),
this._folderRepositoryManager.mergeQueueMethodForBranch(defaultBaseBranch, defaultBaseRemote.owner, defaultBaseRemote.repositoryName)
]);

const defaultCreateOption = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<'lastUsed' | 'create' | 'createDraft' | 'createAutoMerge'>(DEFAULT_CREATE_OPTION, 'lastUsed');
Expand Down Expand Up @@ -352,6 +353,7 @@ export class CreatePullRequestViewProviderNew extends WebviewViewBase implements
defaultTitle: defaultTitleAndDescription.title,
defaultDescription: defaultTitleAndDescription.description,
defaultMergeMethod,
baseHasMergeQueue: !!mergeQueueMethodForBranch,
remoteCount: remotes.length,
allowAutoMerge: mergeConfiguration.viewerCanAutoMerge,
mergeMethodsAvailability: mergeConfiguration.mergeMethodsAvailability,
Expand Down Expand Up @@ -438,7 +440,10 @@ export class CreatePullRequestViewProviderNew extends WebviewViewBase implements
this._baseBranch = result.branch;
this._baseRemote = result.remote;
const compareBranch = await this._folderRepositoryManager.repository.getBranch(this._compareBranch);
const [mergeConfiguration, titleAndDescription] = await Promise.all([this.getMergeConfiguration(result.remote.owner, result.remote.repositoryName), this.getTitleAndDescription(compareBranch, this._baseBranch)]);
const [mergeConfiguration, titleAndDescription, mergeQueueMethodForBranch] = await Promise.all([
this.getMergeConfiguration(result.remote.owner, result.remote.repositoryName),
this.getTitleAndDescription(compareBranch, this._baseBranch),
this._folderRepositoryManager.mergeQueueMethodForBranch(this._baseBranch, this._baseRemote.owner, this._baseRemote.repositoryName)]);
let autoMergeDefault = false;
if (mergeConfiguration.viewerCanAutoMerge) {
const defaultCreateOption = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<'lastUsed' | 'create' | 'createDraft' | 'createAutoMerge'>(DEFAULT_CREATE_OPTION, 'lastUsed');
Expand All @@ -452,6 +457,7 @@ export class CreatePullRequestViewProviderNew extends WebviewViewBase implements
defaultBaseBranch: defaultBranch,
defaultMergeMethod: getDefaultMergeMethod(mergeConfiguration.mergeMethodsAvailability),
allowAutoMerge: mergeConfiguration.viewerCanAutoMerge,
baseHasMergeQueue: !!mergeQueueMethodForBranch,
mergeMethodsAvailability: mergeConfiguration.mergeMethodsAvailability,
autoMergeDefault,
defaultTitle: titleAndDescription.title,
Expand Down Expand Up @@ -794,11 +800,11 @@ export class CreatePullRequestViewProviderNew extends WebviewViewBase implements
}
}

public async createFromCommand(isDraft: boolean, autoMerge: boolean, autoMergeMethod: MergeMethod | undefined) {
public async createFromCommand(isDraft: boolean, autoMerge: boolean, autoMergeMethod: MergeMethod | undefined, mergeWhenReady?: boolean) {
const params: Partial<CreateParamsNew> = {
isDraft,
autoMerge,
autoMergeMethod,
autoMergeMethod: mergeWhenReady ? 'merge' : autoMergeMethod,
creating: true
};
return this._postMessage({
Expand Down
7 changes: 7 additions & 0 deletions src/view/createPullRequestHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ export class CreatePullRequestHelper implements vscode.Disposable {
}
})
);
this._disposables.push(
vscode.commands.registerCommand('pr.createPrMenuMergeWhenReady', () => {
if (this._createPRViewProvider instanceof CreatePullRequestViewProviderNew) {
this._createPRViewProvider.createFromCommand(false, true, undefined, true);
}
})
);
this._disposables.push(
vscode.commands.registerCommand('pr.createPrMenuMerge', () => {
if (this._createPRViewProvider instanceof CreatePullRequestViewProviderNew) {
Expand Down
Loading