Merge pull request #1655: Release for April 2020

Includes the following PRs:

* #1642: Update Git to v2.26.0 
* #1647: Fix commit-graph expiration
* #1652: RepoRegistry: ignore non-existent repos
* #1653: Update Git to include v2.26.1

The update to include Git v2.26.0 comes with a new default backend for `git rebase`. By switching from the `apply` backend to the `merge` backend, some rebase situations that would previously fail will now succeed automatically. This comes with a slight performance drawback, but it is the direction that the Git community has decided to go. Please see [the Git documentation](https://git-scm.com/docs/git-rebase#_behavioral_differences) for more details.

Author: derrickstolee

GVFS/GVFS.Build/GVFS.props

@@ -3,7 +3,7 @@
 
   <PropertyGroup Label="Parameters">
     <GVFSVersion>0.2.173.2</GVFSVersion>
-    <GitPackageVersion>2.20200221.5</GitPackageVersion>
+    <GitPackageVersion>2.20200414.2</GitPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="DefaultSettings">

GVFS/GVFS.Common/Git/GitProcess.cs

@@ -16,6 +16,7 @@ public class GitProcess : ICredentialStore
 
         private static readonly Encoding UTF8NoBOM = new UTF8Encoding(false);
         private static bool failedToSetEncoding = false;
+        private static string expireTimeDateString;
 
         /// <summary>
         /// Lock taken for duration of running executingProcess.
@@ -81,6 +82,19 @@ public GitProcess(string gitBinPath, string workingDirectoryRoot)
             }
         }
 
+        public static string ExpireTimeDateString
+        {
+            get
+            {
+                if (expireTimeDateString == null)
+                {
+                    expireTimeDateString = DateTime.Now.Subtract(TimeSpan.FromDays(1)).ToShortDateString();
+                }
+
+                return expireTimeDateString;
+            }
+        }
+
         public bool LowerPriority { get; set; }
 
         public static Result Init(Enlistment enlistment)
