Code Review: remove logger from IReferenceCollection

GitTools · Feb 7, 2021 · b66ac01 · b66ac01
1 parent 626286d
commit b66ac01
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/GitVersion.Core/Core/GitPreparer.cs b/src/GitVersion.Core/Core/GitPreparer.cs
@@ -330,7 +330,7 @@ private void CreateOrUpdateLocalBranchesFromRemoteTrackingOnes(string remoteName
                     }
                     var remoteRefTipId = remoteTrackingReference.ReferenceTargetId;
                     log.Info($"Updating local ref '{localRef.Name.Canonical}' to point at {remoteRefTipId}.");
-                    repository.Refs.UpdateTarget(localRef, remoteRefTipId, log);
+                    new OperationWithExponentialBackoff<LockedFileException>(new ThreadSleep(), log, () => repository.Refs.UpdateTarget(localRef, remoteRefTipId), maxRetries: 6).ExecuteAsync().Wait();
                     continue;
                 }
 
@@ -383,7 +383,7 @@ public void EnsureLocalBranchExistsForCurrentBranch(IRemote remote, string curre
                 log.Info(isBranch ? $"Updating local branch {referenceName} to point at {repoTip}"
                     : $"Updating local branch {referenceName} to match ref {currentBranch}");
                 var localRef = repository.Refs[localCanonicalName];
-                repository.Refs.UpdateTarget(localRef, repoTipId, log);
+                new OperationWithExponentialBackoff<LockedFileException>(new ThreadSleep(), log, () => repository.Refs.UpdateTarget(localRef, repoTipId), maxRetries: 6).ExecuteAsync().Wait();
             }
 
             repository.Checkout(localCanonicalName);

diff --git a/src/GitVersion.Core/Git/IReferenceCollection.cs b/src/GitVersion.Core/Git/IReferenceCollection.cs
@@ -1,4 +1,5 @@
 using GitVersion.Logging;
+using System;
 using System.Collections.Generic;
 
 namespace GitVersion
@@ -8,7 +9,14 @@ public interface IReferenceCollection : IEnumerable<IReference>
         IReference Head { get; }
         IReference this[string name] { get; }
         void Add(string name, string canonicalRefNameOrObjectish, bool allowOverwrite = false);
-        void UpdateTarget(IReference directRef, IObjectId targetId, ILog log);
+        void UpdateTarget(IReference directRef, IObjectId targetId);
         IEnumerable<IReference> FromGlob(string prefix);
     }
+
+    public class LockedFileException : Exception
+    {
+        public LockedFileException(Exception inner) : base(inner.Message, inner)
+        {
+        }
+    }
 }
diff --git a/src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs b/src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs
@@ -1,5 +1,3 @@
-using GitVersion.Helpers;
-using GitVersion.Logging;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -21,9 +19,17 @@ public void Add(string name, string canonicalRefNameOrObjectish, bool allowOverw
             innerCollection.Add(name, canonicalRefNameOrObjectish, allowOverwrite);
         }
 
-        public void UpdateTarget(IReference directRef, IObjectId targetId, ILog log)
+        public void UpdateTarget(IReference directRef, IObjectId targetId)
         {
-            new OperationWithExponentialBackoff<LibGit2Sharp.LockedFileException>(new ThreadSleep(), log, () => innerCollection.UpdateTarget((Reference)directRef, (ObjectId)targetId), maxRetries: 6).ExecuteAsync().Wait();
+            try
+            {
+                innerCollection.UpdateTarget((Reference)directRef, (ObjectId)targetId);
+            }
+            catch (LibGit2Sharp.LockedFileException ex)
+            {
+                // Wrap this exception so that callers that want to catch it don't need to take a dependency on LibGit2Sharp.
+                throw new LockedFileException(ex);
+            }
         }
 
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();