Splitting values stored by GitStatusCache

Splitting these values in order to update them independently

Author: StanleyGoldman

src/GitHub.Api/Cache/CacheInterfaces.cs

@@ -55,7 +55,9 @@ public interface IGitUserCache : IManagedCache
 
     public interface IGitStatusCache : IManagedCache
     {
-        GitStatus GitStatus { get; set; }
+        int Ahead { get; set; }
+        int Behind { get; set; }
+        List<GitStatusEntry> Entries { get; set; }
     }
 
     public interface ILocalConfigBranchDictionary : IDictionary<string, ConfigBranch>

src/GitHub.Api/Extensions/GitStatusExtensions.cs

@@ -57,13 +57,16 @@ public interface IRepository : IEquatable<IRepository>
         /// Gets the current branch of the repository.
         /// </summary>
         GitBranch? CurrentBranch { get; }
-        GitStatus CurrentStatus { get; }
+//        GitStatus CurrentStatus { get; }
         GitRemote[] Remotes { get; }
         GitBranch[] LocalBranches { get; }
         GitBranch[] RemoteBranches { get; }
         List<GitLock> CurrentLocks { get; }
         string CurrentBranchName { get; }
         List<GitLogEntry> CurrentLog { get; }
+        int CurrentAhead { get; }
+        int CurrentBehind { get; }
+        List<GitStatusEntry> CurrentChanges { get; }
 
         event Action<CacheUpdateEvent> LogChanged;
         event Action<CacheUpdateEvent> StatusChanged;

src/GitHub.Api/Git/IRepository.cs

@@ -372,7 +372,9 @@ private void RepositoryManagerOnCurrentBranchUpdated(ConfigBranch? branch, Confi
         private void RepositoryManagerOnGitStatusUpdated(GitStatus gitStatus)
         {
             new ActionTask(CancellationToken.None, () => {
-                CurrentStatus = gitStatus;
+                CurrentChanges = gitStatus.Entries;
+                CurrentAhead = gitStatus.Ahead;
+                CurrentBehind = gitStatus.Behind;
             }) { Affinity = TaskAffinity.UI }.Start();
         }
 
@@ -469,10 +471,22 @@ private ConfigRemote? CurrentConfigRemote
             set { cacheContainer.BranchCache.CurrentConfigRemote = value; }
         }
 
-        public GitStatus CurrentStatus
+        public int CurrentAhead
         {
-            get { return cacheContainer.GitStatusCache.GitStatus; }
-            private set { cacheContainer.GitStatusCache.GitStatus = value; }
+            get { return cacheContainer.GitStatusCache.Ahead; }
+            private set { cacheContainer.GitStatusCache.Ahead = value; }
+        }
+
+        public int CurrentBehind
+        {
+            get { return cacheContainer.GitStatusCache.Behind; }
+            private set { cacheContainer.GitStatusCache.Behind = value; }
+        }
+
+        public List<GitStatusEntry> CurrentChanges
+        {
+            get { return cacheContainer.GitStatusCache.Entries; }
+            private set { cacheContainer.GitStatusCache.Entries = value; }
         }
 
         public GitBranch? CurrentBranch

src/GitHub.Api/Git/Repository.cs

@@ -149,7 +149,6 @@
     <Compile Include="Metrics\UsageModel.cs" />
     <Compile Include="Metrics\UsageTracker.cs" />
     <Compile Include="Git\Tasks\GitLfsInstallTask.cs" />
-    <Compile Include="Extensions\GitStatusExtensions.cs" />
     <Compile Include="Git\Tasks\GitRemoteChangeTask.cs" />
     <Compile Include="Git\Tasks\GitRemoveFromIndexTask.cs" />
     <Compile Include="Threading\IMainThreadSynchronizationContext.cs" />

src/GitHub.Api/GitHub.Api.csproj

@@ -836,35 +836,13 @@ sealed class GitStatusCache : ManagedCacheBase<GitStatusCache>, IGitStatusCache
         [SerializeField] private string lastUpdatedAtString = DateTimeOffset.MinValue.ToString();
         [SerializeField] private string lastVerifiedAtString = DateTimeOffset.MinValue.ToString();
         [SerializeField] private string initializedAtString = DateTimeOffset.MinValue.ToString();
-        [SerializeField] private GitStatus status;
+        [SerializeField] private int ahead;
+        [SerializeField] private int behind;
+        [SerializeField] private List<GitStatusEntry> entries;
 
         public GitStatusCache() : base(true)
         { }
 
-        public GitStatus GitStatus
-        {
-            get
-            {
-                ValidateData();
-                return status;
-            }
-            set
-            {
-                var now = DateTimeOffset.Now;
-                var isUpdated = false;
-
-                Logger.Trace("Updating: {0} gitStatus:{1}", now, value);
-
-                if (!status.Equals(value))
-                {
-                    status = value;
-                    isUpdated = true;
-                }
-
-                SaveData(now, isUpdated);
-            }
-        }
-
         public override string LastUpdatedAtString
         {
             get { return lastUpdatedAtString; }
@@ -887,6 +865,24 @@ public override TimeSpan DataTimeout
         {
             get { return TimeSpan.FromMinutes(1); }
         }
+
+        public int Ahead
+        {
+            get { return ahead; }
+            set { ahead = value; }
+        }
+
+        public int Behind
+        {
+            get { return behind; }
+            set { behind = value; }
+        }
+
+        public List<GitStatusEntry> Entries
+        {
+            get { return entries; }
+            set { entries = value; }
+        }
     }
 
     [Location("cache/gitlocks.yaml", LocationAttribute.Location.LibraryFolder)]

src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs

@@ -156,8 +156,8 @@ private void MaybeUpdateData()
             if (currentStatusHasUpdate)
             {
                 currentStatusHasUpdate = false;
-                var gitStatus = Repository.CurrentStatus;
-                tree.UpdateEntries(gitStatus.Entries.Where(x => x.Status != GitFileStatus.Ignored).ToList());
+                var entries = Repository.CurrentChanges;
+                tree.UpdateEntries(entries.Where(x => x.Status != GitFileStatus.Ignored).ToList());
             }
         }
 

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs

@@ -373,11 +373,12 @@ private void MaybeUpdateData()
             {
                 currentStatusHasUpdate = false;
 
-                var currentStatus = Repository.CurrentStatus;
-                statusAhead = currentStatus.Ahead;
-                statusBehind = currentStatus.Behind;
-                hasItemsToCommit = currentStatus.Entries != null &&
-                    currentStatus.GetEntriesExcludingIgnoredAndUntracked().Any();
+                statusAhead = Repository.CurrentAhead;
+                statusBehind = Repository.CurrentBehind;
+                var currentChanges = Repository.CurrentChanges;
+
+                hasItemsToCommit = currentChanges != null
+                    && currentChanges.Any(entry => entry.Status != GitFileStatus.Ignored && !entry.Staged);
             }
 
             if (currentLogHasUpdate)

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs

@@ -47,7 +47,7 @@ private static void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)
             {
                 lastRepositoryStatusChangedEvent = cacheUpdateEvent;
                 entries.Clear();
-                entries.AddRange(repository.CurrentStatus.Entries);
+                entries.AddRange(repository.CurrentChanges);
                 OnStatusUpdate();
             }
         }