Refreshing the log cache properly

Author: StanleyGoldman

src/GitHub.Api/Git/IRepository.cs

@@ -62,7 +62,7 @@ public interface IRepository : IEquatable<IRepository>
         event Action<string> OnCurrentBranchChanged;
         event Action<string> OnCurrentRemoteChanged;
         event Action OnLocalBranchListChanged;
-        event Action OnLocalBranchChanged;
+        event Action OnCurrentBranchUpdated;
         event Action<IEnumerable<GitLock>> OnLocksChanged;
         event Action OnRepositoryInfoChanged;
         event Action OnRemoteBranchListChanged;

src/GitHub.Api/Git/Repository.cs

@@ -20,7 +20,7 @@ class Repository : IEquatable<Repository>, IRepository
         private IRepositoryManager repositoryManager;
         public event Action<string> OnCurrentBranchChanged;
         public event Action<string> OnCurrentRemoteChanged;
-        public event Action OnLocalBranchChanged;
+        public event Action OnCurrentBranchUpdated;
         public event Action OnLocalBranchListChanged;
         public event Action<IEnumerable<GitLock>> OnLocksChanged;
         public event Action OnRemoteBranchListChanged;
@@ -196,8 +196,8 @@ private void RepositoryManager_OnLocalBranchUpdated(string name)
         {
             if (name == currentBranch?.Name)
             {
-                Logger.Trace("OnLocalBranchChanged: {0}", name);
-                OnLocalBranchChanged?.Invoke();
+                Logger.Trace("OnCurrentBranchUpdated: {0}", name);
+                OnCurrentBranchUpdated?.Invoke();
                 Refresh();
             }
         }

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

@@ -74,7 +74,7 @@ public override void OnEnable()
         {
             base.OnEnable();
             AttachHandlers(Repository);
-            logHasChanged = true;
+            CheckLogCache();
         }
 
         public override void OnDisable()
@@ -110,6 +110,30 @@ public override void OnGUI()
             OnEmbeddedGUI();
         }
 
+        public void CheckLogCache()
+        {
+            string firstItemCommitID = null;
+            if (history.Any())
+            {
+                firstItemCommitID = history.First().CommitID;
+            }
+
+            var cachedList = GitLogCache.Instance.Log;
+
+            string firstCachedItemCommitID = null;
+            if (cachedList.Any())
+            {
+                firstCachedItemCommitID = cachedList.First().CommitID;
+            }
+
+            if (firstItemCommitID != firstCachedItemCommitID)
+            {
+                Logger.Trace("CommitID {0} != Cached CommitId {1}", firstItemCommitID ?? "[NULL]", firstCachedItemCommitID ?? "[NULL]");
+                logHasChanged = true;
+                Redraw();
+            }
+        }
+
         private void AttachHandlers(IRepository repository)
         {
             if (repository == null)

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

@@ -198,16 +198,6 @@ private void RefreshOnMainThread()
             new ActionTask(TaskManager.Token, Refresh) { Affinity = TaskAffinity.UI }.Start();
         }
 
-        private void Repository_OnCurrentRemoteChanged(string s)
-        {
-            UpdateLog();
-        }
-
-        private void Repository_OnCurrentBranchChanged(string s)
-        {
-            UpdateLog();
-        }
-
         private bool MaybeUpdateData(out string repoRemote)
         {
             repoRemote = null;
@@ -254,15 +244,15 @@ private void AttachHandlers(IRepository repository)
             if (repository == null)
                 return;
             repository.OnRepositoryInfoChanged += RefreshOnMainThread;
-            repository.OnCurrentBranchChanged += Repository_OnCurrentBranchChanged;
-            repository.OnCurrentRemoteChanged += Repository_OnCurrentRemoteChanged;
+            repository.OnCurrentBranchUpdated += UpdateLog;
         }
-
+        
         private void DetachHandlers(IRepository repository)
         {
             if (repository == null)
                 return;
             repository.OnRepositoryInfoChanged -= RefreshOnMainThread;
+            repository.OnCurrentBranchUpdated -= UpdateLog;
         }
 
         private void DoHeaderGUI()
@@ -409,18 +399,22 @@ private static SubTab TabButton(SubTab tab, string title, SubTab activeTab)
 
         private void UpdateLog()
         {
-            Logger.Trace("Updating Log");
-
             if (Repository != null)
             {
+                Logger.Trace("Updating Log");
+
                 Repository
                     .Log()
-                    .ThenInUI((success, log) => {
+                    .FinallyInUI((success, exception, log) => {
                         if (success)
                         {
                             Logger.Trace("Updated Log");
                             GitLogCache.Instance.Log = log;
-                            Redraw();
+
+                            if (activeTab == SubTab.History)
+                            {
+                                HistoryView.CheckLogCache();
+                            }
                         }
                     }).Start();
             }

src/tests/TestUtils/Events/IRepositoryListener.cs

@@ -84,7 +84,7 @@ public static void AttachListener(this IRepositoryListener listener,
                 repositoryEvents?.OnRemoteBranchListChanged.Set();
             };
 
-            repository.OnLocalBranchChanged += () =>
+            repository.OnCurrentBranchUpdated += () =>
             {
                 logger?.Debug("OnHeadChanged");
                 listener.OnHeadChanged();