Cache to warning

.gitignore

@@ -223,3 +223,6 @@ ModelManifest.xml
 *.dll
 *.cab
 *.cer
+
+# VS Code private directory
+.vscode/

GVFS.sln

@@ -125,6 +125,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.Mac", "GVFS\GVFS\GVFS.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.Windows", "GVFS\GVFS\GVFS.Windows.csproj", "{32220664-594C-4425-B9A0-88E0BE2F3D2A}"
 	ProjectSection(ProjectDependencies) = postProject
+		{AECEC217-2499-403D-B0BB-2962B9BE5970} = {AECEC217-2499-403D-B0BB-2962B9BE5970}
 		{2D23AB54-541F-4ABC-8DCA-08C199E97ABB} = {2D23AB54-541F-4ABC-8DCA-08C199E97ABB}
 		{798DE293-6EDA-4DC4-9395-BE7A71C563E3} = {798DE293-6EDA-4DC4-9395-BE7A71C563E3}
 		{5A6656D5-81C7-472C-9DC8-32D071CB2258} = {5A6656D5-81C7-472C-9DC8-32D071CB2258}
@@ -167,6 +168,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.FunctionalTests.LockHo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.Hooks.Mac", "GVFS\GVFS.Hooks\GVFS.Hooks.Mac.csproj", "{4CC2A90D-D240-4382-B4BF-5E175515E492}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GVFS.Upgrader", "GVFS\GVFS.Upgrader\GVFS.Upgrader.csproj", "{AECEC217-2499-403D-B0BB-2962B9BE5970}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug.Mac|x64 = Debug.Mac|x64
@@ -369,6 +372,12 @@ Global
 		{4CC2A90D-D240-4382-B4BF-5E175515E492}.Release.Mac|x64.Build.0 = Release|x64
 		{4CC2A90D-D240-4382-B4BF-5E175515E492}.Release.Windows|x64.ActiveCfg = Release|x64
 		{4CC2A90D-D240-4382-B4BF-5E175515E492}.Release.Windows|x64.Build.0 = Release|x64
+		{AECEC217-2499-403D-B0BB-2962B9BE5970}.Debug.Mac|x64.ActiveCfg = Debug|x64
+		{AECEC217-2499-403D-B0BB-2962B9BE5970}.Debug.Windows|x64.ActiveCfg = Debug|x64
+		{AECEC217-2499-403D-B0BB-2962B9BE5970}.Debug.Windows|x64.Build.0 = Debug|x64
+		{AECEC217-2499-403D-B0BB-2962B9BE5970}.Release.Mac|x64.ActiveCfg = Release|x64
+		{AECEC217-2499-403D-B0BB-2962B9BE5970}.Release.Windows|x64.ActiveCfg = Release|x64
+		{AECEC217-2499-403D-B0BB-2962B9BE5970}.Release.Windows|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -403,6 +412,7 @@ Global
 		{BD7C5776-82F2-40C6-AF01-B3CC1E2D83AF} = {C41F10F9-1163-4CFA-A465-EA728F75E9FA}
 		{FA273F69-5762-43D8-AEA1-B4F08090D624} = {C41F10F9-1163-4CFA-A465-EA728F75E9FA}
 		{4CC2A90D-D240-4382-B4BF-5E175515E492} = {2EF2EC94-3A68-4ED7-9A58-B7057ADBA01C}
+		{AECEC217-2499-403D-B0BB-2962B9BE5970} = {2EF2EC94-3A68-4ED7-9A58-B7057ADBA01C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A025908B-DAB1-46CB-83A3-56F3B863D8FA}

GVFS/FastFetch/CheckoutJob.cs

@@ -39,7 +39,7 @@ public CheckoutJob(int maxParallel, IEnumerable<string> folderList, string targe
         {
             this.tracer = tracer.StartActivity(AreaPath, EventLevel.Informational, Keywords.Telemetry, metadata: null);
             this.enlistment = enlistment;
-            this.diff = new DiffHelper(tracer, enlistment, new string[0], folderList);
+            this.diff = new DiffHelper(tracer, enlistment, new string[0], folderList, includeSymLinks: true);
             this.targetCommitSha = targetCommitSha;
             this.forceCheckout = forceCheckout;
             this.AvailableBlobShas = new BlockingCollection<string>();

GVFS/FastFetch/FastFetchVerb.cs

@@ -186,7 +186,7 @@ private int ExecuteWithExitCode()
                 Console.WriteLine("Must be run within a git repo");
                 return ExitFailure;
             }
-
+            
             string commitish = this.Commit ?? this.Branch;
             if (string.IsNullOrWhiteSpace(commitish))
             {
@@ -231,10 +231,17 @@ private int ExecuteWithExitCode()
                         { "TargetCommitish", commitish },
                         { "Checkout", this.Checkout },
                     });
