Merge pull request #1898 from microsoft/milestones/m269

mjcheetham · web-flow · commit 3439a86acf98 · 2026-01-14T05:49:04.000-08:00
Release M269
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -177,21 +177,21 @@ jobs:
 
     - name: Upload functional tests drop
       if: steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: FunctionalTests_${{ matrix.configuration }}
         path: artifacts\GVFS.FunctionalTests
 
     - name: Upload FastFetch drop
       if: steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: FastFetch_${{ matrix.configuration }}
         path: artifacts\FastFetch
 
     - name: Upload installers
       if: steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: Installers_${{ matrix.configuration }}
         path: artifacts\GVFS.Installers
@@ -220,14 +220,14 @@ jobs:
 
     - name: Download installers
       if: steps.skip.outputs.result != 'true'
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v7
       with:
         name: Installers_${{ matrix.configuration }}
         path: install
 
     - name: Download functional tests drop
       if: steps.skip.outputs.result != 'true'
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v7
       with:
         name: FunctionalTests_${{ matrix.configuration }}
         path: ft
@@ -249,7 +249,7 @@ jobs:
 
     - name: Upload installation logs
       if: always() && steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: InstallationLogs_${{ matrix.configuration }}_${{ matrix.architecture }}-${{ matrix.nr }}
         path: install\logs
@@ -264,14 +264,14 @@ jobs:
 
     - name: Upload functional test results
       if: always() && steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: FunctionalTests_Results_${{ matrix.configuration }}_${{ matrix.architecture }}-${{ matrix.nr }}
         path: TestResult.xml
 
     - name: Upload Git trace2 output
       if: always() && steps.skip.outputs.result != 'true'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: GitTrace2_${{ matrix.configuration }}_${{ matrix.architecture }}-${{ matrix.nr }}
         path: C:\temp\git-trace2.log
diff --git a/GVFS/GVFS.Common/Enlistment.cs b/GVFS/GVFS.Common/Enlistment.cs
@@ -122,5 +122,18 @@ public bool GetTrustPackIndexesConfig()
 
             return trustPackIndexes;
         }
+
+        public bool GetStatusHydrationConfig()
+        {
+            var gitProcess = this.CreateGitProcess();
+
+            if (gitProcess.TryGetFromConfig(GVFSConstants.GitConfig.ShowHydrationStatus, forceOutsideEnlistment: false, out var valueString)
+                && bool.TryParse(valueString, out var statusHydrationConfig))
+            {
+                return statusHydrationConfig;
+            }
+
+            return GVFSConstants.GitConfig.ShowHydrationStatusDefault;
+        }
     }
 }
diff --git a/GVFS/GVFS.Common/GVFSConstants.cs b/GVFS/GVFS.Common/GVFSConstants.cs
@@ -42,6 +42,9 @@ public static class GitConfig
             /* Intended to be a temporary config to allow testing of distrusting pack indexes from cache server
              * before it is enabled by default. */
             public const string TrustPackIndexes = GVFSPrefix + "trust-pack-indexes";
+
+            public const string ShowHydrationStatus = GVFSPrefix + "show-hydration-status";
+            public const bool ShowHydrationStatusDefault = false;
         }
 
         public static class LocalGVFSConfig
diff --git a/GVFS/GVFS.Common/GitStatusCache.cs b/GVFS/GVFS.Common/GitStatusCache.cs
@@ -52,7 +52,7 @@ public class GitStatusCache : IDisposable
 
         private object cacheFileLock = new object();
 
-        internal static bool TEST_EnableHydrationSummary = true;
+        internal static bool? TEST_EnableHydrationSummaryOverride = null;
 
         public GitStatusCache(GVFSContext context, GitStatusCacheConfig config)
             : this(context, config.BackoffTime)
@@ -341,7 +341,8 @@ private void RebuildStatusCacheIfNeeded(bool ignoreBackoff)
 
         private void UpdateHydrationSummary()
         {
-            if (!TEST_EnableHydrationSummary)
+            bool enabled = TEST_EnableHydrationSummaryOverride ?? this.context.Enlistment.GetStatusHydrationConfig();
+            if (!enabled)
             {
                 return;
             }
@@ -372,9 +373,10 @@ private void UpdateHydrationSummary()
                 }
                 else
                 {
+                    metadata["Exception"] = hydrationSummary.Error?.ToString();
                     this.context.Tracer.RelatedWarning(
                         metadata,
-                        $"{nameof(GitStatusCache)}{nameof(RebuildStatusCacheIfNeeded)}: hydration summary could not be calculdated.",
+                        $"{nameof(GitStatusCache)}{nameof(RebuildStatusCacheIfNeeded)}: hydration summary could not be calculated.",
                         Keywords.Telemetry);
                 }
             }
diff --git a/GVFS/GVFS.Common/HealthCalculator/EnlistmentHydrationSummary.cs b/GVFS/GVFS.Common/HealthCalculator/EnlistmentHydrationSummary.cs
@@ -12,6 +12,8 @@ public class EnlistmentHydrationSummary
         public int TotalFileCount { get; private set; }
         public int HydratedFolderCount { get; private set; }
         public int TotalFolderCount { get; private set; }
