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

Git - only calculate branch merge base on checkout (#228066)

Browse Source
This commit is contained in:
Ladislau Szomoru
2024-09-10 08:45:20 +02:00
committed by GitHub
parent 789c320a1c
commit fea0aa298b
1 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
extensions/git/src/historyProvider.ts
View File

@@ -62,7 +62,10 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
this._onDidChangeCurrentHistoryItemGroup.fire();
}
private _HEAD: Branch | undefined;
private historyItemRefs: SourceControlHistoryItemRef[] = [];
private historyItemBaseRef: SourceControlHistoryItemRef | undefined;
private historyItemDecorations = new Map<string, FileDecoration>();
private disposables: Disposable[] = [];
@@ -79,37 +82,56 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
return;
}
// Get the merge base of the current history item group
const mergeBase = await this.resolveHEADMergeBase();
let historyItemRefId = '';
let historyItemRefName = '';
// Handle tag, and detached commit
const currentHistoryItemGroupId =
this.repository.HEAD.name === undefined ?
this.repository.HEAD.commit :
this.repository.HEAD.type === RefType.Tag ?
`refs/tags/${this.repository.HEAD.name}` :
`refs/heads/${this.repository.HEAD.name}`;
switch (this.repository.HEAD.type) {
case RefType.Head: {
if (this.repository.HEAD.name !== undefined) {
// Branch
historyItemRefId = `refs/heads/${this.repository.HEAD.name}`;
historyItemRefName = this.repository.HEAD.name;
// Detached commit
const currentHistoryItemGroupName =
this.repository.HEAD.name ?? this.repository.HEAD.commit;
// Merge base if the branch has changed
if (this._HEAD?.name !== this.repository.HEAD.name) {
const mergeBase = await this.resolveHEADMergeBase();
this.historyItemBaseRef = mergeBase &&
(mergeBase.remote !== this.repository.HEAD.upstream?.remote ||
mergeBase.name !== this.repository.HEAD.upstream?.name) ? {
id: `refs/remotes/${mergeBase.remote}/${mergeBase.name}`,
name: `${mergeBase.remote}/${mergeBase.name}`,
revision: mergeBase.commit
} : undefined;
}
} else {
// Detached commit
historyItemRefId = this.repository.HEAD.commit ?? '';
historyItemRefName = this.repository.HEAD.commit ?? '';
this.historyItemBaseRef = undefined;
}
break;
}
case RefType.Tag: {
// Tag
historyItemRefId = `refs/tags/${this.repository.HEAD.name}`;
historyItemRefName = this.repository.HEAD.name ?? this.repository.HEAD.commit ?? '';
this.historyItemBaseRef = undefined;
break;
}
}
this._HEAD = this.repository.HEAD;
this.currentHistoryItemGroup = {
id: currentHistoryItemGroupId ?? '',
name: currentHistoryItemGroupName ?? '',
id: historyItemRefId,
name: historyItemRefName,
revision: this.repository.HEAD.commit,
remote: this.repository.HEAD.upstream ? {
id: `refs/remotes/${this.repository.HEAD.upstream.remote}/${this.repository.HEAD.upstream.name}`,
name: `${this.repository.HEAD.upstream.remote}/${this.repository.HEAD.upstream.name}`,
revision: this.repository.HEAD.upstream.commit
} : undefined,
base: mergeBase &&
(mergeBase.remote !== this.repository.HEAD.upstream?.remote ||
mergeBase.name !== this.repository.HEAD.upstream?.name) ? {
id: `refs/remotes/${mergeBase.remote}/${mergeBase.name}`,
name: `${mergeBase.remote}/${mergeBase.name}`,
revision: mergeBase.commit
} : undefined
base: this.historyItemBaseRef
};
this.logger.trace(`[GitHistoryProvider][onDidRunGitStatus] currentHistoryItemGroup: ${JSON.stringify(this.currentHistoryItemGroup)}`);