+
+                string error;
+                if (!enlistment.Authentication.TryInitialize(tracer, enlistment, out error))
+                {
+                    tracer.RelatedError(error);
+                    Console.WriteLine(error);
+                    return ExitFailure;
+                }
 
                 RetryConfig retryConfig = new RetryConfig(this.MaxAttempts, TimeSpan.FromMinutes(RetryConfig.FetchAndCloneTimeoutMinutes));
                 BlobPrefetcher prefetcher = this.GetFolderPrefetcher(tracer, enlistment, cacheServer, retryConfig);
-                string error;
                 if (!BlobPrefetcher.TryLoadFolderList(enlistment, this.FolderList, this.FolderListFile, prefetcher.FolderList, out error))
                 {
                     tracer.RelatedError(error);

GVFS/GVFS.Build/GVFS.props

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

GVFS/GVFS.Common/DiskLayoutUpgrade.cs

@@ -174,7 +174,8 @@ protected bool TrySetGitConfig(ITracer tracer, string enlistmentRoot, Dictionary
             GVFSEnlistment enlistment = GVFSEnlistment.CreateFromDirectory(
                 enlistmentRoot,
                 GVFSPlatform.Instance.GitInstallation.GetInstalledGitBinPath(),
-                ProcessHelper.GetCurrentProcessLocation());
+                ProcessHelper.GetCurrentProcessLocation(),
+                authentication: null);
             GitProcess git = enlistment.CreateGitProcess();
 
             foreach (string key in configSettings.Keys)
@@ -327,7 +328,7 @@ private static void StartLogFile(string enlistmentRoot, JsonTracer tracer)
                 tracer.AddLogFileEventListener(
                     GVFSEnlistment.GetNewGVFSLogFileName(
                         Path.Combine(enlistmentRoot, GVFSConstants.DotGVFS.LogPath),
-                        GVFSConstants.LogFileTypes.Upgrade),
+                        GVFSConstants.LogFileTypes.MountUpgrade),
                     EventLevel.Informational,
                     Keywords.Any);
 

GVFS/GVFS.Common/Enlistment.cs