+        public Exception Error { get; private set; } = null;
+
 
         public bool IsValid
         {
@@ -28,12 +30,12 @@ public string ToMessage()
         {
             if (!IsValid)
             {
-                return "Error calculating hydration. Run 'gvfs health' for details.";
+                return "Error calculating hydration summary. Run 'gvfs health' at the repository root for hydration status details.";
             }
 
             int fileHydrationPercent = TotalFileCount == 0 ? 0 : (100 * HydratedFileCount) / TotalFileCount;
             int folderHydrationPercent = TotalFolderCount == 0 ? 0 : ((100 * HydratedFolderCount) / TotalFolderCount);
-            return $"{fileHydrationPercent}% of files and {folderHydrationPercent}% of folders hydrated. Run 'gvfs health' for details.";
+            return $"{fileHydrationPercent}% of files and {folderHydrationPercent}% of folders hydrated. Run 'gvfs health' at the repository root for details.";
         }
 
         public static EnlistmentHydrationSummary CreateSummary(
@@ -67,14 +69,15 @@ public static EnlistmentHydrationSummary CreateSummary(
                     TotalFolderCount = totalFolderCount,
                 };
             }
-            catch
+            catch (Exception e)
             {
                 return new EnlistmentHydrationSummary()
                 {
                     HydratedFileCount = -1,
                     HydratedFolderCount = -1,
                     TotalFileCount = -1,
                     TotalFolderCount = -1,
+                    Error = e,
                 };
             }
         }
diff --git a/GVFS/GVFS.Hooks/Program.cs b/GVFS/GVFS.Hooks/Program.cs
@@ -88,8 +88,9 @@ private static void RunPreCommands(string[] args)
                     ProcessHelper.Run("gvfs", "prefetch --commits", redirectOutput: false);
                     break;
                 case "status":
-                    /* If status is being run to serialize for caching, skip the health display */
-                    if (!args.Any(arg => arg.StartsWith("--serialize", StringComparison.OrdinalIgnoreCase)))
+                    /* If status is being run to serialize for caching, or if --porcelain is specified, skip the health display */
+                    if (!ArgsBlockHydrationStatus(args)
+                        && ConfigurationAllowsHydrationStatus())
                     {
                         /* Display a message about the hydration status of the repo */
                         ProcessHelper.Run("gvfs", "health --status", redirectOutput: false);
@@ -98,6 +99,30 @@ private static void RunPreCommands(string[] args)
             }
         }
 
+        private static bool ArgsBlockHydrationStatus(string[] args)
+        {
+            return args.Any(arg =>
+                arg.StartsWith("--serialize", StringComparison.OrdinalIgnoreCase)
+                || arg.StartsWith("--porcelain", StringComparison.OrdinalIgnoreCase));
+        }
+
+        private static bool ConfigurationAllowsHydrationStatus()
+        {
+            try
+            {
+                ProcessResult result = ProcessHelper.Run("git", $"config --get {GVFSConstants.GitConfig.ShowHydrationStatus}");
+                bool hydrationStatusEnabled;
+                if (bool.TryParse(result.Output.Trim(), out hydrationStatusEnabled))
+                {
+                    return hydrationStatusEnabled;
+                }
+            }
+            catch (Exception)
+            {
+            }
+            return GVFSConstants.GitConfig.ShowHydrationStatusDefault;
+        }
+
         private static void ExitWithError(params string[] messages)
         {
             foreach (string message in messages)
diff --git a/GVFS/GVFS.UnitTests/Common/GitStatusCacheTests.cs b/GVFS/GVFS.UnitTests/Common/GitStatusCacheTests.cs
@@ -73,7 +73,7 @@ public void SetUp()
                 this.fileSystem,
                 new MockGitRepo(tracer, enlistment, this.fileSystem),
                 enlistment);
-            GitStatusCache.TEST_EnableHydrationSummary = false;
+            GitStatusCache.TEST_EnableHydrationSummaryOverride = false;
         }
 
         [TearDown]
@@ -85,7 +85,7 @@ public void TearDown()
             this.gitParentPath = null;
             this.gvfsMetadataPath = null;
             this.enlistmentDirectory = null;
-            GitStatusCache.TEST_EnableHydrationSummary = true;
+            GitStatusCache.TEST_EnableHydrationSummaryOverride = null;
         }
 
         [TestCase]

Original file line number	Diff line number	Diff line change
`@@ -122,5 +122,18 @@ public bool GetTrustPackIndexesConfig()`
`122`	`122`
`123`	`123`	`return trustPackIndexes;`
`124`	`124`	`}`
	`125`	`+`
	`126`	`+ public bool GetStatusHydrationConfig()`
	`127`	`+ {`
	`128`	`+ var gitProcess = this.CreateGitProcess();`
	`129`	`+`
	`130`	`+ if (gitProcess.TryGetFromConfig(GVFSConstants.GitConfig.ShowHydrationStatus, forceOutsideEnlistment: false, out var valueString)`
	`131`	`+ && bool.TryParse(valueString, out var statusHydrationConfig))`
	`132`	`+ {`
	`133`	`+ return statusHydrationConfig;`
	`134`	`+ }`
	`135`	`+`
	`136`	`+ return GVFSConstants.GitConfig.ShowHydrationStatusDefault;`
	`137`	`+ }`
