development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-02 17:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Git - update getBranchBase so that it returns an upstream branch (#202586)

Browse source
This commit is contained in:
Ladislau Szomoru 2024-01-16 16:17:40 +01:00 committed by GitHub
parent 62cb62c07b
commit 697936c5f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
extensions/git/src/repository.ts
View file

@ -1475,33 +1475,35 @@ export class Repository implements Disposable {
async getBranchBase(ref: string): Promise<Branch | undefined> {
const branch = await this.getBranch(ref);
const branchMergeBaseConfigKey = `branch.${branch.name}.vscode-merge-base`;
const branchUpstream = await this.getUpstreamBranch(branch);
// Upstream
if (branch.upstream) {
return await this.getBranch(`refs/remotes/${branch.upstream.remote}/${branch.upstream.name}`);
if (branchUpstream) {
return branchUpstream;
}
// Git config
const mergeBaseConfigKey = `branch.${branch.name}.vscode-merge-base`;
try {
const mergeBase = await this.getConfig(branchMergeBaseConfigKey);
if (mergeBase !== '') {
const mergeBaseBranch = await this.getBranch(mergeBase);
return mergeBaseBranch;
const mergeBase = await this.getConfig(mergeBaseConfigKey);
const branchFromConfig = mergeBase !== '' ? await this.getBranch(mergeBase) : undefined;
if (branchFromConfig) {
return branchFromConfig;
}
} catch (err) { }
// Reflog
const branchFromReflog = await this.getBranchBaseFromReflog(ref);
if (branchFromReflog) {
await this.setConfig(branchMergeBaseConfigKey, branchFromReflog.name!);
return branchFromReflog;
const branchFromReflogUpstream = branchFromReflog ? await this.getUpstreamBranch(branchFromReflog) : undefined;
if (branchFromReflogUpstream) {
await this.setConfig(mergeBaseConfigKey, `${branchFromReflogUpstream.remote}/${branchFromReflogUpstream.name}`);
return branchFromReflogUpstream;
}
// Default branch
const defaultBranch = await this.getDefaultBranch();
if (defaultBranch) {
await this.setConfig(branchMergeBaseConfigKey, defaultBranch.name!);
await this.setConfig(mergeBaseConfigKey, `${defaultBranch.remote}/${defaultBranch.name}`);
return defaultBranch;
}
@ -1552,6 +1554,21 @@ export class Repository implements Disposable {
return undefined;
}
private async getUpstreamBranch(branch: Branch): Promise<Branch | undefined> {
if (!branch.upstream) {
return undefined;
}
try {
const upstreamBranch = await this.getBranch(`refs/remotes/${branch.upstream.remote}/${branch.upstream.name}`);
return upstreamBranch;
}
catch (err) {
this.logger.warn(`Failed to get branch details for 'refs/remotes/${branch.upstream.remote}/${branch.upstream.name}': ${err.message}.`);
return undefined;
}
}
async getRefs(query: RefQuery = {}, cancellationToken?: CancellationToken): Promise<Ref[]> {
const config = workspace.getConfiguration('git');
let defaultSort = config.get<'alphabetically' | 'committerdate'>('branchSortOrder');