Initial sparse implementation

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
microsoft · Aug 22, 2019 · ecb213e · ecb213e
1 parent 536ae42
commit ecb213e
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 2 deletions.
diff --git a/Scalar.Build/Scalar.props b/Scalar.Build/Scalar.props
@@ -3,7 +3,7 @@
 
   <PropertyGroup Label="Parameters">
     <ScalarVersion>0.2.173.2</ScalarVersion>
-    <GitPackageVersion>2.20190820.1</GitPackageVersion>
+    <GitPackageVersion>2.20190822.3-sc</GitPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="DefaultSettings">

diff --git a/Scalar.Common/Git/GitProcess.cs b/Scalar.Common/Git/GitProcess.cs
@@ -88,6 +88,11 @@ public static Result Init(Enlistment enlistment)
             return new GitProcess(enlistment).InvokeGitOutsideEnlistment("init \"" + enlistment.WorkingDirectoryBackingRoot + "\"");
         }
 
+        public static Result SparseCheckoutInit(Enlistment enlistment)
+        {
+            return new GitProcess(enlistment).InvokeGitInWorkingDirectoryRoot("sparse-checkout init", useReadObjectHook: false);
+        }
+
         public static ConfigResult GetFromGlobalConfig(string gitBinPath, string settingName)
         {
             return new ConfigResult(

diff --git a/Scalar.FunctionalTests/Tools/ScalarProcess.cs b/Scalar.FunctionalTests/Tools/ScalarProcess.cs
@@ -29,8 +29,9 @@ public ScalarProcess(string pathToScalar, string enlistmentRoot, string localCac
 
         public void Clone(string repositorySource, string branchToCheckout, bool skipPrefetch)
         {
+            // TODO: consider sparse clone for functional tests
             string args = string.Format(
-                "clone \"{0}\" \"{1}\" --branch \"{2}\" --local-cache-path \"{3}\" {4}",
+                "clone --sparse=false \"{0}\" \"{1}\" --branch \"{2}\" --local-cache-path \"{3}\" {4}",
                 repositorySource,
                 this.enlistmentRoot,
                 branchToCheckout,

diff --git a/Scalar/CommandLine/CloneVerb.cs b/Scalar/CommandLine/CloneVerb.cs
@@ -3,10 +3,15 @@
 using Scalar.Common.FileSystem;
 using Scalar.Common.Git;
 using Scalar.Common.Http;
+<<<<<<< HEAD
 using Scalar.Common.Prefetch;
 using Scalar.Common.Tracing;
 using System;
 using System.Collections.Generic;
+=======
+using Scalar.Common.Tracing;
+using System;
+>>>>>>> Initial sparse implementation [PR BUILD]
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -67,6 +72,16 @@ public class CloneVerb : ScalarVerb
             HelpText = "Use this option to override the path for the local Scalar cache.")]
         public string LocalCacheRoot { get; set; }
 
+<<<<<<< HEAD
+=======
+        [Option(
+            "sparse",
+            Required = false,
+            Default = true,
+            HelpText = "When cloning, create a sparse working directory.")]
+        public bool Sparse { get; set; }
+
+>>>>>>> Initial sparse implementation [PR BUILD]
         protected override string VerbName
         {
             get { return CloneVerbName; }
@@ -520,6 +535,7 @@ private Result CreateClone(
                 return new Result(installHooksError);
             }
 
+<<<<<<< HEAD
             // Place block below in an if statement when sparse clone is available.
             {
                 BlobPrefetcher prefetcher = new BlobPrefetcher(
@@ -542,6 +558,8 @@ private Result CreateClone(
                                 hydratedFileCount: out int _);
             }
 
+=======
+>>>>>>> Initial sparse implementation [PR BUILD]
             GitProcess.Result forceCheckoutResult = git.ForceCheckout(branch);
             if (forceCheckoutResult.ExitCodeIsFailure && forceCheckoutResult.Errors.IndexOf("unable to read tree") > 0)
             {
@@ -639,6 +657,20 @@ private Result TryInitRepo(ITracer tracer, GitRefs refs, Enlistment enlistmentTo
                 Path.Combine(repoPath, ScalarConstants.DotGit.PackedRefs),
                 refs.ToPackedRefs());
 
+<<<<<<< HEAD
+=======
+            if (this.Sparse)
+            {
+                GitProcess.Result sparseCheckoutResult = GitProcess.SparseCheckoutInit(enlistmentToInit);
+                if (sparseCheckoutResult.ExitCodeIsFailure)
+                {
+                    string error = string.Format("Could not init sparse-checkout at to {0}: {1}", repoPath, sparseCheckoutResult.Errors);
+                    tracer.RelatedError(error);
+                    return new Result(error);
+                }
+            }
+
+>>>>>>> Initial sparse implementation [PR BUILD]
             return new Result(true);
         }