@@ -12,7 +12,8 @@ protected Enlistment(
             string repoUrl,
             string gitBinPath,
             string gvfsHooksRoot,
-            bool flushFileBuffersForPacks)
+            bool flushFileBuffersForPacks,
+            GitAuthentication authentication)
         {
             if (string.IsNullOrWhiteSpace(gitBinPath))
             {
@@ -47,7 +48,7 @@ protected Enlistment(
                 this.RepoUrl = originResult.Output.Trim();
             }
 
-            this.Authentication = new GitAuthentication(gitProcess, this.RepoUrl);
+            this.Authentication = authentication ?? new GitAuthentication(gitProcess, this.RepoUrl);
         }
 
         public string EnlistmentRoot { get; }

GVFS/GVFS.Common/FileBasedDictionary.cs

@@ -9,16 +9,32 @@ namespace GVFS.Common
 {
     public class FileBasedDictionary<TKey, TValue> : FileBasedCollection
     {
-        private ConcurrentDictionary<TKey, TValue> data = new ConcurrentDictionary<TKey, TValue>();
+        private ConcurrentDictionary<TKey, TValue> data;
 
-        private FileBasedDictionary(ITracer tracer, PhysicalFileSystem fileSystem, string dataFilePath) 
+        private FileBasedDictionary(
+            ITracer tracer,
+            PhysicalFileSystem fileSystem, 
+            string dataFilePath, 
+            IEqualityComparer<TKey> keyComparer) 
             : base(tracer, fileSystem, dataFilePath, collectionAppendsDirectlyToFile: false)
         {
+            this.data = new ConcurrentDictionary<TKey, TValue>(keyComparer);
         }
 
-        public static bool TryCreate(ITracer tracer, string dictionaryPath, PhysicalFileSystem fileSystem, out FileBasedDictionary<TKey, TValue> output, out string error)
+        public static bool TryCreate(
+            ITracer tracer, 
+            string dictionaryPath, 
+            PhysicalFileSystem fileSystem,
+            out FileBasedDictionary<TKey, TValue> output, 
+            out string error,
+            IEqualityComparer<TKey> keyComparer = null)
         {
-            output = new FileBasedDictionary<TKey, TValue>(tracer, fileSystem, dictionaryPath);
+            output = new FileBasedDictionary<TKey, TValue>(
+                tracer, 
+                fileSystem, 
+                dictionaryPath, 
+                keyComparer ?? EqualityComparer<TKey>.Default);
+
             if (!output.TryLoadFromDisk<TKey, TValue>(
                 output.TryParseAddLine,
                 output.TryParseRemoveLine,
@@ -90,6 +106,11 @@ public void RemoveAndFlush(TKey key)
             }
         }
 
+        public Dictionary<TKey, TValue> GetAllKeysAndValues()
+        {
+            return new Dictionary<TKey, TValue>(this.data);
+        }
+
         private void Flush()
         {
             this.WriteAndReplaceDataFile(this.GenerateDataLines);

GVFS/GVFS.Common/FileBasedLock.cs

@@ -1,4 +1,4 @@
-using GVFS.Common.FileSystem;
+using GVFS.Common.FileSystem;
 using GVFS.Common.Tracing;
 using System;
 

GVFS/GVFS.Common/FileSystem/IKernelDriver.cs

@@ -1,4 +1,5 @@
 using GVFS.Common.Tracing;
+using System;
 
 namespace GVFS.Common.FileSystem
 {
@@ -8,7 +9,8 @@ public interface IKernelDriver
         string DriverLogFolderName { get; }
         bool IsSupported(string normalizedEnlistmentRootPath, out string warning, out string error);
         string FlushDriverLogs();
-        bool TryPrepareFolderForCallbacks(string folderPath, out string error);
+        bool TryPrepareFolderForCallbacks(string folderPath, out string error, out Exception exception);
         bool IsReady(JsonTracer tracer, string enlistmentRoot, out string error);
+        bool IsGVFSUpgradeSupported();
     }
 }

GVFS/GVFS.Common/FileSystem/IPlatformFileSystem.cs

@@ -7,6 +7,7 @@ public interface IPlatformFileSystem
         void MoveAndOverwriteFile(string sourceFileName, string destinationFilename);
         void CreateHardLink(string newLinkFileName, string existingFileName);
         bool TryGetNormalizedPath(string path, out string normalizedPath, out string errorMessage);
-        void ChangeMode(string path, int mode);
+        void ChangeMode(string path, int mode);
+        bool HydrateFile(string fileName, byte[] buffer);
     }
 }

GVFS/GVFS.Common/FileSystem/PhysicalFileSystem.cs

@@ -103,9 +103,9 @@ public virtual void DeleteDirectory(string path, bool recursive = false)
             RecursiveDelete(path);
         }
 
-        public virtual bool IsSymlink(string path)
+        public virtual bool IsSymLink(string path)
         {
-            return (this.GetAttributes(path) & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint && NativeMethods.IsSymlink(path);
+            return (this.GetAttributes(path) & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint && NativeMethods.IsSymLink(path);
         }
 
         public virtual IEnumerable<DirectoryItemInfo> ItemsInDirectory(string path)

GVFS/GVFS.Common/GVFSConstants.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 namespace GVFS.Common
 {
@@ -32,7 +32,13 @@ public static class GitConfig
             public const string DeprecatedCacheEndpointSuffix = ".cache-server-url";
             public const string HooksPrefix = GitConfig.GVFSPrefix + "clone.default-";
             public const string GVFSTelemetryId = GitConfig.GVFSPrefix + "telemetry-id";
-            public const string HooksExtension = ".hooks";
+            public const string IKey = GitConfig.GVFSPrefix + "ikey";
+            public const string HooksExtension = ".hooks";            
+        }
+
+        public static class LocalGVFSConfig
+        {
+            public const string UpgradeRing = "upgrade.ring";
         }
 
         public static class GitStatusCache
@@ -72,15 +78,18 @@ public static class SpecialGitFiles
         public static class LogFileTypes
         {            
             public const string MountPrefix = "mount";
+            public const string UpgradePrefix = "productupgrade";
 
             public const string Clone = "clone";
             public const string Dehydrate = "dehydrate";
             public const string MountVerb = MountPrefix + "_verb";
             public const string MountProcess = MountPrefix + "_process";
+            public const string MountUpgrade = MountPrefix + "_repoupgrade";
             public const string Prefetch = "prefetch";
             public const string Repair = "repair";
             public const string Service = "service";
-            public const string Upgrade = MountPrefix + "_upgrade";
+            public const string UpgradeVerb = UpgradePrefix + "_verb";
+            public const string UpgradeProcess = UpgradePrefix + "_process";            
         }
 
         public static class DotGVFS
@@ -215,5 +224,19 @@ public static class Unmount
                 public const string SkipLock = "skip-wait-for-lock";
             }
         }
+
+        public static class UpgradeVerbMessages
+        {
+            public const string GVFSUpgrade = "`gvfs upgrade`";
+            public const string GVFSUpgradeConfirm = "`gvfs upgrade --confirm`";
+            public const string NoUpgradeCheckPerformed = "No upgrade check was performed.";
+            public const string NoneRingConsoleAlert = "Upgrade ring set to \"None\". " + NoUpgradeCheckPerformed;
+            public const string NoRingConfigConsoleAlert = "Upgrade ring is not set. " + NoUpgradeCheckPerformed;
+            public const string InvalidRingConsoleAlert = "Upgrade ring set to unknown value. " + NoUpgradeCheckPerformed;
+            public const string SetUpgradeRingCommand = "To set or change upgrade ring, run `gvfs config " + LocalGVFSConfig.UpgradeRing + " [\"Fast\"|\"Slow\"|\"None\"]` from a command prompt.";
+            public const string ReminderNotification = "A new version of GVFS is available. Run " + UpgradeVerbMessages.GVFSUpgrade + " to start the upgrade.";
+            public const string UnmountRepoWarning = "Upgrade will unmount and remount gvfs repos, ensure you are at a stopping point.";
+            public const string UpgradeInstallAdvice = "When ready, run " + UpgradeVerbMessages.GVFSUpgradeConfirm + " from an elevated command prompt.";
+        }
     }
 }

