Skip to content

use default branch #2494

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

Draft
joshspicer wants to merge 1 commit into
base: release/0.35
Choose a base branch
from
Draft

use default branch #2494

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
11 changes: 10 additions & 1 deletion src/extension/chatSessions/vscode-node/copilotCloudGitOperationsManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export class CopilotCloudGitOperationsManager {
}
}

async checkIfRemoteHasRef(repository: Repository, remoteName: string, baseRef: string): Promise<boolean> {
async checkIfRemoteHasUpToDateRef(repository: Repository, remoteName: string, baseRef: string): Promise<boolean> {
const remoteBranches =
(await repository.getBranches({ remote: true }))
.filter(b => b.remote); // Has an associated remote
Expand All @@ -92,6 +92,15 @@ export class CopilotCloudGitOperationsManager {
: `${branch.remote}/${branch.name}`;
return alternateNames.has(candidateName);
});
// Check if remote branch and local change are on the same commit
if (hasRemoteBranch) {
const remoteCommit = await repository.getCommit(expectedRemoteBranch);
const localCommit = await repository.getCommit(baseRef);
if (remoteCommit && localCommit && remoteCommit.hash !== localCommit.hash) {
return false;
}
}

return hasRemoteBranch;
}

Expand Down
39 changes: 30 additions & 9 deletions src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,14 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
private readonly PUSH_BRANCH = vscode.l10n.t('Push Branch');
private readonly DELEGATE = vscode.l10n.t('Delegate');
private readonly CANCEL = vscode.l10n.t('Cancel');
private readonly USE_CURRENT_BRANCH = vscode.l10n.t('Use Current Branch');

// Messages
private readonly BASE_MESSAGE = vscode.l10n.t('Cloud agent works asynchronously to create a pull request with your requested changes. This chat\'s history will be summarized and appended to the pull request as context.');
private readonly AUTHORIZE_MESSAGE = vscode.l10n.t('Cloud agent requires elevated GitHub access to proceed.');
private readonly COMMIT_MESSAGE = vscode.l10n.t('This workspace has uncommitted changes. Should these changes be pushed and included in cloud agent\'s work?');
private readonly PUSH_BRANCH_MESSAGE = (baseRef: string, defaultBranch: string) => vscode.l10n.t('Push your currently checked out branch `{0}`, or start from the default branch `{1}`?', baseRef, defaultBranch);
private readonly USE_CURRENT_BRANCH_MESSAGE = (baseRef: string, defaultBranch: string) => vscode.l10n.t('Continue on your currently checked out branch `{0}`, or start from the default branch `{1}`?', baseRef, defaultBranch);

// Workspace storage keys
private readonly WORKSPACE_CONTEXT_PREFIX = 'copilot.cloudAgent';
Expand Down Expand Up @@ -779,6 +781,8 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
base_ref = default_branch;
}

stream.progress(vscode.l10n.t('Base branch `{0}` on remote', base_ref));

const { number, sessionId } = await this.invokeRemoteAgent(
metadata.prompt,
[result, history].filter(Boolean).join('\n\n').trim(),
Expand Down Expand Up @@ -892,15 +896,18 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
}
}

// User chose to use the current checked-out branch, INSTEAD of the default
const useCurrentBranch = selection.includes(this.USE_CURRENT_BRANCH.toUpperCase());

const base_ref: string = await (async () => {
const res = await this.checkBaseBranchPresentOnRemote();
if (!res) {
// Unexpected
throw new Error(vscode.l10n.t('Repo base branch is not detected on remote. Push your branch and try again.'));
}
return (res?.missingOnRemote || !res?.baseRef) ? res.repoDefaultBranch : res?.baseRef;

return (res.missingOnRemote || !res.baseRef || !useCurrentBranch) ? res.repoDefaultBranch : res.baseRef;
})();
stream.progress(vscode.l10n.t('Validating branch `{0}` exists on remote', base_ref));

// Now trigger delegation
try {
Expand Down Expand Up @@ -946,21 +953,22 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
* Checks if the current base branch exists on the remote repository.
* Returns branch information including whether it's missing from remote, the base ref name, and the repository's default branch.
*/
private async checkBaseBranchPresentOnRemote(): Promise<{ missingOnRemote: boolean; baseRef: string; repoDefaultBranch: string } | undefined> {
private async checkBaseBranchPresentOnRemote(): Promise<{ missingOnRemote: boolean; isNonDefaultBranch: boolean; baseRef: string; repoDefaultBranch: string } | undefined> {
try {
const repoId = await getRepoId(this._gitService);
if (!repoId) {
return undefined;
}
const { baseRef, repository, remoteName } = await this.gitOperationsManager.repoInfo();
const remoteRepoInfo = await this._githubRepositoryService.getRepositoryInfo(repoId.org, repoId.repo);
const remoteHasRef = await this.gitOperationsManager.checkIfRemoteHasRef(repository, remoteName, baseRef);
if (remoteHasRef) {
// Remote HAS the base branch, no action needed.
return { missingOnRemote: false, baseRef, repoDefaultBranch: remoteRepoInfo.default_branch };
const remoteHasUpToDateRef = await this.gitOperationsManager.checkIfRemoteHasUpToDateRef(repository, remoteName, baseRef);
const isNonDefaultBranch = baseRef !== remoteRepoInfo.default_branch;
if (remoteHasUpToDateRef) {
// Remote HAS the base branch (at the right commit), no action needed.
return { missingOnRemote: false, isNonDefaultBranch, baseRef, repoDefaultBranch: remoteRepoInfo.default_branch };
}
// Remote is MISSING the base branch
return { missingOnRemote: true, baseRef, repoDefaultBranch: remoteRepoInfo.default_branch };
// Remote is MISSING the base branch (or is out of sync), so we'd need to push it
return { missingOnRemote: true, isNonDefaultBranch, baseRef, repoDefaultBranch: remoteRepoInfo.default_branch };
} catch (error) {
this.logService.debug(`Failed to check default branch: ${error}`);
return undefined;
Expand Down Expand Up @@ -994,6 +1002,13 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
vscode.l10n.t('{0} and {1}', this.AUTHORIZE, this.PUSH_BRANCH),
this.AUTHORIZE,
);
} else if (needsPermissiveAuth && baseBranchInfo?.isNonDefaultBranch) {
message += '\n\n' + this.AUTHORIZE_MESSAGE;
message += '\n\n' + this.USE_CURRENT_BRANCH_MESSAGE(baseBranchInfo.baseRef, baseBranchInfo.repoDefaultBranch);
buttons.unshift(
vscode.l10n.t('{0} and {1}', this.AUTHORIZE, this.USE_CURRENT_BRANCH),
this.AUTHORIZE,
);
} else if (needsPermissiveAuth) {
message += '\n\n' + this.AUTHORIZE_MESSAGE;
buttons.unshift(
Expand All @@ -1012,6 +1027,12 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
vscode.l10n.t('{0} and {1}', this.PUSH_BRANCH, this.DELEGATE),
this.DELEGATE,
);
} else if (baseBranchInfo?.isNonDefaultBranch) {
message += '\n\n' + this.USE_CURRENT_BRANCH_MESSAGE(baseBranchInfo.baseRef, baseBranchInfo.repoDefaultBranch);
buttons.unshift(
vscode.l10n.t('{0} and {1}', this.USE_CURRENT_BRANCH, this.DELEGATE),
this.DELEGATE,
);
}

// Check if the message has been modified from the default
Expand Down