Skip to content

gvfs health: distinguish directory-scoped status from repository status #2078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tyrielv merged 1 commit into from
Aug 6, 2026
+21 −4
Merged

gvfs health: distinguish directory-scoped status from repository status #2078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/HealthTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,10 @@ private void ValidateSubDirectoryHealth(List<string> outputLines, List<string> s

private void ValidateEnlistmentStatus(string outputLine, string statusMessage)
{
// Regex to extract the status message for the enlistment
// "Repository status: <status-message>"
Match lineMatch = Regex.Match(outputLine, @"^Repository status:\s*(.*)$");
// Regex to extract the status message for the enlistment. The verb prints
// "Repository status: <status-message>" when the calculation covers the whole enlistment,
// and "Directory status (<path>): <status-message>" when scoped to a subdirectory.
Match lineMatch = Regex.Match(outputLine, @"^(?:Repository status|Directory status \([^)]*\)):\s*(.*)$");

string outputtedStatusMessage = lineMatch.Groups[1].Value;

Expand Down
18 changes: 17 additions & 1 deletion GVFS/GVFS/CommandLine/HealthVerb.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,23 @@ private void PrintOutput(EnlistmentHealthData enlistmentHealthData)

bool healthyRepo = (enlistmentHealthData.PlaceholderPercentage + enlistmentHealthData.ModifiedPathsPercentage) < MaximumHealthyHydration;

this.Output.WriteLine("\nRepository status: " + (healthyRepo ? "OK" : "Highly Hydrated"));
// Only label the summary as "Repository status" when the calculation actually covered
// the whole enlistment. When the user scoped the check to a subdirectory (via -d or by
// running from a subdirectory of the enlistment) the number describes only that subtree,
// so label it accordingly to avoid falsely reporting the repository as highly hydrated.
bool isWholeRepo = string.IsNullOrEmpty(enlistmentHealthData.TargetDirectory)
|| enlistmentHealthData.TargetDirectory == GVFSConstants.GitPathSeparatorString;

string statusLabel = isWholeRepo
? "Repository status"
: "Directory status (" + enlistmentHealthData.TargetDirectory.TrimEnd(GVFSConstants.GitPathSeparator) + ")";

this.Output.WriteLine("\n" + statusLabel + ": " + (healthyRepo ? "OK" : "Highly Hydrated"));

if (!isWholeRepo)
{
this.Output.WriteLine("To see the full repository status, switch to the root of the repository and re-run 'gvfs health'.");
}
}

/// <summary>
Expand Down
Loading