From 6ce00f686860865a24808f3ced7099c16a0ef03c Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Thu, 29 Nov 2018 03:04:45 -0500 Subject: [PATCH] Adds branch and tag caching --- src/git/gitService.ts | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/src/git/gitService.ts b/src/git/gitService.ts index a3adb31..f781d76 100644 --- a/src/git/gitService.ts +++ b/src/git/gitService.ts @@ -102,11 +102,15 @@ export class GitService implements Disposable { private readonly _repositoryTree: TernarySearchTree; private _repositoriesLoadingPromise: Promise | undefined; private _suspended: boolean = false; - private readonly _trackedCache: Map>; + + private readonly _branchesCache = new Map(); + private readonly _tagsCache = new Map(); + private readonly _tagsWithRefsCache = new Map(); + private readonly _trackedCache = new Map>(); + private readonly _userMapCache = new Map(); constructor() { this._repositoryTree = TernarySearchTree.forPaths(); - this._trackedCache = new Map(); this._disposable = Disposable.from( window.onDidChangeWindowState(this.onWindowStateChanged, this), @@ -120,7 +124,11 @@ export class GitService implements Disposable { dispose() { this._repositoryTree.forEach(r => r.dispose()); + this._branchesCache.clear(); + this._tagsCache.clear(); + this._tagsWithRefsCache.clear(); this._trackedCache.clear(); + this._userMapCache.clear(); this._disposable && this._disposable.dispose(); } @@ -132,6 +140,10 @@ export class GitService implements Disposable { private onAnyRepositoryChanged(repo: Repository, reason: RepositoryChange) { this._trackedCache.clear(); + this._branchesCache.delete(repo.path); + this._tagsCache.delete(repo.path); + this._tagsWithRefsCache.clear(); + if (reason === RepositoryChange.Config) { this._userMapCache.delete(repo.path); } @@ -1064,14 +1076,21 @@ export class GitService implements Disposable { async getBranches(repoPath: string | undefined): Promise { if (repoPath === undefined) return []; + let branches = this._branchesCache.get(repoPath); + if (branches !== undefined) return branches; + const data = await Git.branch(repoPath, { all: true }); // If we don't get any data, assume the repo doesn't have any commits yet so check if we have a current branch if (data === '') { const current = await this.getBranch(repoPath); - return current !== undefined ? [current] : []; + branches = current !== undefined ? [current] : []; + } + else { + branches = GitBranchParser.parse(data, repoPath) || []; } - return GitBranchParser.parse(data, repoPath) || []; + this._branchesCache.set(repoPath, branches); + return branches; } @log() @@ -1085,8 +1104,6 @@ export class GitService implements Disposable { return await Git.config_get(key, repoPath); } - private _userMapCache = new Map(); - @log() async getCurrentUser(repoPath: string) { let user = this._userMapCache.get(repoPath); @@ -1820,13 +1837,24 @@ export class GitService implements Disposable { async getTags(repoPath: string | undefined, options: { includeRefs?: boolean } = {}): Promise { if (repoPath === undefined) return []; + let tags; if (options.includeRefs) { + tags = this._tagsWithRefsCache.get(repoPath); + if (tags !== undefined) return tags; + const data = await Git.showref_tag(repoPath); - return GitTagParser.parseWithRef(data, repoPath) || []; + tags = GitTagParser.parseWithRef(data, repoPath) || []; + this._tagsWithRefsCache.set(repoPath, tags); + return tags; } + tags = this._tagsCache.get(repoPath); + if (tags !== undefined) return tags; + const data = await Git.tag(repoPath); - return GitTagParser.parse(data, repoPath) || []; + tags = GitTagParser.parse(data, repoPath) || []; + this._tagsCache.set(repoPath, tags); + return tags; } @log()