Skip to content

Git - retrieve references as part of updating the model #228609

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
lszomoru merged 2 commits into from
Sep 13, 2024
+16 −5
Merged

Git - retrieve references as part of updating the model #228609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e96089
Git - retrieve references as part of updating the model
lszomoru Sep 13, 2024
31ff7fb
Remove extra import
lszomoru Sep 13, 2024
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
9 changes: 5 additions & 4 deletions extensions/git/src/historyProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,9 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
this.logger.trace(`[GitHistoryProvider][onDidRunWriteOperation] currentHistoryItemBaseRef: ${JSON.stringify(this._currentHistoryItemBaseRef)}`);

// Refs (alphabetically)
const refs = await this.repository.getRefs({ sort: 'alphabetically' });
const historyItemRefs = refs.map(ref => toSourceControlHistoryItemRef(ref));
const historyItemRefs = this.repository.refs
.map(ref => toSourceControlHistoryItemRef(ref))
.sort((a, b) => a.id.localeCompare(b.id));

// Auto-fetch
const silent = result.operation.kind === OperationKind.Fetch && result.operation.showProgress === false;
Expand Down Expand Up @@ -227,7 +228,7 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
await ensureEmojis();

return commits.map(commit => {
const references = this.resolveHistoryItemRefs(commit);
const references = this._resolveHistoryItemRefs(commit);

return {
id: commit.hash,
Expand Down Expand Up @@ -320,7 +321,7 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
return this.historyItemDecorations.get(uri.toString());
}

private resolveHistoryItemRefs(commit: Commit): SourceControlHistoryItemRef[] {
private _resolveHistoryItemRefs(commit: Commit): SourceControlHistoryItemRef[] {
const references: SourceControlHistoryItemRef[] = [];

for (const ref of commit.refNames) {
Expand Down
12 changes: 11 additions & 1 deletion extensions/git/src/repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,11 @@ export class Repository implements Disposable {
return this._HEAD;
}

private _refs: Ref[] = [];
get refs(): Ref[] {
return this._refs;
}

get headShortName(): string | undefined {
if (!this.HEAD) {
return;
Expand Down Expand Up @@ -2176,7 +2181,12 @@ export class Repository implements Disposable {
this._sourceControl.commitTemplate = commitTemplate;

// Execute cancellable long-running operation
const resourceGroups = await this.getStatus(cancellationToken);
const [resourceGroups, refs] =
await Promise.all([
this.getStatus(cancellationToken),
this.getRefs({}, cancellationToken)]);

this._refs = refs;
this._updateResourceGroupsState(resourceGroups);

this._onDidChangeStatus.fire();
Expand Down