`125`	`138`	`}`
`126`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,9 @@ public static class GitConfig`
`42`	`42`	`/* Intended to be a temporary config to allow testing of distrusting pack indexes from cache server`
`43`	`43`	`* before it is enabled by default. */`
`44`	`44`	`public const string TrustPackIndexes = GVFSPrefix + "trust-pack-indexes";`
	`45`	`+`
	`46`	`+ public const string ShowHydrationStatus = GVFSPrefix + "show-hydration-status";`
	`47`	`+ public const bool ShowHydrationStatusDefault = false;`
`45`	`48`	`}`
`46`	`49`
`47`	`50`	`public static class LocalGVFSConfig`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public class GitStatusCache : IDisposable`
`52`	`52`
`53`	`53`	`private object cacheFileLock = new object();`
`54`	`54`
`55`		`- internal static bool TEST_EnableHydrationSummary = true;`
	`55`	`+ internal static bool? TEST_EnableHydrationSummaryOverride = null;`
`56`	`56`
`57`	`57`	`public GitStatusCache(GVFSContext context, GitStatusCacheConfig config)`
`58`	`58`	`: this(context, config.BackoffTime)`
`@@ -341,7 +341,8 @@ private void RebuildStatusCacheIfNeeded(bool ignoreBackoff)`
`341`	`341`
`342`	`342`	`private void UpdateHydrationSummary()`
`343`	`343`	`{`
`344`		`- if (!TEST_EnableHydrationSummary)`
	`344`	`+ bool enabled = TEST_EnableHydrationSummaryOverride ?? this.context.Enlistment.GetStatusHydrationConfig();`
	`345`	`+ if (!enabled)`
`345`	`346`	`{`
`346`	`347`	`return;`
`347`	`348`	`}`
`@@ -372,9 +373,10 @@ private void UpdateHydrationSummary()`
`372`	`373`	`}`
`373`	`374`	`else`
`374`	`375`	`{`
	`376`	`+ metadata["Exception"] = hydrationSummary.Error?.ToString();`
`375`	`377`	`this.context.Tracer.RelatedWarning(`
`376`	`378`	`metadata,`
`377`		`- $"{nameof(GitStatusCache)}{nameof(RebuildStatusCacheIfNeeded)}: hydration summary could not be calculdated.",`
	`379`	`+ $"{nameof(GitStatusCache)}{nameof(RebuildStatusCacheIfNeeded)}: hydration summary could not be calculated.",`
`378`	`380`	`Keywords.Telemetry);`
`379`	`381`	`}`
`380`	`382`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ public class EnlistmentHydrationSummary`
`12`	`12`	`public int TotalFileCount { get; private set; }`
`13`	`13`	`public int HydratedFolderCount { get; private set; }`
`14`	`14`	`public int TotalFolderCount { get; private set; }`
	`15`	`+ public Exception Error { get; private set; } = null;`
	`16`	`+`
`15`	`17`
`16`	`18`	`public bool IsValid`
`17`	`19`	`{`
`@@ -28,12 +30,12 @@ public string ToMessage()`
`28`	`30`	`{`
`29`	`31`	`if (!IsValid)`
`30`	`32`	`{`
`31`		`- return "Error calculating hydration. Run 'gvfs health' for details.";`
	`33`	`+ return "Error calculating hydration summary. Run 'gvfs health' at the repository root for hydration status details.";`
`32`	`34`	`}`
`33`	`35`
`34`	`36`	`int fileHydrationPercent = TotalFileCount == 0 ? 0 : (100 * HydratedFileCount) / TotalFileCount;`
`35`	`37`	`int folderHydrationPercent = TotalFolderCount == 0 ? 0 : ((100 * HydratedFolderCount) / TotalFolderCount);`
`36`		`- return $"{fileHydrationPercent}% of files and {folderHydrationPercent}% of folders hydrated. Run 'gvfs health' for details.";`
	`38`	`+ return $"{fileHydrationPercent}% of files and {folderHydrationPercent}% of folders hydrated. Run 'gvfs health' at the repository root for details.";`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`public static EnlistmentHydrationSummary CreateSummary(`
`@@ -67,14 +69,15 @@ public static EnlistmentHydrationSummary CreateSummary(`
`67`	`69`	`TotalFolderCount = totalFolderCount,`
`68`	`70`	`};`
`69`	`71`	`}`
`70`		`- catch`
	`72`	`+ catch (Exception e)`
`71`	`73`	`{`
`72`	`74`	`return new EnlistmentHydrationSummary()`
`73`	`75`	`{`
`74`	`76`	`HydratedFileCount = -1,`
`75`	`77`	`HydratedFolderCount = -1,`
`76`	`78`	`TotalFileCount = -1,`
`77`	`79`	`TotalFolderCount = -1,`
	`80`	`+ Error = e,`
`78`	`81`	`};`
`79`	`82`	`}`
`80`	`83`	`}`