Merge pull request microsoft#27 Remove GVFSLock.Shared.cs and AllowAl…

…lLocksNamedPipeServer Remove GVFSLock.Shared.cs and AllowAllLocksNamedPipeServer
chrisd8088 · Aug 8, 2019 · 3f0732c · 3f0732c
2 parents 5b6a1cf + 72d71a9
commit 3f0732c
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 295 deletions.
diff --git a/GVFS/GVFS.Common/GVFSLock.Shared.cs b/GVFS/GVFS.Common/GVFSLock.Shared.cs
diff --git a/GVFS/GVFS.Common/NamedPipes/AllowAllLocksNamedPipeServer.cs b/GVFS/GVFS.Common/NamedPipes/AllowAllLocksNamedPipeServer.cs
diff --git a/GVFS/GVFS/CommandLine/CloneVerb.cs b/GVFS/GVFS/CommandLine/CloneVerb.cs
@@ -322,85 +322,62 @@ private Result TryClone(
             ServerGVFSConfig serverGVFSConfig,
             string resolvedLocalCacheRoot)
         {
-            Result pipeResult;
-            using (NamedPipeServer pipeServer = this.StartNamedPipe(tracer, enlistment, out pipeResult))
+            using (GitObjectsHttpRequestor objectRequestor = new GitObjectsHttpRequestor(tracer, enlistment, cacheServer, retryConfig))
             {
-                if (!pipeResult.Success)
+                GitRefs refs = objectRequestor.QueryInfoRefs(this.SingleBranch ? this.Branch : null);
+
+                if (refs == null)
                 {
-                    return pipeResult;
+                    return new Result("Could not query info/refs from: " + Uri.EscapeUriString(enlistment.RepoUrl));
                 }
 
-                using (GitObjectsHttpRequestor objectRequestor = new GitObjectsHttpRequestor(tracer, enlistment, cacheServer, retryConfig))
+                if (this.Branch == null)
                 {
-                    GitRefs refs = objectRequestor.QueryInfoRefs(this.SingleBranch ? this.Branch : null);
+                    this.Branch = refs.GetDefaultBranch();
 
-                    if (refs == null)
-                    {
-                        return new Result("Could not query info/refs from: " + Uri.EscapeUriString(enlistment.RepoUrl));
-                    }
-
-                    if (this.Branch == null)
+                    EventMetadata metadata = new EventMetadata();
+                    metadata.Add("Branch", this.Branch);
+                    tracer.RelatedEvent(EventLevel.Informational, "CloneDefaultRemoteBranch", metadata);
+                }
+                else
+                {
+                    if (!refs.HasBranch(this.Branch))
                     {
-                        this.Branch = refs.GetDefaultBranch();
-
                         EventMetadata metadata = new EventMetadata();
                         metadata.Add("Branch", this.Branch);
-                        tracer.RelatedEvent(EventLevel.Informational, "CloneDefaultRemoteBranch", metadata);
-                    }
-                    else
-                    {
-                        if (!refs.HasBranch(this.Branch))
-                        {
-                            EventMetadata metadata = new EventMetadata();
-                            metadata.Add("Branch", this.Branch);
-                            tracer.RelatedEvent(EventLevel.Warning, "CloneBranchDoesNotExist", metadata);
-
-                            string errorMessage = string.Format("Remote branch {0} not found in upstream origin", this.Branch);
-                            return new Result(errorMessage);
-                        }
-                    }
-
-                    if (!enlistment.TryCreateEnlistmentFolders())
-                    {
-                        string error = "Could not create enlistment directory";
-                        tracer.RelatedError(error);
-                        return new Result(error);
-                    }
+                        tracer.RelatedEvent(EventLevel.Warning, "CloneBranchDoesNotExist", metadata);
 
-                    if (!GVFSPlatform.Instance.FileSystem.IsFileSystemSupported(enlistment.EnlistmentRoot, out string fsError))
-                    {
-                        string error = $"FileSystem unsupported: {fsError}";
-                        tracer.RelatedError(error);
-                        return new Result(error);
+                        string errorMessage = string.Format("Remote branch {0} not found in upstream origin", this.Branch);
+                        return new Result(errorMessage);
                     }
+                }
 
-                    string localCacheError;
-                    if (!this.TryDetermineLocalCacheAndInitializePaths(tracer, enlistment, serverGVFSConfig, cacheServer, resolvedLocalCacheRoot, out localCacheError))
-                    {
-                        tracer.RelatedError(localCacheError);
-                        return new Result(localCacheError);
-                    }
+                if (!enlistment.TryCreateEnlistmentFolders())
+                {
+                    string error = "Could not create enlistment directory";
+                    tracer.RelatedError(error);
+                    return new Result(error);
+                }
 
-                    Directory.CreateDirectory(enlistment.GitObjectsRoot);
-                    Directory.CreateDirectory(enlistment.GitPackRoot);
-                    Directory.CreateDirectory(enlistment.BlobSizesRoot);
+                if (!GVFSPlatform.Instance.FileSystem.IsFileSystemSupported(enlistment.EnlistmentRoot, out string fsError))
+                {
+                    string error = $"FileSystem unsupported: {fsError}";
+                    tracer.RelatedError(error);
+                    return new Result(error);
+                }
 
-                    return this.CreateClone(tracer, enlistment, objectRequestor, refs, this.Branch);
+                string localCacheError;
+                if (!this.TryDetermineLocalCacheAndInitializePaths(tracer, enlistment, serverGVFSConfig, cacheServer, resolvedLocalCacheRoot, out localCacheError))
+                {
+                    tracer.RelatedError(localCacheError);
+                    return new Result(localCacheError);
                 }
-            }
-        }
 
-        private NamedPipeServer StartNamedPipe(ITracer tracer, GVFSEnlistment enlistment, out Result errorResult)
-        {
-            try
-            {
-                errorResult = new Result(true);
-                return AllowAllLocksNamedPipeServer.Create(tracer, enlistment);
-            }
-            catch (PipeNameLengthException)
-            {
-                errorResult = new Result("Failed to clone. Path exceeds the maximum number of allowed characters");
-                return null;
+                Directory.CreateDirectory(enlistment.GitObjectsRoot);
+                Directory.CreateDirectory(enlistment.GitPackRoot);
+                Directory.CreateDirectory(enlistment.BlobSizesRoot);
+
+                return this.CreateClone(tracer, enlistment, objectRequestor, refs, this.Branch);
             }
         }
 

diff --git a/GVFS/GVFS/CommandLine/DehydrateVerb.cs b/GVFS/GVFS/CommandLine/DehydrateVerb.cs
@@ -401,14 +401,11 @@ private bool TryRecreateIndex(ITracer tracer, GVFSEnlistment enlistment)
                 () =>
                 {
                     // Create a new index based on the new minimal modified paths
-                    using (NamedPipeServer pipeServer = AllowAllLocksNamedPipeServer.Create(tracer, enlistment))
-                    {
-                        GitProcess git = new GitProcess(enlistment);
-                        GitProcess.Result checkoutResult = git.ForceCheckout("HEAD");
+                    GitProcess git = new GitProcess(enlistment);
+                    GitProcess.Result checkoutResult = git.ForceCheckout("HEAD");
 
-                        errorMessage = checkoutResult.Errors;
-                        return checkoutResult.ExitCodeIsSuccess;
-                    }
+                    errorMessage = checkoutResult.Errors;
+                    return checkoutResult.ExitCodeIsSuccess;
                 },
                 "Recreating git index",
                 suppressGvfsLogMessage: true))