caches git objects

Uses lazy initialization to cache references and remotes.

Author: arturcic

src/GitVersion.LibGit2Sharp/Git/GitRepository.cs

@@ -12,6 +12,9 @@ internal sealed partial class GitRepository
     private readonly ConcurrentDictionary<string, Branch> cachedBranches = new();
     private readonly ConcurrentDictionary<string, Commit> cachedCommits = new();
     private readonly ConcurrentDictionary<string, Tag> cachedTags = new();
+    private readonly ConcurrentDictionary<string, Remote> cachedRemotes = new();
+    private readonly ConcurrentDictionary<string, Reference> cachedReferences = new();
+    private readonly ConcurrentDictionary<string, RefSpec> cachedRefSpecs = new();
 
     private IRepository RepositoryInstance
     {
@@ -28,10 +31,10 @@ private IRepository RepositoryInstance
     public IBranch Head => GetOrWrap(RepositoryInstance.Head, RepositoryInstance.Diff);
 
     public ITagCollection Tags => new TagCollection(RepositoryInstance.Tags, RepositoryInstance.Diff, this);
-    public IReferenceCollection References => new ReferenceCollection(RepositoryInstance.Refs);
     public IBranchCollection Branches => new BranchCollection(RepositoryInstance.Branches, RepositoryInstance.Diff, this);
     public ICommitCollection Commits => new CommitCollection(RepositoryInstance.Commits, RepositoryInstance.Diff, this);
-    public IRemoteCollection Remotes => new RemoteCollection(RepositoryInstance.Network.Remotes);
+    public IRemoteCollection Remotes => new RemoteCollection(RepositoryInstance.Network.Remotes, this);
+    public IReferenceCollection References => new ReferenceCollection(RepositoryInstance.Refs, this);
 
     public void DiscoverRepository(string? gitDirectory)
     {
@@ -65,23 +68,26 @@ public int UncommittedChangesCount()
 
     public Branch GetOrWrap(LibGit2Sharp.Branch innerBranch, Diff repoDiff)
     {
-        if (innerBranch.Tip is null)
-        {
-            return new Branch(innerBranch, repoDiff, this);
-        }
-
-        var cacheKey = $"{innerBranch.RemoteName}/{innerBranch.CanonicalName}@{innerBranch.Tip.Sha}";
+        var cacheKey = innerBranch.Tip is null
+            ? $"{innerBranch.RemoteName}/{innerBranch.CanonicalName}"
+            : $"{innerBranch.RemoteName}/{innerBranch.CanonicalName}@{innerBranch.Tip.Sha}";
         return cachedBranches.GetOrAdd(cacheKey, _ => new Branch(innerBranch, repoDiff, this));
     }
 
-    public Commit GetOrWrap(LibGit2Sharp.Commit innerCommit, Diff repoDiff) =>
-        cachedCommits.GetOrAdd(innerCommit.Sha, _ => new Commit(innerCommit, repoDiff, this));
+    public Commit GetOrWrap(LibGit2Sharp.Commit innerCommit, Diff repoDiff)
+        => cachedCommits.GetOrAdd(innerCommit.Sha, _ => new Commit(innerCommit, repoDiff, this));
 
     public Tag GetOrWrap(LibGit2Sharp.Tag innerTag, Diff repoDiff)
-    {
-        var cacheKey = $"{innerTag.CanonicalName}@{innerTag.Target.Sha}";
-        return cachedTags.GetOrAdd(cacheKey, _ => new Tag(innerTag, repoDiff, this));
-    }
+        => cachedTags.GetOrAdd(innerTag.CanonicalName, _ => new Tag(innerTag, repoDiff, this));
+
+    public Remote GetOrWrap(LibGit2Sharp.Remote innerRemote)
+        => cachedRemotes.GetOrAdd(innerRemote.Name, _ => new Remote(innerRemote, this));
+
+    public Reference GetOrWrap(LibGit2Sharp.Reference innerReference)
+        => cachedReferences.GetOrAdd(innerReference.CanonicalName, _ => new Reference(innerReference));
+
+    public RefSpec GetOrWrap(LibGit2Sharp.RefSpec innerRefSpec)
+        => cachedRefSpecs.GetOrAdd(innerRefSpec.Specification, _ => new RefSpec(innerRefSpec));
 
     public void Dispose()
     {

src/GitVersion.LibGit2Sharp/Git/RefSpecCollection.cs

@@ -6,10 +6,10 @@ internal sealed class RefSpecCollection : IRefSpecCollection
 {
     private readonly Lazy<IReadOnlyCollection<IRefSpec>> refSpecs;
 
-    internal RefSpecCollection(LibGit2Sharp.RefSpecCollection collection)
+    internal RefSpecCollection(LibGit2Sharp.RefSpecCollection innerCollection, GitRepository repo)
     {
-        collection = collection.NotNull();
-        this.refSpecs = new Lazy<IReadOnlyCollection<IRefSpec>>(() => [.. collection.Select(tag => new RefSpec(tag))]);
+        innerCollection = innerCollection.NotNull();
+        this.refSpecs = new Lazy<IReadOnlyCollection<IRefSpec>>(() => [.. innerCollection.Select(repo.GetOrWrap)]);
     }
 
     public IEnumerator<IRefSpec> GetEnumerator() => this.refSpecs.Value.GetEnumerator();

src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs

@@ -5,38 +5,38 @@ namespace GitVersion.Git;
 internal sealed class ReferenceCollection : IReferenceCollection
 {
     private readonly LibGit2Sharp.ReferenceCollection innerCollection;
-    private IReadOnlyCollection<IReference>? references;
+    private readonly GitRepository repo;
+    private readonly Lazy<IReadOnlyCollection<IReference>> references;
 
-    internal ReferenceCollection(LibGit2Sharp.ReferenceCollection collection) => this.innerCollection = collection.NotNull();
-
-    public IEnumerator<IReference> GetEnumerator()
+    internal ReferenceCollection(LibGit2Sharp.ReferenceCollection collection, GitRepository repo)
     {
-        this.references ??= [.. this.innerCollection.Select(reference => new Reference(reference))];
-        return this.references.GetEnumerator();
+        this.innerCollection = collection.NotNull();
+        this.repo = repo.NotNull();
+        this.references = new Lazy<IReadOnlyCollection<IReference>>(() => [.. this.innerCollection.Select(repo.GetOrWrap)]);
     }
 
+    public IEnumerator<IReference> GetEnumerator() => this.references.Value.GetEnumerator();
+
     IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
-    public void Add(string name, string canonicalRefNameOrObject, bool allowOverwrite = false) => this.innerCollection.Add(name, canonicalRefNameOrObject, allowOverwrite);
+    public void Add(string name, string canonicalRefNameOrObject, bool allowOverwrite = false)
+        => this.innerCollection.Add(name, canonicalRefNameOrObject, allowOverwrite);
 
     public void UpdateTarget(IReference directRef, IObjectId targetId)
-    {
-        RepositoryExtensions.RunSafe(() => this.innerCollection.UpdateTarget((Reference)directRef, (ObjectId)targetId));
-        this.references = null;
-    }
+        => RepositoryExtensions.RunSafe(() => this.innerCollection.UpdateTarget((Reference)directRef, (ObjectId)targetId));
 
     public IReference? this[string name]
     {
         get
         {
             var reference = this.innerCollection[name];
-            return reference is null ? null : new Reference(reference);
+            return reference is null ? null : this.repo.GetOrWrap(reference);
         }
     }
 
     public IReference? this[ReferenceName referenceName] => this[referenceName.Canonical];
 
     public IReference? Head => this["HEAD"];
 
-    public IEnumerable<IReference> FromGlob(string prefix) => this.innerCollection.FromGlob(prefix).Select(reference => new Reference(reference));
+    public IEnumerable<IReference> FromGlob(string prefix) => this.innerCollection.FromGlob(prefix).Select(reference => this.repo.GetOrWrap(reference));
 }

src/GitVersion.LibGit2Sharp/Git/Remote.cs

@@ -9,22 +9,27 @@ internal sealed class Remote : IRemote
     private static readonly LambdaKeyComparer<IRemote, string> comparerHelper = new(x => x.Name);
 
     private readonly LibGit2Sharp.Remote innerRemote;
+    private readonly GitRepository repo;
 
-    internal Remote(LibGit2Sharp.Remote remote) => this.innerRemote = remote.NotNull();
+    internal Remote(LibGit2Sharp.Remote remote, GitRepository repo)
+    {
+        this.innerRemote = remote.NotNull();
+        this.repo = repo.NotNull();
+    }
 
     public int CompareTo(IRemote? other) => comparerHelper.Compare(this, other);
     public bool Equals(IRemote? other) => equalityHelper.Equals(this, other);
     public string Name => this.innerRemote.Name;
     public string Url => this.innerRemote.Url;
 
-    public IEnumerable<IRefSpec> RefSpecs
+    private IEnumerable<IRefSpec> RefSpecs
     {
         get
         {
             var refSpecs = this.innerRemote.RefSpecs;
             return refSpecs is null
                 ? []
-                : new RefSpecCollection((LibGit2Sharp.RefSpecCollection)refSpecs);
+                : new RefSpecCollection((LibGit2Sharp.RefSpecCollection)refSpecs, repo);
         }
     }
 

src/GitVersion.LibGit2Sharp/Git/RemoteCollection.cs

@@ -5,36 +5,32 @@ namespace GitVersion.Git;
 internal sealed class RemoteCollection : IRemoteCollection
 {
     private readonly LibGit2Sharp.RemoteCollection innerCollection;
-    private IReadOnlyCollection<IRemote>? remotes;
+    private readonly GitRepository repo;
+    private readonly Lazy<IReadOnlyCollection<IRemote>> remotes;
 
-    internal RemoteCollection(LibGit2Sharp.RemoteCollection collection) => this.innerCollection = collection.NotNull();
-
-    public IEnumerator<IRemote> GetEnumerator()
+    internal RemoteCollection(LibGit2Sharp.RemoteCollection collection, GitRepository repo)
     {
-        this.remotes ??= [.. this.innerCollection.Select(reference => new Remote(reference))];
-        return this.remotes.GetEnumerator();
+        this.innerCollection = collection.NotNull();
+        this.repo = repo.NotNull();
+        this.remotes = new Lazy<IReadOnlyCollection<IRemote>>(() => [.. this.innerCollection.Select(repo.GetOrWrap)]);
     }
 
+    public IEnumerator<IRemote> GetEnumerator() => this.remotes.Value.GetEnumerator();
+
     IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
     public IRemote? this[string name]
     {
         get
         {
             var remote = this.innerCollection[name];
-            return remote is null ? null : new Remote(remote);
+            return remote is null ? null : this.repo.GetOrWrap(remote);
         }
     }
 
     public void Remove(string remoteName)
-    {
-        this.innerCollection.Remove(remoteName);
-        this.remotes = null;
-    }
+        => this.innerCollection.Remove(remoteName);
 
     public void Update(string remoteName, string refSpec)
-    {
-        this.innerCollection.Update(remoteName, r => r.FetchRefSpecs.Add(refSpec));
-        this.remotes = null;
-    }
+        => this.innerCollection.Update(remoteName, r => r.FetchRefSpecs.Add(refSpec));
 }