@@ -540,7 +554,7 @@ public Result WriteCommitGraph(string objectDir, List<string> packs)
         {
             // Do not expire commit-graph files that have been modified in the last hour.
             // This will prevent deleting any commit-graph files that are currently in the commit-graph-chain.
-            string command = $"commit-graph write --stdin-packs --split --size-multiple=4 --expire-time={1 * 60 * 60} --object-dir \"{objectDir}\"";
+            string command = $"commit-graph write --stdin-packs --split --size-multiple=4 --expire-time={ExpireTimeDateString} --object-dir \"{objectDir}\"";
             return this.InvokeGitInWorkingDirectoryRoot(
                 command,
                 useReadObjectHook: true,

GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitRepoTests.cs

@@ -5,7 +5,6 @@
 using GVFS.Tests.Should;
 using NUnit.Framework;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
@@ -204,6 +203,7 @@ protected void CreateEnlistment(string commitish = null)
         {
             this.Enlistment = GVFSFunctionalTestEnlistment.CloneAndMount(GVFSTestConfig.PathToGVFS, commitish: commitish);
             GitProcess.Invoke(this.Enlistment.RepoRoot, "config advice.statusUoption false");
+            GitProcess.Invoke(this.Enlistment.RepoRoot, "config core.editor true");
             this.ControlGitRepo = ControlGitRepo.Create(commitish);
             this.ControlGitRepo.Initialize();
         }

GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs

@@ -1,7 +1,5 @@
-using GVFS.FunctionalTests.FileSystemRunners;
-using System;
+using System;
 using System.IO;
-using System.Runtime.InteropServices;
 
 namespace GVFS.FunctionalTests.Tools
 {
@@ -52,6 +50,7 @@ public void Initialize()
             Directory.CreateDirectory(this.RootPath);
             GitProcess.Invoke(this.RootPath, "init");
             GitProcess.Invoke(this.RootPath, "config core.autocrlf false");
+            GitProcess.Invoke(this.RootPath, "config core.editor true");
             GitProcess.Invoke(this.RootPath, "config merge.stat false");
             GitProcess.Invoke(this.RootPath, "config merge.renames false");
             GitProcess.Invoke(this.RootPath, "config advice.statusUoption false");

GVFS/GVFS.FunctionalTests/Tools/GitHelpers.cs

@@ -123,6 +123,7 @@ public static void ValidateGitCommand(
 
             Dictionary<string, string> environmentVariables = new Dictionary<string, string>();
             environmentVariables["GIT_QUIET"] = "true";
+            environmentVariables["GIT_COMMITTER_DATE"] = "Thu Feb 16 10:07:35 2017 -0700";
 
             ProcessResult expectedResult = GitProcess.InvokeProcess(controlRepoRoot, command, environmentVariables);
             ProcessResult actualResult = GitHelpers.InvokeGitAgainstGVFSRepo(gvfsRepoRoot, command, environmentVariables);

GVFS/GVFS.Service/Handlers/GetActiveRepoListHandler.cs

@@ -2,6 +2,7 @@
 using GVFS.Common.NamedPipes;
 using GVFS.Common.Tracing;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 
 namespace GVFS.Service.Handlers
@@ -68,6 +69,11 @@ public void Run()
 
         private bool IsValidRepo(string repoRoot)
         {
+            if (!Directory.Exists(repoRoot))
+            {
+                return false;
+            }
+
             string gitBinPath = GVFSPlatform.Instance.GitInstallation.GetInstalledGitBinPath();
 
             string hooksVersion = null;

GVFS/GVFS.Service/IRepoRegistry.cs

@@ -8,7 +8,7 @@ public interface IRepoRegistry
         bool TryDeactivateRepo(string repoRoot, out string errorMessage);
         bool TryGetActiveRepos(out List<RepoRegistration> repoList, out string errorMessage);
         bool TryRemoveRepo(string repoRoot, out string errorMessage);
-        void AutoMountRepos(string userId, int sessionId);
+        void AutoMountRepos(string userId, int sessionId, bool checkDirectoryExists = true);
         void TraceStatus();
     }
 }

GVFS/GVFS.Service/RepoRegistry.cs

@@ -171,14 +171,19 @@ public bool TryRemoveRepo(string repoRoot, out string errorMessage)
             return false;
         }
 
-        public void AutoMountRepos(string userId, int sessionId)
+        public void AutoMountRepos(string userId, int sessionId, bool checkDirectoryExists = true)
         {
             using (ITracer activity = this.tracer.StartActivity("AutoMount", EventLevel.Informational))
             {
                 List<RepoRegistration> activeRepos = this.GetActiveReposForUser(userId);
                 foreach (RepoRegistration repo in activeRepos)
                 {
                     // TODO #1089: We need to respect the elevation level of the original mount
+                    if (checkDirectoryExists && !Directory.Exists(repo.EnlistmentRoot))
+                    {
+                        continue;
+                    }
+
                     if (!this.repoMounter.MountRepository(repo.EnlistmentRoot, sessionId))
                     {
                         this.SendNotification(

GVFS/GVFS.UnitTests/Maintenance/PostFetchStepTests.cs

@@ -18,7 +18,7 @@ public class PostFetchStepTests
         private MockGitProcess gitProcess;
         private GVFSContext context;
 
-        private string CommitGraphWriteCommand => $"commit-graph write --stdin-packs --split --size-multiple=4 --expire-time=3600 --object-dir \"{this.context.Enlistment.GitObjectsRoot}\"";
+        private string CommitGraphWriteCommand => $"commit-graph write --stdin-packs --split --size-multiple=4 --expire-time={GitProcess.ExpireTimeDateString} --object-dir \"{this.context.Enlistment.GitObjectsRoot}\"";
         private string CommitGraphVerifyCommand => $"commit-graph verify --shallow --object-dir \"{this.context.Enlistment.GitObjectsRoot}\"";
 
         [TestCase]

GVFS/GVFS.UnitTests/Service/Mac/MacServiceTests.cs

@@ -1,7 +1,5 @@
 using GVFS.Common;
-using GVFS.Common.FileSystem;
 using GVFS.Common.NamedPipes;
-using GVFS.Platform.Mac;
 using GVFS.Service;
 using GVFS.Service.Handlers;
 using GVFS.UnitTests.Mock.Common;
@@ -38,7 +36,7 @@ public void SetUp()
         public void ServiceStartTriggersAutoMountForCurrentUser()
         {
             Mock<IRepoRegistry> repoRegistry = new Mock<IRepoRegistry>(MockBehavior.Strict);
-            repoRegistry.Setup(r => r.AutoMountRepos(ExpectedActiveUserId.ToString(), ExpectedSessionId));
+            repoRegistry.Setup(r => r.AutoMountRepos(ExpectedActiveUserId.ToString(), ExpectedSessionId, true));
             repoRegistry.Setup(r => r.TraceStatus());
 
             GVFSService service = new GVFSService(
@@ -86,7 +84,7 @@ public void RepoRegistryMountsOnlyRegisteredRepos()
                 repoMounterMock.Object,
                 null);
 
-            repoRegistry.AutoMountRepos(ExpectedActiveUserId.ToString(), ExpectedSessionId);
+            repoRegistry.AutoMountRepos(ExpectedActiveUserId.ToString(), ExpectedSessionId, checkDirectoryExists: false);
 
             repoMounterMock.VerifyAll();
         }