From f3ecc5f3283944b43b6fd5ea9da347d5bdade70f Mon Sep 17 00:00:00 2001 From: William Baker Date: Tue, 5 Nov 2019 16:39:15 -0800 Subject: [PATCH] LooseObjectsStep: simply code for getting directory paths The code in CountLooseObjects can be simplified by avoiding an unnecessary Path.Combine. Additionally, fix a bug in the MockFileSystem where EnumerateDirectories was not returning the full paths of directories and it should. --- Scalar.Common/Maintenance/LooseObjectsStep.cs | 3 +-- Scalar.UnitTests/Mock/FileSystem/MockFileSystem.cs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Scalar.Common/Maintenance/LooseObjectsStep.cs b/Scalar.Common/Maintenance/LooseObjectsStep.cs index 86470cb000..5c268758f9 100644 --- a/Scalar.Common/Maintenance/LooseObjectsStep.cs +++ b/Scalar.Common/Maintenance/LooseObjectsStep.cs @@ -52,8 +52,7 @@ public void CountLooseObjects(out int count, out long size) if (GitObjects.IsLooseObjectsDirectory(directoryName)) { - string dirPath = Path.Combine(this.Context.Enlistment.GitObjectsRoot, directoryPath); - List dirItems = this.Context.FileSystem.ItemsInDirectory(dirPath).ToList(); + List dirItems = this.Context.FileSystem.ItemsInDirectory(directoryPath).ToList(); count += dirItems.Count; size += dirItems.Sum(item => item.Length); } diff --git a/Scalar.UnitTests/Mock/FileSystem/MockFileSystem.cs b/Scalar.UnitTests/Mock/FileSystem/MockFileSystem.cs index 62a7afabb5..8096c02558 100644 --- a/Scalar.UnitTests/Mock/FileSystem/MockFileSystem.cs +++ b/Scalar.UnitTests/Mock/FileSystem/MockFileSystem.cs @@ -279,7 +279,7 @@ public override IEnumerable EnumerateDirectories(string path) { foreach (MockDirectory subDirectory in directory.Directories.Values) { - yield return subDirectory.Name; + yield return subDirectory.FullName; } } }