Remove more references to ReadObjectHook

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
microsoft · derrickstolee · Oct 4, 2019 · Sep 20, 2019 · Oct 1, 2019 · Sep 20, 2019
commit eea8c54694c28aac9e24a149ba68ec8cf173747a
diff --git a/Readme.md b/Readme.md
@@ -152,12 +152,6 @@ Note that Scalar on Mac is under active development.
   git clone https://github.com/microsoft/scalar.git src
   ```
 
-* Using XCode, open `Scalar/ReadObjectHook/Scalar.ReadObjectHook.Mac.xcodeproj`.
-
-  * Select the `Scalar.ReadObjectHook.Mac` project.
-  * Under "Signing", select your developer certificate, which may be an organization
-    certificate.
-
 * Run the build and installation scripts:
 
   ```

diff --git a/Scalar.Common/Git/GitProcess.cs b/Scalar.Common/Git/GitProcess.cs
@@ -588,7 +588,7 @@ public Result MultiPackIndexRepack(string gitObjectDirectory, string batchSize)
             return this.InvokeGitAgainstDotGitFolder($"-c pack.threads=1 multi-pack-index repack --object-dir=\"{gitObjectDirectory}\" --batch-size={batchSize}");
         }
 
-        public Process GetGitProcess(string command, string workingDirectory, string dotGitDirectory, bool useReadObjectHook, bool redirectStandardError, string gitObjectsDirectory)
+        public Process GetGitProcess(string command, string workingDirectory, string dotGitDirectory, bool fetchMissingObjects, bool redirectStandardError, string gitObjectsDirectory)
         {
             ProcessStartInfo processInfo = new ProcessStartInfo(this.gitBinPath);
             processInfo.WorkingDirectory = workingDirectory;
@@ -632,9 +632,9 @@ public Process GetGitProcess(string command, string workingDirectory, string dot
                 processInfo.EnvironmentVariables["GIT_OBJECT_DIRECTORY"] = gitObjectsDirectory;
             }
 
-            if (!useReadObjectHook)
+            if (!fetchMissingObjects)
             {
-                command = "-c " + GitConfigSetting.CoreVirtualizeObjectsName + "=false " + command;
+                command = "-c " + "core.usegvfshelper=false " + command;
             }
 
             if (!string.IsNullOrEmpty(dotGitDirectory))
@@ -670,7 +670,13 @@ protected virtual Result InvokeGitImpl(
                 // From https://msdn.microsoft.com/en-us/library/system.diagnostics.process.standardoutput.aspx
                 // To avoid deadlocks, use asynchronous read operations on at least one of the streams.
                 // Do not perform a synchronous read to the end of both redirected streams.
-                using (this.executingProcess = this.GetGitProcess(command, workingDirectory, dotGitDirectory, useReadObjectHook, redirectStandardError: true, gitObjectsDirectory: gitObjectsDirectory))
+                using (this.executingProcess = this.GetGitProcess(
+                                                        command,
+                                                        workingDirectory,
+                                                        dotGitDirectory,
+                                                        fetchMissingObjects: useReadObjectHook,
+                                                        redirectStandardError: true,
+                                                        gitObjectsDirectory: gitObjectsDirectory))
                 {
                     StringBuilder output = new StringBuilder();
                     StringBuilder errors = new StringBuilder();

diff --git a/Scalar.Common/ScalarPlatform.cs b/Scalar.Common/ScalarPlatform.cs
@@ -164,11 +164,6 @@ public abstract class ScalarPlatformConstants
             /// </summary>
             public abstract HashSet<string> UpgradeBlockingProcesses { get; }
 
-            public string ScalarReadObjectHookExecutableName
-            {
-                get { return "Scalar.ReadObjectHook" + this.ExecutableExtension; }
-            }
-
             public string MountExecutableName
             {
                 get { return "Scalar.Mount" + this.ExecutableExtension; }

diff --git a/Scalar.FunctionalTests/Tests/EnlistmentPerFixture/MountTests.cs b/Scalar.FunctionalTests/Tests/EnlistmentPerFixture/MountTests.cs
@@ -37,19 +37,6 @@ public void MountFailsOutsideEnlistment()
             this.MountShouldFail("is not a valid Scalar enlistment", Path.GetDirectoryName(this.Enlistment.EnlistmentRoot));
         }
 
-        [TestCase]
-        public void MountCopiesMissingReadObjectHook()
-        {
-            this.Enlistment.UnmountScalar();
-
-            string readObjectPath = this.Enlistment.GetSourcePath(".git", "hooks", "read-object" + Settings.Default.BinaryFileNameExtension);
-            readObjectPath.ShouldBeAFile(this.fileSystem);
-            this.fileSystem.DeleteFile(readObjectPath);
-            readObjectPath.ShouldNotExistOnDisk(this.fileSystem);
-            this.Enlistment.MountScalar();
-            readObjectPath.ShouldBeAFile(this.fileSystem);
-        }
-
         [TestCase]
         public void MountSetsCoreHooksPath()
         {

diff --git a/Scalar.Installer.Windows/Setup.iss b/Scalar.Installer.Windows/Setup.iss
@@ -9,7 +9,6 @@
 #define ServiceDir BuildOutputDir + "\Scalar.Service.Windows\bin\" + PlatformAndConfiguration
 #define ServiceUIDir BuildOutputDir + "\Scalar.Service.UI\bin\" + PlatformAndConfiguration
 #define ScalarMountDir BuildOutputDir + "\Scalar.Mount.Windows\bin\" + PlatformAndConfiguration
-#define ReadObjectDir BuildOutputDir + "\Scalar.ReadObjectHook.Windows\bin\" + PlatformAndConfiguration
 #define ScalarUpgraderDir BuildOutputDir + "\Scalar.Upgrader\bin\" + PlatformAndConfiguration + "\net461"
 
 #define MyAppName "Scalar"
@@ -78,10 +77,6 @@ DestDir: "{app}"; Flags: ignoreversion; Source:"{#ScalarUpgraderDir}\Scalar.Upgr
 DestDir: "{app}"; Flags: ignoreversion; Source:"{#ScalarUpgraderDir}\Scalar.Upgrader.exe"
 DestDir: "{app}"; Flags: ignoreversion; Source:"{#ScalarUpgraderDir}\Scalar.Upgrader.exe.config"
 
-; Scalar.ReadObjectHook files
-DestDir: "{app}"; Flags: ignoreversion; Source:"{#ReadObjectDir}\Scalar.ReadObjectHook.pdb"
-DestDir: "{app}"; Flags: ignoreversion; Source:"{#ReadObjectDir}\Scalar.ReadObjectHook.exe"
-
 ; Cpp Dependencies
 DestDir: "{app}"; Flags: ignoreversion; Source:"{#VCRuntimeDir}\msvcp140.dll"
 DestDir: "{app}"; Flags: ignoreversion; Source:"{#VCRuntimeDir}\msvcp140_1.dll"

diff --git a/Scalar.Mount/Scalar.Mount.Windows.csproj b/Scalar.Mount/Scalar.Mount.Windows.csproj
@@ -108,7 +108,6 @@
     <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" />
   </Target>
   <PropertyGroup>
-    <PostBuildEvent>xcopy /Y $(BuildOutputDir)\Scalar.ReadObjectHook.Windows\bin\$(Platform)\$(Configuration)\Scalar.ReadObjectHook.* $(TargetDir)</PostBuildEvent>
   </PropertyGroup>
   <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
   <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.12\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />

diff --git a/Scalar.Native.Mac/Scalar.Native.Mac.xcworkspace/contents.xcworkspacedata b/Scalar.Native.Mac/Scalar.Native.Mac.xcworkspace/contents.xcworkspacedata
diff --git a/Scalar.Native.Mac/Scalar.Native.Mac.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Scalar.Native.Mac/Scalar.Native.Mac.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/Scalar.Native.Mac/Scalar.Native.Mac.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Scalar.Native.Mac/Scalar.Native.Mac.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/...ative.Mac/Scalar.Native.Mac.xcworkspace/xcshareddata/xcschemes/Scalar.Native.Mac.xcscheme b/...ative.Mac/Scalar.Native.Mac.xcworkspace/xcshareddata/xcschemes/Scalar.Native.Mac.xcscheme