GVFS/GVFS.Common/GVFSEnlistment.cs

@@ -1,9 +1,8 @@
+using GVFS.Common.Git;
 using GVFS.Common.NamedPipes;
 using Newtonsoft.Json;
 using System;
 using System.IO;
-using System.Security.AccessControl;
-using System.Security.Principal;
 using System.Threading;
 
 namespace GVFS.Common
@@ -13,21 +12,21 @@ public partial class GVFSEnlistment : Enlistment
         public const string BlobSizesCacheName = "blobSizes";
 
         private const string GitObjectCacheName = "gitObjects";
-        private const string InvalidRepoUrl = "invalid://repoUrl";
 
         private string gitVersion;
         private string gvfsVersion;
         private string gvfsHooksVersion;
 
         // New enlistment
-        public GVFSEnlistment(string enlistmentRoot, string repoUrl, string gitBinPath, string gvfsHooksRoot)
+        public GVFSEnlistment(string enlistmentRoot, string repoUrl, string gitBinPath, string gvfsHooksRoot, GitAuthentication authentication)
             : base(
                   enlistmentRoot,
                   Path.Combine(enlistmentRoot, GVFSConstants.WorkingDirectoryRootName),
                   repoUrl,
                   gitBinPath,
                   gvfsHooksRoot,
-                  flushFileBuffersForPacks: true)
+                  flushFileBuffersForPacks: true,
+                  authentication: authentication)
         {
             this.NamedPipeName = GVFSPlatform.Instance.GetNamedPipeName(this.EnlistmentRoot);
             this.DotGVFSRoot = Path.Combine(this.EnlistmentRoot, GVFSConstants.DotGVFS.Root);
@@ -38,12 +37,13 @@ public GVFSEnlistment(string enlistmentRoot, string repoUrl, string gitBinPath,
         }
 
         // Existing, configured enlistment
-        private GVFSEnlistment(string enlistmentRoot, string gitBinPath, string gvfsHooksRoot)
+        private GVFSEnlistment(string enlistmentRoot, string gitBinPath, string gvfsHooksRoot, GitAuthentication authentication)
             : this(
                   enlistmentRoot,
                   null,
                   gitBinPath,
-                  gvfsHooksRoot)
+                  gvfsHooksRoot,
+                  authentication)
         {
         }
 
@@ -79,7 +79,7 @@ public string GVFSHooksVersion
             get { return this.gvfsHooksVersion; }
         }
 
-        public static GVFSEnlistment CreateWithoutRepoUrlFromDirectory(string directory, string gitBinRoot, string gvfsHooksRoot)
+        public static GVFSEnlistment CreateWithoutRepoUrlFromDirectory(string directory, string gitBinRoot, string gvfsHooksRoot, GitAuthentication authentication)
         {
             if (Directory.Exists(directory))
             {
@@ -90,13 +90,13 @@ public static GVFSEnlistment CreateWithoutRepoUrlFromDirectory(string directory,
                     return null;
                 }
 
-                return new GVFSEnlistment(enlistmentRoot, InvalidRepoUrl, gitBinRoot, gvfsHooksRoot);
+                return new GVFSEnlistment(enlistmentRoot, string.Empty, gitBinRoot, gvfsHooksRoot, authentication);
             }
 
             return null;
         }
 
-        public static GVFSEnlistment CreateFromDirectory(string directory, string gitBinRoot, string gvfsHooksRoot)
+        public static GVFSEnlistment CreateFromDirectory(string directory, string gitBinRoot, string gvfsHooksRoot, GitAuthentication authentication)
         {
             if (Directory.Exists(directory))
             {
@@ -107,7 +107,7 @@ public static GVFSEnlistment CreateFromDirectory(string directory, string gitBin
                     return null;
                 }
 
-                return new GVFSEnlistment(enlistmentRoot, gitBinRoot, gvfsHooksRoot);
+                return new GVFSEnlistment(enlistmentRoot, gitBinRoot, gvfsHooksRoot, authentication);
             }
 
             return null;