Merge pull request #698 from github-for-unity/fixes/changes-view-sort-order

Sorting GitStatus entries

Author: StanleyGoldman

src/GitHub.Api/Git/Tasks/GitStatusTask.cs

@@ -8,7 +8,7 @@ class GitStatusTask : ProcessTask<GitStatus>
 
         public GitStatusTask(IGitObjectFactory gitObjectFactory,
             CancellationToken token, IOutputProcessor<GitStatus> processor = null)
-            : base(token, processor ?? new StatusOutputProcessor(gitObjectFactory))
+            : base(token, processor ?? new GitStatusOutputProcessor(gitObjectFactory))
         {
             Name = TaskName;
         }

src/GitHub.Api/OutputProcessors/StatusOutputProcessor.cs

@@ -5,15 +5,15 @@
 
 namespace GitHub.Unity
 {
-    class StatusOutputProcessor : BaseOutputProcessor<GitStatus>
+    class GitStatusOutputProcessor : BaseOutputProcessor<GitStatus>
     {
         private static readonly Regex branchTrackedAndDelta = new Regex(@"(.*)\.\.\.(.*)\s\[(.*)\]",
             RegexOptions.Compiled);
 
         private readonly IGitObjectFactory gitObjectFactory;
         GitStatus gitStatus;
 
-        public StatusOutputProcessor(IGitObjectFactory gitObjectFactory)
+        public GitStatusOutputProcessor(IGitObjectFactory gitObjectFactory)
         {
             Guard.ArgumentNotNull(gitObjectFactory, "gitObjectFactory");
             this.gitObjectFactory = gitObjectFactory;
@@ -190,6 +190,10 @@ private void ReturnStatus()
             if (gitStatus.Entries == null)
                 return;
 
+            gitStatus.Entries = gitStatus.Entries
+                                         .OrderBy(entry => entry.Path)
+                                         .ToList();
+
             RaiseOnEntry(gitStatus);
 
             gitStatus = new GitStatus();

src/tests/IntegrationTests/ProcessManagerExtensions.cs

@@ -50,7 +50,7 @@ public static ITask<GitStatus> GetGitStatus(this IProcessManager processManager,
             NPath? gitPath = null)
         {
             var gitStatusEntryFactory = new GitObjectFactory(environment);
-            var processor = new StatusOutputProcessor(gitStatusEntryFactory);
+            var processor = new GitStatusOutputProcessor(gitStatusEntryFactory);
 
             NPath path = gitPath ?? defaultGitPath;
 

src/tests/UnitTests/IO/StatusOutputProcessorTests.cs

@@ -250,7 +250,7 @@ private void AssertProcessOutput(IEnumerable<string> lines, GitStatus expected)
             var gitObjectFactory = SubstituteFactory.CreateGitObjectFactory(TestRootPath);
 
             GitStatus? result = null;
-            var outputProcessor = new StatusOutputProcessor(gitObjectFactory);
+            var outputProcessor = new GitStatusOutputProcessor(gitObjectFactory);
             outputProcessor.OnEntry += status => { result = status; };
 
             foreach (var line in lines)

src/tests/UnitTests/ProcessManagerExtensions.cs

@@ -58,7 +58,7 @@ public static async Task<GitStatus> GetGitStatus(this ProcessManager processMana
             NPath? gitPath = null)
         {
             var gitStatusEntryFactory = new GitObjectFactory(environment);
-            var processor = new StatusOutputProcessor(gitStatusEntryFactory);
+            var processor = new GitStatusOutputProcessor(gitStatusEntryFactory);
 
             NPath path = gitPath ?? defaultGitPath;