CommandLine: Set local object cache location in git config

Copied changes from derrickstolee:gvfs-helper that updated Scalar verbs to set the object cache in git's config file.
microsoft · Oct 1, 2019 · c1e18fc · c1e18fc
1 parent ae71470
commit c1e18fc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 28 deletions.
diff --git a/Scalar.Common/Http/CacheServerResolver.cs b/Scalar.Common/Http/CacheServerResolver.cs
@@ -33,7 +33,6 @@ public static string GetUrlFromConfig(Enlistment enlistment)
             // TODO 1057500: Remove support for encoded-repo-url cache config setting
             return
                 GetValueFromConfig(git, ScalarConstants.GitConfig.CacheServer, localOnly: true)
-                ?? GetValueFromConfig(git, GetDeprecatedCacheConfigSettingName(enlistment), localOnly: false)
                 ?? enlistment.RepoUrl;
         }
 
@@ -144,17 +143,6 @@ private static string GetValueFromConfig(GitProcess git, string configName, bool
             return value;
         }
 
-        private static string GetDeprecatedCacheConfigSettingName(Enlistment enlistment)
-        {
-            string sectionUrl =
-                enlistment.RepoUrl.ToLowerInvariant()
-                .Replace("https://", string.Empty)
-                .Replace("http://", string.Empty)
-                .Replace('/', '.');
-
-            return ScalarConstants.GitConfig.ScalarPrefix + sectionUrl + ScalarConstants.GitConfig.DeprecatedCacheEndpointSuffix;
-        }
-
         private CacheServerInfo CreateNone()
         {
             return new CacheServerInfo(this.enlistment.RepoUrl, CacheServerInfo.ReservedNames.None);

diff --git a/Scalar.Common/ScalarConstants.cs b/Scalar.Common/ScalarConstants.cs
@@ -31,7 +31,7 @@ public static class GitConfig
             public const string MountId = ScalarPrefix + "mount-id";
             public const string EnlistmentId = ScalarPrefix + "enlistment-id";
             public const string CacheServer = ScalarPrefix + "cache-server";
-            public const string DeprecatedCacheEndpointSuffix = ".cache-server-url";
+            public const string ObjectCache = "gvfs.sharedCache";
             public const string ScalarTelemetryId = GitConfig.ScalarPrefix + "telemetry-id";
             public const string ScalarTelemetryPipe = GitConfig.ScalarPrefix + "telemetry-pipe";
             public const string IKey = GitConfig.ScalarPrefix + "ikey";

diff --git a/Scalar.UnitTests/Common/CacheServerResolverTests.cs b/Scalar.UnitTests/Common/CacheServerResolverTests.cs
@@ -25,16 +25,6 @@ public void CanGetCacheServerFromNewConfig()
             CacheServerResolver.GetUrlFromConfig(enlistment).ShouldEqual(CacheServerUrl);
         }
 
-        [TestCase]
-        public void CanGetCacheServerFromOldConfig()
-        {
-            MockScalarEnlistment enlistment = this.CreateEnlistment(null, CacheServerUrl);
-            CacheServerInfo cacheServer = CacheServerResolver.GetCacheServerFromConfig(enlistment);
-
-            cacheServer.Url.ShouldEqual(CacheServerUrl);
-            CacheServerResolver.GetUrlFromConfig(enlistment).ShouldEqual(CacheServerUrl);
-        }
-
         [TestCase]
         public void CanGetCacheServerWithNoConfig()
         {

diff --git a/Scalar/CommandLine/CloneVerb.cs b/Scalar/CommandLine/CloneVerb.cs
@@ -521,7 +521,7 @@ private Result CreateClone()
             }
 
             string errorMessage;
-            if (!this.TryCreateAlternatesFile(this.fileSystem, this.enlistment, out errorMessage))
+            if (!this.TrySetObjectCacheLocation(this.fileSystem, this.enlistment, out errorMessage))
             {
                 return new Result("Error configuring alternate: " + errorMessage);
             }

diff --git a/Scalar/CommandLine/ScalarVerb.cs b/Scalar/CommandLine/ScalarVerb.cs
@@ -436,14 +436,18 @@ protected void ValidateClientVersions(ITracer tracer, ScalarEnlistment enlistmen
             }
         }
 
-        protected bool TryCreateAlternatesFile(PhysicalFileSystem fileSystem, ScalarEnlistment enlistment, out string errorMessage)
+        protected bool TrySetObjectCacheLocation(PhysicalFileSystem fileSystem, ScalarEnlistment enlistment, out string errorMessage)
         {
             try
             {
                 string alternatesFilePath = this.GetAlternatesPath(enlistment);
                 string tempFilePath = alternatesFilePath + ".tmp";
-                fileSystem.WriteAllText(tempFilePath, enlistment.GitObjectsRoot);
+                string gitObjectsPath = enlistment.GitObjectsRoot.Replace(Path.PathSeparator, ScalarConstants.GitPathSeparator);
+                fileSystem.WriteAllText(tempFilePath, gitObjectsPath);
                 fileSystem.MoveAndOverwriteFile(tempFilePath, alternatesFilePath);
+
+                GitProcess process = new GitProcess(enlistment);
+                process.SetInLocalConfig(ScalarConstants.GitConfig.ObjectCache, gitObjectsPath);
             }
             catch (SecurityException e)
             {
@@ -914,7 +918,7 @@ private void EnsureLocalCacheIsHealthy(
                     {
                         tracer.RelatedInfo($"{nameof(this.EnsureLocalCacheIsHealthy)}: GitObjectsRoot ({enlistment.GitObjectsRoot}) missing from alternates files, recreating alternates");
                         string error;
-                        if (!this.TryCreateAlternatesFile(fileSystem, enlistment, out error))
+                        if (!this.TrySetObjectCacheLocation(fileSystem, enlistment, out error))
                         {
                             this.ReportErrorAndExit(tracer, $"Failed to update alternates file to include git objects root: {error}");
                         }
@@ -981,7 +985,7 @@ private void EnsureLocalCacheIsHealthy(
                     }
 
                     tracer.RelatedInfo($"{nameof(this.EnsureLocalCacheIsHealthy)}: Creating new alternates file");
-                    if (!this.TryCreateAlternatesFile(fileSystem, enlistment, out error))
+                    if (!this.TrySetObjectCacheLocation(fileSystem, enlistment, out error))
                     {
                         this.ReportErrorAndExit(tracer, $"Failed to update alterates file with new objects path: {error}");
                     }